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:
@@ -1,21 +1,21 @@
|
||||
$
|
||||
$
|
||||
$ COMPONENT_NAME: desktop
|
||||
$
|
||||
$
|
||||
$ FUNCTIONS: mnemonic
|
||||
$ name
|
||||
$
|
||||
$
|
||||
$ ORIGINS: 27,118,119,120,121
|
||||
$
|
||||
$
|
||||
$ This module contains IBM CONFIDENTIAL code. -- (IBM
|
||||
$ Confidential Restricted when combined with the aggregated
|
||||
$ modules for this product)
|
||||
$ OBJECT CODE ONLY SOURCE MATERIALS
|
||||
$
|
||||
$
|
||||
$ (C) COPYRIGHT International Business Machines Corp. 1995
|
||||
$ All Rights Reserved
|
||||
$ US Government Users Restricted Rights - Use, duplication or
|
||||
$ disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
|
||||
$
|
||||
$
|
||||
$ *************************************<+>*************************************
|
||||
$ *****************************************************************************
|
||||
$ **
|
||||
@@ -58,13 +58,13 @@ $ *************************************<+>*************************************
|
||||
|
||||
$set 2
|
||||
$ ***** Module: HelpDialog.c and a few from HelpQuickD.c *****
|
||||
$
|
||||
$
|
||||
$ These Messages appear in the pulldown menus for Cde Help General Help
|
||||
$ dialog widget.
|
||||
$
|
||||
$
|
||||
$ They come in pairs where the first is the menu name (e.g. 1 Print...) and the
|
||||
$ second is the mnemonic (e.g. 2 P).
|
||||
$
|
||||
$
|
||||
$ Messages 1 through 6 are the pulldown menus for the File menu.
|
||||
1 印刷(P)...
|
||||
2 P
|
||||
@@ -98,7 +98,7 @@ $ Messages 17 through 28 are the pulldown menus for the Help menu.
|
||||
26 M
|
||||
27 ヘルプについて(A)
|
||||
28 A
|
||||
$
|
||||
$
|
||||
$ Messages 29 through 36 are the menu labels and mnemonics for for the
|
||||
$ Help Dialog.
|
||||
29 ファイル(F)
|
||||
@@ -111,10 +111,10 @@ $ Help Dialog.
|
||||
36 H
|
||||
37 編集(E)
|
||||
38 E
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$ >>>>> Skip #39 through #49
|
||||
$
|
||||
$
|
||||
$ Messages 50 through 55 are used to display formatting errors within the
|
||||
$ help dialog and quick help dialog widgets.
|
||||
$
|
||||
@@ -124,29 +124,29 @@ $
|
||||
53 テキスト・ファイル・データをフォーマットできません。指定されたテキスト・ファイルは存在しないか、変形しています。
|
||||
54 ヘルプ・トピックをフォーマットできません。
|
||||
55 存在しない位置 ID:
|
||||
$
|
||||
$
|
||||
$ Messages 56 and 67 are displayed when a hypertext link type is selected but
|
||||
$ not supported within the current application.
|
||||
$
|
||||
$
|
||||
56 このアプリケーション内では、選択したハイパーテキスト・リンクをサポートしていません。
|
||||
57 このアプリケーションは、マニュアル・ページへのリンクをサポートしていません。
|
||||
$
|
||||
$
|
||||
$ Messages 58 through 62 are used when bad or null help volumes or
|
||||
$ locationId's are used.
|
||||
$
|
||||
$
|
||||
58 指定したオンライン・ヘルプは、インストールされていないか、適切なヘルプ検索パスにありません。オンライン・ヘルプのインストールについては、製品のマニュアルを参照してください。\n
|
||||
59 位置 ID を指定していません。
|
||||
60 ヘルプ・ボリュームを指定していません。
|
||||
61 ヘルプ・ボリューム:
|
||||
62 位置 ID:
|
||||
$
|
||||
$
|
||||
$ >>>>> Skip #63 through #69
|
||||
$
|
||||
$
|
||||
$
|
||||
$
|
||||
$ Message 70 is used when a null value for DtNtopicTitle is used.
|
||||
$
|
||||
$
|
||||
70 存在しないトピック・タイトル
|
||||
$
|
||||
$
|
||||
$ End Message set 2
|
||||
$ New messages added after early msg cat freeze; not in order
|
||||
80 指定したヘルプタイプが無効です。
|
||||
|
||||
Reference in New Issue
Block a user