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:
@@ -26,31 +26,31 @@ $ *****************************************************************************
|
||||
|
||||
$set 10
|
||||
1 can only be run by the super user. \n
|
||||
$
|
||||
$
|
||||
2 The CDE environment is now set as the default user interface. This\n\
|
||||
interface will appear on login for all users of the system.\n\
|
||||
To see this change take effect you must shutdown and restart your system.\n
|
||||
$
|
||||
$
|
||||
3 The Command line is now set as the default user interface. This\n\
|
||||
interface will appear on login for all users of the system.\n\
|
||||
To see this change take effect you must shutdown and restart your system.\n
|
||||
4 The CDE environment is Already set as the default User Interface.\n
|
||||
$
|
||||
$
|
||||
5 The Command line is already set as the default User Interface.\n
|
||||
$
|
||||
$
|
||||
6 usage: %s\n\
|
||||
-e (enable auto-start of dtlogin)\n\
|
||||
-d (disable auto-start of dtlogin)\n\
|
||||
-kill (kill dtlogin)\n\
|
||||
-reset (reset dtlogin - reread configuration files)\n
|
||||
$
|
||||
$
|
||||
7 Too many arguments \n
|
||||
$
|
||||
$
|
||||
8 Needs one argument \n
|
||||
$
|
||||
$
|
||||
9 Could not disable xdm, Please refer to xdm man pages to disable\n\
|
||||
xdm and try again. \n
|
||||
$
|
||||
$
|
||||
10 Dtlogin is not running \n
|
||||
|
||||
$ *****************************************************************************
|
||||
@@ -58,18 +58,18 @@ $ ** Message set 20: For Sun Platforms
|
||||
$ *****************************************************************************
|
||||
|
||||
$set 20
|
||||
$
|
||||
$
|
||||
1 CDE configuration utility
|
||||
$
|
||||
$
|
||||
2 %s -d (disable auto-start)
|
||||
3 %s -e (enable auto-start)
|
||||
4 %s -kill (kill dtlogin)
|
||||
5 %s -reset (reset dtlogin)
|
||||
6 %s -p (printer action update)
|
||||
$
|
||||
$
|
||||
$ In above messages 2 through 6, only translate words between
|
||||
$ left "(" and right ").
|
||||
$
|
||||
$
|
||||
7 %s: this script must be run as root
|
||||
8 Usage: Too many arguments
|
||||
9 Usage: Needs one argument
|
||||
@@ -90,24 +90,24 @@ $
|
||||
24 Usage:
|
||||
25 %s -inetd (inetd.conf /usr/dt daemons)
|
||||
26 %s -inetd.ow (inetd.conf /usr/openwin daemons)
|
||||
$
|
||||
$
|
||||
$ In above messages 25 and 26, only translate words between
|
||||
$ left "(" and right ").
|
||||
$
|
||||
$
|
||||
27 Next system boot, following will be run from /usr/dt/bin
|
||||
$
|
||||
$
|
||||
28 rpc.ttdbserverd (ToolTalk)
|
||||
29 rpc.cmsd (Calendar Manager)
|
||||
30 dtspcd (Subprocess Control)
|
||||
$
|
||||
$
|
||||
$ Keep column allignment on messages 28 thru 30.
|
||||
$ Only translate what's beteen ( )'s
|
||||
$
|
||||
$
|
||||
31 Next system boot, following will be run from /usr/openwin/bin
|
||||
$
|
||||
$
|
||||
32 rpc.ttdbserverd (ToolTalk)
|
||||
33 rpc.cmsd (Calendar Manager)
|
||||
$
|
||||
$
|
||||
$ Keep column allignment on messages 32 thru 33.
|
||||
$ Only translate what's beteen ( )'s
|
||||
$
|
||||
$
|
||||
|
||||
Reference in New Issue
Block a user