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/dtsession/dtsession.msg.src

@@ -268,20 +268,20 @@ Note: The Current session will not be saved.\n\n\
 When you are ready to begin the restart process, click [OK] and\n\
 proceed to save your files.
 
-$
+$ 
 $ Messages 39-41 are displayed on the logout and/or session selection
 $  confirmation dialogs.  These message are for dialog buttons
-$
+$ 
 39 OK
 40 Cancel
 41 Help
 
-$
+$ 
 $ Messages 50-53 are for the display-specific session confirmation dialog
-$
+$ 
 50 Home
 51 Current
-$
+$ 
 $ The first '%s' in message 52 will be replace with message 50 or 51.
 $ The second '%'s in message 52 will be replace with the value of
 $ $DISPLAY (e.g. hostname:0).
@@ -291,37 +291,37 @@ If you continue, a new display-specific session will\n\
 be created.
 53 Warning
 
-$
+$ 
 $ Message 55-56 are for the Session Save error dialog
 $   55 is the dialog title
 $   56 is the message in the dialog - do NOT localize 'save_state'
-$
+$ 
 55 Save Session Failure
 56 The session cannot be saved because the required\n\
 'save_type' parameter was not in the message.\n\n\
 The session will not be saved.
 
-$
+$ 
 $ Messages 70-71 refer to the name of the System Administration manual
-$
+$ 
 70 See the following for more information:
 71 CDE Advanced Users and System's Administration Guide
 
-$
+$ 
 $ Message 75 is used during logout if the user started a Current
 $   session but used the Style Manager to return to a Home session.
-$
+$ 
 75 Exiting the desktop session...\n\n\
 Your Current session will be saved but your Home\n\
 session will be restored upon login.\n\n\
 Application updates you have not saved will be lost.\n\n\
 Continue Logout?
 
-$
+$ 
 $ Message 76 is used at the same time message 36 is used except that
 $   message 76 is for Digital/OSF only and is slightly different than
 $   message 36.
-$
+$ 
 76 The DT messaging system could not be started.\n\n\
 To correct the problem:\n\n\
 1.  Choose [OK] to return to the login screen.\n\n\
@@ -407,11 +407,11 @@ $ LOCALIZE Set 29
 
 
 $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
-$
+$ 
 $ Set 40 is for messages related to the X11R6 Session Management Protocol
 $ 
 $   o Do NOT localize the string '%s' in any of the messages in this set.
-$
+$ 
 $set 40
 $ Messages 1-7 are used when a session cannot be started.
 $ Message 1 - this message will preface messages 2-7
@@ -420,10 +420,10 @@ following error:
 2 SmsInitialize failed.
 3 IceListenForConnections failed.
 
-$
+$ 
 $ Do not remove the whitespace at the beginning of lines 2 and 3
 $   for message number 4
-$
+$ 
 4 The authentication file ~/.ICEauthority could not be created.\n\
    If the files ~/.ICEauthority-c and ~/.ICEauthority-l exist,\n\
    they must be removed before your session can be started.
@@ -432,9 +432,9 @@ $
 6 IceComposeNetworkIds failed.
 $ Message 7 - Do NOT translate "SESSION_MANAGER".
 7 Could not create the SESSION_MANAGER environment variable.
-$
+$ 
 $ Messages 8-9 occur when a session database cannot be opened.
-$
+$ 
 $ Message 8 - Do NOT remove the whitespace before the last '%s'.
 8 The following session database could not be opened:\n\n\
    '%s'
@@ -442,18 +442,18 @@ $ Message 9 - Do NOT remove the whitespace before the last '%s'.
 9 The following session database does not contain\n\
 the required resource '%s':\n\n\
    %s
-$
+$ 
 $ Messages 10-11 are used to report errors when reading a session database
-$
+$ 
 $ Message 10 - Do NOT remove the whitespace before the last '%s'.
 10 The required property '%s' is missing for client\n\n\
    %s\n\n\
 in the file '%s'.
 11 The required resource '%s' is missing for client '%d'\n\
 in the file '%s'.
-$
+$ 
 $ Messages 12-14 used if errors occur when a session is restarted
-$
+$ 
 $ Message 12 - Do NOT remove the whitespace before the last '%s'.
 12 The directory '%s'\n\
 is not available for application '%s'.\n\n\
@@ -472,43 +472,43 @@ could not be translated into cannonical form:\n\n\
    %s\n\n\
 [%s]
 
-$
+$ 
 $ Message 15 - used if the -session command line option has no value
-$
+$ 
 15 No session name was provided for the -session command line option.
-$
+$ 
 $ Message 16 - used if the Save_Session message contains an unrecognized
 $    argument
-$
+$ 
 16 The Save_Session message contains the unrecognized argument '%s'.
 
 17 An attempt to get a client list from the 'Window Manager' failed.
-$
+$ 
 $ Message 18 - the client database cannot be opened for writing.
 $ Do NOT remove the whitespace before the last '%s'.
-$
+$ 
 18 The following database file cannot be opened for writing:\n\n\
    %s\n\n\
 The session will not be saved.
-$
+$ 
 $ Message 19 - used if an application cannot be saved
-$
+$ 
 19 Application '%s' cannot be saved.
-$
+$ 
 $ Message 20 - used if the IceAcceptConnection function fails:
-$
+$ 
 20 IceAcceptConnection failed.
-$
+$ 
 $ Message 21 - used if a Save Session is requested and one is already
 $    in progress
 21 The session will not be saved because a Save Session is in progress.
 
 22 A session shutdown was cancelled by the application '%s'.
 
-$
+$ 
 $ Messages 23-25 are used when a session is saved and an application 
 $    has not set its required properties
-$
+$ 
 $ Message 23 - Do NOT remove the whitespace before the last '%s'.
 23 The following application did not set the required\n\
 property '%s':\n\n\
@@ -519,7 +519,7 @@ This application will not be saved.
 the required property '%s'.
 
 25 Application '%s' did not set the required property '%s'.
-$
+$ 
 $ Messages 26-27 are used when the DiscardCommand properties are
 $    invoked - before an old session directory is removed.
 $ Message 26 - do NOT remove the whitespace before the '%s'.
@@ -529,18 +529,18 @@ $    this message
    %s\n\n\
 The 'DiscardCommand' properties cannot be run.
 
-$
+$ 
 $ Message 27 - do NOT translate the word 'DiscardCommand' in
 $    this message
 27 An attempt to execute the 'DiscardCommand' property for\n\
 application '%s' failed.
 
-$
+$ 
 $ Messages 28-29 - used when an application exists and it wants the
 $    Session Manager to post a dialog with a message that describes
 $    the reason the client exited.
 $ Message 29 is the title for the dialog
-$
+$ 
 28 Application '%s' exited for the following reason:\n\n\
 %s
 29 Application Close Reasons