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.

cde/programs/localized/C/config/Xresources.ow.tmsg

@@ -26,7 +26,7 @@ $ *****************************************************************************
 
 $ ----------------------------------------------------------------------------
 $ Sun Desktop Names
-$
+$ 
 $ Names are used on the dtlogin Options->Session menu
-$
+$ 
 291 OpenWindows Desktop

cde/programs/localized/C/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'. 
@@ -280,20 +280,20 @@ $ LANG=ca
 
 $ ----------------------------------------------------------------------------
 $ Sun Desktop Names
-$
+$ 
 $ Names are used on the dtlogin Options->Session menu
-$
+$ 
 290 Common Desktop Environment (CDE)
 
 $ ----------------------------------------------------------------------------
 $ 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.
 $ ----------------------------------------------------------------------------
@@ -415,13 +415,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.
 $ ----------------------------------------------------------------------------
@@ -531,13 +531,13 @@ $ LANG=lt_LT.ISO8859-4
 
 $ ----------------------------------------------------------------------------
 $ 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
 $ 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.
 $ ----------------------------------------------------------------------------
@@ -568,13 +568,13 @@ $ LANG=japan
 
 $ ----------------------------------------------------------------------------
 $ 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
 $ 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.
 $ ----------------------------------------------------------------------------

cde/programs/localized/C/config/_common.session.tmsg

@@ -11,11 +11,11 @@ $ * (c) Copyright 1995 FUJITSU LIMITED.
 $ * (c) Copyright 1995 Hitachi.
 $ *
 $ * $XConsortium: _common.session.tmsg /main/1 1995/12/09 11:42:39 barstow $
-$
+$ 
 $ *****************************************************************************
-$
+$ 
 $set 1
-$
+$ 
 $ *****************************************************************************
 $ *
 $ *  The following message is used for the session name for a home 

cde/programs/localized/C/config/dtfile.config.tmsg

@@ -25,7 +25,7 @@ $ *                         \t                  horizontal tab
 $ *                         \ (at end of line)  continue on same line
 $ *
 $ *****************************************************************************
-$
+$ 
 1 Change AFS ACL ...
 2 Display test dialog ...
 3 Warning: This is an Andrew File System (AFS) object.\\nAccess permissions may be further restricted by the AFS Access Control List (ACL).

cde/programs/localized/C/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

cde/programs/localized/C/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/C/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 45
-$
+$ 
 $ 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 Enter path or folder name:
 6 Update
 7 Enter file name:
 8 Folders
-$
+$ 
 $ *XmFileSelectionBox*XmLabelGadget.fontList     
 $ This is not a message, but locale dependent values. See sys.font.tmsg...
 $