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

@@ -1,48 +1,48 @@
$ $XConsortium: dthelpgen.msg /main/3 1995/11/07 13:13:35 rswiston $
$ *****************************************************************************
$
$
$ ***** NOTE FOR MESSAGE CATALOG TRANSLATORS *****
$
$
$ There may be three types of messages in this file:
$
$
$ 1. Messages that appear in dialogs or are displayed to the user.
$
$
$ These messages are the default and they should ALL BE LOCALIZED.
$ Note that these messages do NOT have any identification (see the
$ comments for type 2 and 3 below).
$
$
$ 2. Messages that only appear in the DT error log file ($HOME/.dt/errorlog).
$
$
$ The localization of these messages is OPTIONAL. These messages are
$ identified by the following:
$
$
$ MESSAGES xx-yy IN SET zz WILL ONLY APPEAR IN THE DT ERRORLOG FILE
$
$
$ 3. Messages that should not be localized.
$
$
$ These messages are identified by the following:
$
$
$ DO NOT TRANSLATE or CHANGE or LOCALIZE MESSAGES xx-yy from set zz
$
$
$ ***** END (NOTE FOR MESSAGE CATALOG TRANSLATORS) *****
$
$
$ ******************************************************************************
$
$
$set 1
$
$
$ _DtMessage 1 is the usage message
$
$
$ Localize only the words 'directory', 'name', and 'language'.
$ 'directory' means the directory name in which the resulting files
$ will be placed. 'name' mean what base name to give the files placed
$ in 'directory'. 'language' means which localized versions of help files
$ to look for.
$
$
1 %s -dir <directory> [-generate] [-file <name>] [-lang <language>]\n
$
$
$ Mesages 2-18 are error messages.
$
$
2 %s: Element of %s is not a directory\n
3 %s: Access denied for directory %s\nTry running as super user?\n
4 %s: Element of %s does not exist\n
@@ -63,33 +63,33 @@ $
19 %s: Unable to allocate memory\n
20 %s: Invalid system language specified %s\n
$
$
$set 2
$
$
$ Specifies the character set used to create this file
$
$
$ This must be localized for the various languages. That is
$ for Japanese shift JIS, it would be 'ja_JP.SJIS'; for Japanese
$ EUC it would be 'ja_JP.eucJP'. For files written using
$ HP Roman8 character set it would be '<lang+terr>.HP-ROMAN8', etc.
$ The set of allowable locale strings can be found in
$ /usr/dt/config/svc/CDE.lcx
$
$
1 C.ISO-8859-1
$
$
$ Specifies the title for the browser.
$ It is used in the body of text displayed to the user.
$
$
2 Welcome to Help Manager
$
$
$ Specifies the body of text displayed in the browser.
$
$
$ When localizing, DO NOT alter any text between the "<" and ">" pairs.
$ That is - DO NOT localize the tags such as <ABBREV> and <PARAGRAPH>.
$ DO localize the text between the tags.
$
$
3 <ABBREV>Welcome to the Help Manager</ABBREV> \
<PARAGRAPH>Each of the titles listed below represents a\n \
<ANGLE italic> product family</>\n \
@@ -104,19 +104,19 @@ choose its title.</PARAGRAPH> \
<PARAGRAPH first 1 left 3 label "<CHAR C.DT-SYMBOL-1><0xB7></>"> \
If you need help while using help windows, press F1.</PARAGRAPH>
$
$
$ Specifies the Volume Title
$
$
4 Help - Top Level
$
$
$ Specifies the preamble to the help file if no volumes or family files
$ are found.
$
$
$ When localizing, DO NOT alter any text between the "<" and ">" pairs.
$ That is - DO NOT localize the tags such as <ABBREV> and <PARAGRAPH>.
$ DO localize the text between the tags.
$
$
5 <ABBREV>Welcome to the Help Manager</ABBREV> \
<LINK 0 "Help4Help How-To-Register-Help"> \
<TYPE serif><WEIGHT bold><SIZE 12><ANGLE italic> \
@@ -127,26 +127,26 @@ Note:\ \ \ No Help Registered \
files for browsing.</> Help may be available for some applications by \
choosing Help commands directly within the applications.</>
$
$
$ Specifies the title to use in the dthelpgen dtksh dialog.
$
$
6 dthelpgen
$
$
$ Specifies the message to display in the dthelpgen dtksh dialog.
$ This message indicates that dthelpgen is building (or rebuilding)
$ the browser information.
$
$
7 Generating browser information. Please wait.
$
$
$set 3
$
$
$ ******* Text Formatting Templates ********
$ DO NOT TRANSLATE THESE MESSAGES
$ DO NOT CHANGE THESE MESSAGES
$ DO NOT LOCALIZE THESE MESSAGES
$
$
1 <TOPIC charset %s>
2 <TITLE><TYPE serif><WEIGHT bold><SIZE 14>%s</SIZE></WEIGHT></TYPE></TITLE>
3 <PARAGRAPH before 1 first 1 left 1>

View File

@@ -44,11 +44,11 @@ $quote "
$set 2
$ ***** Module: PrintUtil.c *****
$
$
$set 3
$ ***** Module: PrintTopics.c *****
$
$
$ ** LOCALIZE THESE MESSAGES **
1 "%s Error: helpType is topic, but no helpVolume specified.\n"
2 "%s Error: unable to locate help volume %s\n"
@@ -72,7 +72,7 @@ $ string used by can't get a topic title associated with an index subentry
$set 4
$ ***** Module: PrintManStrFile.c *****
$
$
$ ** LOCALIZE THESE MESSAGES **
1 "%s Error: helpType is string, but no stringData specified.\n"
2 "%s Error: helpType is dynamic string, but no stringData specified.\n"
@@ -82,7 +82,7 @@ $ ** LOCALIZE THESE MESSAGES **
$set 5
$ ***** Module: Initialize.c *****
$
$
$ ** LOCALIZE THESE MESSAGES **
$ Messages 1 to 29: dthelpprint usage message
$ **DO NOT LOCALIZE** the command line option names (e.g. -copies).
@@ -130,7 +130,7 @@ $ arg order: directory prefix processid filecnt suffix
$set 6
$ ***** Module: Main.c *****
$
$
$ ** LOCALIZE THESE MESSAGES **
1 "%s Error: Illegal helpType %d.\n"