message catalogs: fix comment lines, also remove linux hack in merge.c

According to the spec, blank lines in message catalogs or lines
beginning with '$ ' are valid comments.

However, there were many cases where lines in the message catalogs
contained just a single '$', without the required space after it.

Under linux, this caused 126766 error lines (in my builds) of the
form:

... unknown directive `': line ignored

This also causes gencat to exit with a non-0 exit code.  Even though
gencat says it ignores the line, it really doesn't.

An early porting change to programs/localized/util/merge.c was made to
ignore this return value on linux.  This hack has now been removed.

Build logs are a lot smaller and cleaner now.
This commit is contained in:
Jon Trulson
2012-09-03 15:12:57 -06:00
parent e9bb2bcf09
commit a29fc20957
470 changed files with 22507 additions and 22515 deletions

View File

@@ -190,20 +190,20 @@ $ label specified in message 110 of set 11.
$ Labels for add/don't-add newlines radio buttons in the SaveAs and Save dialogs
44 Add newline characters to the end of wrap-to-fit lines.
45 Do not add newlines. Only line breaks created by [Return]\nwill be preserved.
$
$
$ New message as of 5/31/95 (i.e. new since Sample Implementation). This
$ new message is in response to bug DTS CISlx19530.
$
$
46 Either file is unwritable or path to\nfile does not exist.
$
$
$ "-NEW"
$
$
47 "Operation failed due to insufficient memory.\nTry increasing swap space."
$
$
$ "-NEW"
$
$
48 "Format operation failed."
$set 6
@@ -262,7 +262,7 @@ $ This should correspond to the default file name used in the "Save As"
$ dialog box - specified in message 21 of set 5.
6 (UNTITLED)
$
$
$ New messages (7,8) since CDE/SI - error gets displayed when user tries to run
$ dtpad -server when and dtpad server process is already running on the
$ $DISPLAY.
@@ -270,11 +270,11 @@ $ $DISPLAY.
is already serving this display.
8 ERROR: A dtpad server is already\n\
serving this display.
$
$
$ Message 9 is also new since CDE/SI - new as of 5/22/95. It is a usage message
$ for dtpad. Don't translate the '-OPTION' just the text explaining the
$ option.
$
$
9 '%s' is a bad option.\n\
Usage: %s...\n\
-saveOnClose\n\
@@ -335,7 +335,7 @@ $ "NEW-"
13 "Could not connect to ToolTalk service:\n%s\n%s\n"
$
$
$set 10
$ ************************************************************************
$ ** session.c **
@@ -644,18 +644,18 @@ $ **
$ ****************************************************************************
$ ****************************************************************************
$set 14
$
$
$ Messages 1 - 17 are used in printJob.
$
$
$ This is warning message is displayed when the user has provided
$ a margin specifier in the PrintSetup dialog which cannot be parsed.
$
$quote "
1 "One of the following margin specifiers \n has incorrect syntax: \n %s \n %s \n %s \n %s \nUse default margins instead?"
$
$
$ Messages 2 - 7 are messages for errors which can occur in the
$ process of loading a dtpad document file for printing.
$
$
2 "File does not exist."
3 "Specified file is a directory."
4 "File type error."
@@ -665,7 +665,7 @@ $
$ Messages 8 - 11 are format strings used to construct the header
$ and footer strings which appear in the printing output.
$
$
$ Message 8 is the format string used to make a Date header/footer.
$ Message 9 is the format string used to make a DocName header/footer.
$ Message 10 is the format string used to make a Page# header/footer.
@@ -675,11 +675,11 @@ $ Message 11 is the format string used to make a UserName header/footer.
10 "Page %d of %d"
11 "Document For: %s"
$
$
$ Messages 12 - 13 are used in printSetup to construct the
$ app-specific printing options for DtMail which will be included
$ in the DtPrintSetupBox.
$
$
$ Message 12 is the string labeling the field in the GUI which
$ contains the name of the document.
$ Message 13 is the label used on the Toggle Button to indicate that
@@ -690,7 +690,7 @@ $ "wrapped" to the next line.
$ Messages 14 - 15 are status messages for the PrintToFile function.
$
$
$ Message 14 indicates that the PrintToFile function was unsuccessful.
$ Message 15 indicates that the PrintToFile function was successful.
$ NOTE: 'Print to File' should be translated as in
@@ -699,9 +699,9 @@ $ DtPrint.msg:Set1, Msg3.
15 "'Print to File' completed successfully."
$ Messages 16 - 19 are obsolete, and have been replaced by 25
$
$
$ Messages 16 - 19 are status messages for the popup PDM function.
$
$
$ Message 16 indicates that there was no pdm deamon running.
$ Message 17 indicates that the pdm deamon was unable to start a pdm.
$ Message 18 indicates that the pdm couldnt connect to the video display.
@@ -712,7 +712,7 @@ $ Message 19 indicates that the pdm couldnt connect to the print display.
19 "PDM is not authorized to connect to Print display."
$ Messages 20 - 22 are status messages displayed while printing
$
$
$ Message 20 indicates that the user has asked to close the editor
$ window. Dtpad is prevented from doing so until the
$ active print jobs have completed.
@@ -742,12 +742,12 @@ $ ** SET 15
$ **
$ ****************************************************************************
$ ****************************************************************************
$
$
$set 15
$
$
$ Messages 1-5 are used in printSetup.c in the pulldown menu for the
$ header/footer options in the print setup dialog.
$
$
$ Message 1 specifies that the page header/footer field be empty.
$ Message 2 put the Date in the page header/footer field.
$ Message 3 put the Document Name in the page header/footer field.
@@ -761,7 +761,7 @@ $ Message 5 put the User Name msg header in the page header/footer field.
$ Messages 6-9 are used to construct error messages informing users
$ that they have input an invalid print page margin specification for
$
$
6 "Top Margin specifier is invalid: "
7 "Right Margin specifier is invalid: "
8 "Bottom Margin specifier is invalid: "