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,138 +22,138 @@ $ * \ (at end of line) continue on same line
$ *
$ *****************************************************************************
$ ----------------------------------------------------------------------------
$
$
$ font list
$ "NEW-"
1 -dt-interface user-medium-r-normal-m*-*-*-*-*-m-*:
$
$
$ title bar title
$ "NEW-"
2 dtimsstart
$
$
$ Selection title
$ "NEW-"
3 入力メソッド選択
$
$
$ Host title
$ "NEW-"
4 ホスト変更
$
$
$ Mode title
$ "NEW-"
5 入力メソッド選択モード
$
$
$ OK button label
$ "NEW-"
6 了解
$
$
$ Clear button label
$ "NEW-"
7 消去
$
$
$ Cancel button label
$ "NEW-"
8 取消し
$
$
$ Change Host button label
$ "NEW-"
9 ホスト変更
$
$
$ Help button label
$ "NEW-"
10 ヘルプ
$
$
$ selection dialog border width
$ "NEW-"
11 3
$
$
$ host dialog border width
$ "NEW-"
12 3
$
$
$ XmDialogShell border width
$ "NEW-"
13 0
$
$
$ cmd_rc default spacing (margin width)
$ "NEW-"
14 10
$
$
$ cmd_rc default spacing
$ "NEW-"
15 10
$
$
$ Selection dialog cmd_rc (margin width)
$ "NEW-"
16 4
$
$
$ Selection dialog OK margin width
$ "NEW-"
17 16
$
$
$ Selection dialog cmd_rc default spacing
$ "NEW-"
18 40
$
$
$ Change Host dialog label
$ "NEW-"
19 Hostname:
$
$
$ Change Host dialog alignment
$ "NEW-"
20 XmALIGNMENT_BEGINNING
$
$
$ Change Host dialog left margin
$ "NEW-"
21 20
$
$
$ Change Host dialog right margin
$ "NEW-"
22 20
$
$
$ Enter hostname label
$ "NEW-"
23 \
登録されている入力メソッドのサーバが示されて\\n \
いるところにホスト名を入力してください。\\n \
空のホスト名はローカル・ホストを意味します。
$
$
$ Host text max length
$ "NEW-"
24 63
$
$
$ Host text number of columns
$ "NEW-"
25 14
$
$
$ host_rc margin width
$ "NEW-"
26 60
$
$
$ host cmd_rc margin width
$ "NEW-"
27 20
$
$
$ host cmd_rc spacing
$ "NEW-"
28 90
$
$
$ selection mode button0 label string
$ "NEW-"
29 Ask at login
$
$
$ selection mode button1 label string
$ "NEW-"
30 Resume current input method
$
$
$ mode cmd_rc spacing
$ "NEW-"
31 50
$
$
$ mode cmd_rc margin width
$ "NEW-"
32 20
$
$
$ Input method selection help
$ "NEW-"
33 \\n \
@@ -181,7 +181,7 @@ $ "NEW-"
することができます。そのためには、アプリケーション・マネージャの\\n \
デスクトップ・ツールにある 'DtImsMode' を実行し、ダイアログ・ウィン\\n \
ドウの [現在の入力メソッドの回復] を選択します。\\n \
$
$
$ Input method selection mode help
$ "NEW-"
34 \\n \
@@ -202,5 +202,5 @@ $ "NEW-"
[取消し]; 変更を無効にし、ウィンドウを閉じます。\\n \
\\n \
[ヘルプ]: このメッセージを表示します。\\n \
$
$
$
$