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:
@@ -22,107 +22,107 @@ $ * \ (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 Input Method Selection
|
||||
$
|
||||
$
|
||||
$ Host title
|
||||
4 Change Host
|
||||
$
|
||||
$
|
||||
$ Mode title
|
||||
5 Input Method Selection Mode
|
||||
$
|
||||
$
|
||||
$ OK button label
|
||||
6 OK
|
||||
$
|
||||
$
|
||||
$ Clear button label
|
||||
7 Clear
|
||||
$
|
||||
$
|
||||
$ Cancel button label
|
||||
8 Cancel
|
||||
$
|
||||
$
|
||||
$ Change Host button label
|
||||
9 Change Host
|
||||
$
|
||||
$
|
||||
$ Help button label
|
||||
10 Help
|
||||
$
|
||||
$
|
||||
$ 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 Hostname:
|
||||
$
|
||||
$
|
||||
$
|
||||
20 XmALIGNMENT_BEGINNING
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
21 20
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
22 20
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
23 \
|
||||
Enter the hostname where the registered\\n \
|
||||
input method servers should be shown.\\n \
|
||||
Empty hostname indicates the local host.
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
24 63
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
25 14
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
26 60
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
27 20
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
28 90
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
29 Ask at login
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
30 Resume current input method
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
31 50
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
32 20
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
33 \\n \
|
||||
Input Method Selection\\n \
|
||||
\\n \
|
||||
@@ -148,8 +148,8 @@ $
|
||||
one without any window operation. To do so, execute the action\\n \
|
||||
'DtImsMode', located at Desktop_Tools in Application Manager,\\n \
|
||||
and select 'Resume current input method' on the dialog window.\\n
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
34 \\n \
|
||||
Input Method Selection Mode\\n \
|
||||
\\n \
|
||||
@@ -169,5 +169,5 @@ $
|
||||
[Cancel]: discards the changes and closes the window.\\n \
|
||||
\\n \
|
||||
[Help]: shows this message.\\n
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
|
||||
Reference in New Issue
Block a user