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:
@@ -31,20 +31,20 @@ $
|
||||
$quote "
|
||||
|
||||
$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 <Verzeichnis>] [-generate] [-file <Name>] [-lang <Sprache>]\n"
|
||||
$
|
||||
$
|
||||
$ Mesages 2-18 are error messages.
|
||||
$
|
||||
$
|
||||
|
||||
2 "%s: Element von %s ist kein Verzeichnis\n"
|
||||
|
||||
@@ -84,35 +84,35 @@ Ausf
|
||||
19 "%s: Es kann kein Speicher zugeordnet werden\n"
|
||||
|
||||
20 "%s: Ungültige Sprache: %s\n"
|
||||
$
|
||||
$
|
||||
|
||||
$set 2 Redefine set#
|
||||
|
||||
$
|
||||
$
|
||||
$ 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 "de_DE.ISO-8859-1"
|
||||
$
|
||||
$
|
||||
$ Specifies the title for the browser.
|
||||
$ It is used in the body of text displayed to the user.
|
||||
$
|
||||
$
|
||||
|
||||
2 "Willkommen im Hilfemanager"
|
||||
$
|
||||
$
|
||||
$ 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>Willkommen im Hilfemanager</ABBREV> \
|
||||
<PARAGRAPH>Jeder der nachfolgend aufgeführten Titel stellt eine \n\
|
||||
@@ -126,19 +126,19 @@ eine Produktfamilie den zugeh
|
||||
Innerhalb der Produktfamilie das gewünschte Thema suchen und den zugehörigen Titel auswählen. \n\
|
||||
<PARAGRAPH first 1 left 3 label \"<CHAR C.DT-SYMBOL-1><0xB7></>\"> \
|
||||
Durch Drücken von F1 kann jederzeit Hilfe aufgerufen werden.</PARAGRAPH>"
|
||||
$
|
||||
$
|
||||
$ Specifies the Volume Title
|
||||
$
|
||||
$
|
||||
|
||||
4 "Hilfe - Hauptthema"
|
||||
$
|
||||
$
|
||||
$ 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.
|
||||
$
|
||||
$
|
||||
|
||||
$quote
|
||||
5 <ABBREV>Willkommen im Hilfemanager</ABBREV>\
|
||||
@@ -146,29 +146,29 @@ $quote
|
||||
<TYPE serif><WEIGHT bold><SIZE 12><ANGLE italic>\
|
||||
Hinweis:\ \ \ Keine Hilfe
|
||||
|
||||
$
|
||||
$
|
||||
$ Specifies the title to use in the dthelpgen dtksh dialog.
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
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 "Informationen für Anzeigeprogramm werden generiert. Bitte warten."
|
||||
$
|
||||
$
|
||||
|
||||
$set 3 Redefine set#
|
||||
|
||||
$
|
||||
$
|
||||
$ ******* Text Formatting Templates ********
|
||||
$ DO NOT TRANSLATE THESE MESSAGES
|
||||
$ DO NOT CHANGE THESE MESSAGES
|
||||
$ DO NOT LOCALIZE THESE MESSAGES
|
||||
$
|
||||
$
|
||||
|
||||
1 "<TOPIC charset %s>"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user