Re: lynx-dev gettext() final cleanup

[Leonid Pauzner]

25-May-99 12:49 Leonid Pauzner wrote:
> Checking Hiroyuki's diff I found out that he add one new gettext'ed message,
> let add this to the main lynx so 2.8.2 messages catalog will be unified
> across (short coming) 2.8.2 release and Hiriyuki's Win32 version in case
> someone from Win32 people will be interested in texttext support.

> Also, I repeat this several times before, we should remove po/*.po
> files from the distribution, they are available from separate URL
> for interested persons (and such persons usually interested in one
> message catalog only).

> Again, LYMassages_en.h top comment should be changed to reflect
> new gettext'ed nature and point out to po/readme or like
> (a patch was proposed by Jim around a month ago but apparently lost).

Oops, new patch:


diff -u old/lybookma.c ./lybookma.c
--- old/lybookma.c      Sat May  8 10:46:28 1999
+++ ./lybookma.c        Tue May 25 14:55:16 1999
@@ -337,6 +337,10 @@
        LYAddMETAcharsetToFD(fp, -1);
        fprintf(fp,"<title>%s</title>\n</head>\n", BOOKMARK_TITLE);
        fprintf(fp, "%s<br>\n%s\n\n<!--\n%s\n-->\n\n<p>\n<ol>",
+#ifdef RESERVED
+           gettext("     You can delete links by the 'R' key"),
+           "",
+#else
                    gettext("\
      You can delete links using the remove bookmark command.  It is usually\n\
      the 'R' key but may have been remapped by you or your system\n\
@@ -344,6 +348,7 @@
                    gettext("\
      This file also may be edited with a standard text editor to delete\n\
      outdated or invalid links, or to change their order."),
+#endif
                    gettext("\
 Note: if you edit this file manually\n\
       you should not change the format within the lines\n\
diff -u old/lymessag.h ./lymessag.h
--- old/lymessag.h      Fri Apr 23 07:56:36 1999
+++ ./lymessag.h        Tue May 25 15:13:14 1999
@@ -2,7 +2,7 @@
  * Lynx - Hypertext navigation system
  *
  *   (c) Copyright 1992, 1993, 1994 University of Kansas
- *      1995, 1996: GNU General Public License
+ *      1995-1999: GNU General Public License
  */
 #ifndef LYMESSAGES_EN_H
 #define LYMESSAGES_EN_H
@@ -10,17 +10,14 @@
 /*******************************************************************
  * The following definitions are for status line prompts, messages,
  * or warnings issued by Lynx during program execution.  You can
- * modify them to make them more appropriate for you site, and/or
- * to use other languages.  Links to collections of alternate
- * definitions, developed by the Lynx User Community, are maintained
- * in Lynx links:
+ * modify them to make them more appropriate for you site.
  *
- *    http://www.crl.com/~subir/lynx.html
- *
- * You can substitute one of those as LYMessages_en.h, or modify
- * the header inclusion statement in your userdefs.h to include
- * one of those with a different name.
+ * Translations to other languages supported via gettext package,
+ * read ABOUT-NLS and po/readme for details and location of
+ * contributed translations.  When no translation available
+ * English default used.
  */
+
 #define ALERT_FORMAT gettext("Alert!: %s")
 #define WELCOME_MSG gettext("Welcome")
 #define REALLY_QUIT_Y gettext("Are you sure you want to quit?")
@@ -427,6 +424,9 @@
 #define CANNOT_DOWNLOAD_FILE gettext("Unable to download file.")
 #define BUILDING_DIR_LIST gettext("Building directory listing...")
 #define SAVING gettext("Saving...")
+#ifdef RESERVED
+#define COULD_NOT_EDIT_FILE gettext("Could not edit file '%s'.")
+#endif
 #define COULD_NOT_ACCESS_FILE gettext("Could not access file.")
 #define COULD_NOT_ACCESS_DIR gettext("Could not access directory.")
 #define COULD_NOT_LOAD_DATA gettext("Could not load data.")