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:
Jon Trulson
2012-09-03 15:12:57 -06:00
parent e9bb2bcf09
commit a29fc20957
470 changed files with 22507 additions and 22515 deletions

View File

@@ -20,31 +20,31 @@ $ *****************************************************************************
$set 10
1 只能由超级用户运行。 \n
$
$
2 现在CDE 环境被设置成默认用户界面。这个\n\
界面将在所有系统用户注册时出现。\n\
为看这一变化产生的影响,你必须关闭系统,然后重新启动系统。\n
$
$
3 现在命令行被设置成默认用户界面。这个\n\
界面将在所有系统用户注册时出现。\n\
为看这一变化产生的影响,你必须关闭系统,然后重新启动系统。\n
4 CDE 环境已经被设置成默认用户界面.\n
$
$
5 命令行已经被设置成默认用户界面。\n
$
$
6 用法: %s\n\
-e (自动启动 dtlogin)\n\
-d (禁用自动启动 dtlogin)\n\
-kill (终止 dtlogin)\n\
-reset (复位 dtlogin - 重读配置文件)\n
$
$
7 实参太多 \n
$
$
8 需要一个实参 \n
$
$
9 不能停用 xdm, 请参阅 xdm man 页来停用它\n\
xdm 并重试。 \n
$
$
10 Dtlogin 没有正在运行。\n
$ *****************************************************************************
@@ -52,18 +52,18 @@ $ ** Message set 20: For Sun Platforms
$ *****************************************************************************
$set 20
$
$
1 CDE 配置公用程序
$
$
2 %s -d (禁用自动启动)
3 %s -e (允许自动启动)
4 %s -kill (终止 dtlogin)
5 %s -reset (复位 dtlogin)
6 %s -p (打印机动作更新)
$
$
$ In above messages 2 through 6, only translate words between
$ left "(" and right ").
$
$
7 %s: 这个角本必须在 root 下运行
8 用法: 实参太多
9 用法: 需要一个实参