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.
2012-09-03 15:12:57 -06:00
parent e9bb2bcf09
commit a29fc20957
470 changed files with 22507 additions and 22515 deletions
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.ow.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.ow.tmsg
@@ -26,7 +26,7 @@ $ *****************************************************************************

 $ ----------------------------------------------------------------------------
 $ Sun Desktop Names
-$
+$ 
 $ Names are used on the dtlogin Options->Session menu
-$
+$ 
 291 OpenWindows ¥Ç¥¹¥¯¥È¥Ã¥×
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/Xresources.tmsg
@@ -29,18 +29,18 @@ $ ----------------------------------------------------------------------------
 $ Do not translate message 1 - 7.
 $ These are not messages, but locale dependent values.
 $ ----------------------------------------------------------------------------
-$
+$ 
 $ Dtlogin*labelFont
 1 -dt-interface system-medium-r-normal-l*-*-*-*-*-*-*-*-*:
 $ Dtlogin*textFont
 2 -dt-interface user-medium-r-normal-l*-*-*-*-*-*-*-*-*:
 $ Dtlogin*greeting.fontList
 3 -dt-interface system-medium-r-normal-xxl*-*-*-*-*-*-*-*-*:
-$
+$ 
 $ login_text.columns = 20 for single-byte
 $                      10 for multi-byte
 4 20
-$
+$ 
 $ passwd_text.columns = 20 for single-byte
 $                       10 for multi-byte
 5 20
@@ -61,13 +61,13 @@ $ Dtlogin*greeting.fontList (low resolution displays)

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for AIX (IBM)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for AIX. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When 
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name. 
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ and the numbered item is the translatable descriptive text for that locale.
 $ ----------------------------------------------------------------------------
@@ -199,16 +199,16 @@ $ LANG=zh_TW

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for Solaris (Sun)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for Solaris. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name.
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ and the numbered item is the translatable descriptive text for that locale.
-$
+$ 
 $ Note: in this case, for the translatable descriptive text for each locale,
 $ translate only the text to the right of the dashes ('-'). For example, if
 $ the text is 'de ------- German', only translate 'German'. 
@@ -311,21 +311,21 @@ $ "NEW-"

 $ ----------------------------------------------------------------------------
 $ Sun Desktop Names
-$
+$ 
 $ Names are used on the dtlogin Options->Session menu
-$
+$ 
 290 共通デスクトップ環境(CDE)
 291 OpenWindows デスクトップ

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for HP-UX (HP)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for HP-UX. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name.
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ and the numbered item is the translatable descriptive text for that locale.
 $ ----------------------------------------------------------------------------
@@ -448,13 +448,13 @@ $ LANG=chinese-t

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for OSF1 (DEC)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for OSF1. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name.
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ and the numbered item is the translatable descriptive text for that locale.
 $ ----------------------------------------------------------------------------
@@ -615,14 +615,14 @@ $ "NEW-"

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for UXP (Fujitsu)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for UXP. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When
 $ "NEW-"
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name.
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ "NEW-"
 $ and the numbered item is the translatable descriptive text for that locale.
@@ -665,14 +665,14 @@ $ "NEW-"

 $ ----------------------------------------------------------------------------
 $ Login screen language list translations for USL (Novell)
-$
+$ 
 $ The following are the locale name to descriptive name mappings
 $ for USL. When the login screen is displayed, the list of available
 $ locales (valid values for $LANG) are obtained from the system. When
 $ "NEW-"
 $ the language list menu is displayed on the login screen, the descriptive
 $ text below is displayed rather than the locale name.
-$
+$ 
 $ For the translations below, the comment 'LANG=' provides the locale name
 $ "NEW-"
 $ and the numbered item is the translatable descriptive text for that locale.
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/_common.session.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/_common.session.tmsg
@@ -11,11 +11,11 @@ $ * (c) Copyright 1995 FUJITSU LIMITED.
 $ * (c) Copyright 1995 Hitachi.
 $ *
 $ * $XConsortium: _common.session.tmsg /main/3 1996/10/16 03:10:41 cde-hit $
-$
+$ 
 $ *****************************************************************************
-$
+$ 
 $set 1
-$
+$ 
 $ *****************************************************************************
 $ *
 $ *  The following message is used for the session name for a home 
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/dtfile.config.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/dtfile.config.tmsg
@@ -25,7 +25,7 @@ $ *                         \t                  horizontal tab
 $ *                         \ (at end of line)  continue on same line
 $ *
 $ *****************************************************************************
-$
+$ 
 1 AFS ACL の変更...
 2 テスト・ダイアログの表示 ...
 3 警告: これは Andrew File System (AFS) オブジェクトです。\\nアクセス権は AFS アクセス制御リスト(ACL) によってさらに制限されています。
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/sys.font.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/sys.font.tmsg
@@ -25,12 +25,12 @@ $ *                         \t                  horizontal tab
 $ *                         \ (at end of line)  continue on same line
 $ *
 $ *****************************************************************************
-$
+$ 
 $ ----------------------------------------------------------------------------
 $ Do not translate message 1 - 7.
 $ These are not messages, but locale dependent values.
 $ ----------------------------------------------------------------------------
-$
+$ 
 $ *FontList
 1 -dt-interface system-medium-r-normal-m*-*-*-*-*-*-*-*-*:
 $ *XmText*FontList
--- a/cde/programs/localized/ja_JP.dt-eucJP/config/sys.resources.tmsg
+++ b/cde/programs/localized/ja_JP.dt-eucJP/config/sys.resources.tmsg
@@ -25,7 +25,7 @@ $ *                         \t                  horizontal tab
 $ *                         \ (at end of line)  continue on same line
 $ *
 $ *****************************************************************************
-$
+$ 
 $ ----------------------------------------------------------------------------
 $ Do not translate message 1 and 3.
 $ This is not a message, but a locale dependent value.
@@ -38,29 +38,29 @@ $ *
 $ * 1 "/usr/dt/config/german/sys.font"
 $ *
 1 "/usr/dt/config/ja_JP.dt-eucJP/sys.font"
-$
+$ 
 $ Message 2 is not used...
-$
+$ 
 $ 2 
-$
+$ 
 $ Message 3:
 $ promptDialog.bboard.frame.form.text.columns = 45 for single-byte
 $                                               23 for multi-byte
-$
+$ 
 3 23
-$
+$ 
 $ Message 4 is not used...
-$
+$ 
 $ 4 
 $ 
 $ Messages 5-9 are labels for the file selection box.  They need to be 
 $ set globally for CDE. Don't translate the ':'.
-$
+$ 
 5 パス名またはフォルダ名を入力してください:
 6 更新
 7 ファイル名を入力してください:
 8 フォルダ 
-$
+$ 
 $ *XmFileSelectionBox*XmLabelGadget.fontList     
 $ This is not a message, but locale dependent values. See sys.font.tmsg...
 $