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

@@ -22,106 +22,106 @@ $ * \ (at end of line) continue on same line
$ *
$ *****************************************************************************
$ ----------------------------------------------------------------------------
$
$
$ font list
1 -dt-interface user-medium-r-normal-m*-*-*-*-*-m-*:
$
$
$ title bar title
2 dtimsstart
$
$
$ Selection title
3 Eingabemethode-Auswahl
$
$
$ Host title
4 Rechner wechseln
$
$
$ Mode title
5 Eingabemethode-Auswahlmodus
$
$
$ OK button label
6 OK
$
$
$ Clear button label
7 Löschen
$
$
$ Cancel button label
8 Abbrechen
$
$
$ Change Host button label
9 Rechner wechseln
$
$
$ Help button label
10 Hilfe
$
$
$ selection dialog border width
11 3
$
$
$ host dialog border width
12 3
$
$
$ XmDialogShell border width
13 0
$
$
$ cmd_rc default spacing (margin width)
14 10
$
$
$ cmd_rc default spacing
15 10
$
$
$ Selection dialog cmd_rc (margin width)
16 4
$
$
$ Selection dialog OK margin width
17 16
$
$
$ Selection dialog cmd_rc default spacing
18 40
$
$
$ Change Host dialog label
19 Rechnername:
$
$
$ Change Host dialog alignment
20 XmALIGNMENT_BEGINNING
$
$
$ Change Host dialog left margin
21 20
$
$
$ Change Host dialog right margin
22 20
$
$
$ Enter hostname label
23 \
Rechnernamen da eingeben, wo die registrierten\\n \
Server zur Eingabemethode angezeigt werden sollen.\\n \
Leeres Rechnernamensfeld verweist auf den lokalen Rechner.
$
$
$ Host text max length
24 63
$
$
$ Host text number of columns
25 14
$
$
$ host_rc margin width
26 60
$
$
$ host cmd_rc margin width
27 20
$
$
$ host cmd_rc spacing
28 90
$
$
$ selection mode button0 label string
29 Bei der Anmeldung fragen
$
$
$ selection mode button1 label string
30 Aktuelle Eingabemethode fortsetzen
$
$
$ mode cmd_rc spacing
31 50
$
$
$ mode cmd_rc margin width
32 20
$
$
$ Input method selection help
33 \\n \
Hilfe zur Eingabemethode-Auswahl\\n \
@@ -148,7 +148,7 @@ $ Input method selection help
ohne das Fenster zu wechseln. Dafür führen Sie die Aktion\\n \
'DtImsMode' unter Desktop_Werkzeuge im Anwendungsmanager aus,\\n \
und wählen 'Aktuelle Eingabemethode fortsetzen' im Dialogfenster.\\n
$
$
$ Input method selection mode help
34 \\n \
Eingabemethode Auswahlmodus\\n \
@@ -169,5 +169,5 @@ $ Input method selection mode help
[Abbrechen]: löscht die Änderungen und schließt das Fenster.\\n \
\\n \
[Hilfe]: zeigt diese Nachricht an.\\n
$
$
$
$