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

@@ -1,48 +1,48 @@
$ $XConsortium: dthelpgen.msg /main/3 1995/11/08 13:50:38 rswiston $
$ *****************************************************************************
$
$
$ ***** NOTE FOR MESSAGE CATALOG TRANSLATORS *****
$
$
$ There may be three types of messages in this file:
$
$
$ 1. Messages that appear in dialogs or are displayed to the user.
$
$
$ These messages are the default and they should ALL BE LOCALIZED.
$ Note that these messages do NOT have any identification (see the
$ comments for type 2 and 3 below).
$
$
$ 2. Messages that only appear in the DT error log file ($HOME/.dt/errorlog).
$
$
$ The localization of these messages is OPTIONAL. These messages are
$ identified by the following:
$
$
$ MESSAGES xx-yy IN SET zz WILL ONLY APPEAR IN THE DT ERRORLOG FILE
$
$
$ 3. Messages that should not be localized.
$
$
$ These messages are identified by the following:
$
$
$ DO NOT TRANSLATE or CHANGE or LOCALIZE MESSAGES xx-yy from set zz
$
$
$ ***** END (NOTE FOR MESSAGE CATALOG TRANSLATORS) *****
$
$
$ ******************************************************************************
$
$
$set 1
$
$
$ _DtMessage 1 is the usage message
$
$
$ Localize only the words 'directory', 'name', and 'language'.
$ 'directory' means the directory name in which the resulting files
$ will be placed. 'name' mean what base name to give the files placed
$ in 'directory'. 'language' means which localized versions of help files
$ to look for.
$
$
1 %s -dir <目录> [-generate] [-file <名字>] [-lang <语言>]\n
$
$
$ Mesages 2-18 are error messages.
$
$
2 %s: %s 的元素不是一个目录\n
3 %s: 对目录 %s 的访问被拒绝。\n试着作为超级用户运行?\n
4 %s: %s 的元素不存在\n
@@ -63,33 +63,33 @@ $
19 %s: 不能分配存储器\n
20 %s: 指定了无效的系统语言 %s\n
$
$
$set 2
$
$
$ Specifies the character set used to create this file
$
$
$ This must be localized for the various languages. That is
$ for Japanese shift JIS, it would be 'ja_JP.SJIS'; for Japanese
$ EUC it would be 'ja_JP.eucJP'. For files written using
$ HP Roman8 character set it would be '<lang+terr>.HP-ROMAN8', etc.
$ The set of allowable locale strings can be found in
$ /usr/dt/config/svc/CDE.lcx
$
$
1 zh_CN.EUC-CN
$
$
$ Specifies the title for the browser.
$ It is used in the body of text displayed to the user.
$
$
2 欢迎使用提示管理程序
$
$
$ Specifies the body of text displayed in the browser.
$
$
$ When localizing, DO NOT alter any text between the "<" and ">" pairs.
$ That is - DO NOT localize the tags such as <ABBREV> and <PARAGRAPH>.
$ DO localize the text between the tags.
$
$
3 <ABBREV>欢迎使用提示管理程序</ABBREV> \
<PARAGRAPH>以下所列的每一标题代表一个已安装并注册了\
联机提示的<ANGLE italic>产品系列</>。每一标题\
@@ -103,19 +103,19 @@ $
<PARAGRAPH first 1 left 3 label "<CHAR C.DT-SYMBOL-1><0xB7></>"> \
如果你在使用提示窗口时需要提示,请按 F1 键。</PARAGRAPH>
$
$
$ Specifies the Volume Title
$
$
4 提示 - 顶层
$
$
$ Specifies the preamble to the help file if no volumes or family files
$ are found.
$
$
$ When localizing, DO NOT alter any text between the "<" and ">" pairs.
$ That is - DO NOT localize the tags such as <ABBREV> and <PARAGRAPH>.
$ DO localize the text between the tags.
$
$
5 <ABBREV>欢迎使用提示管理程序</ABBREV> \
<LINK 0 "Help4Help How-To-Register-Help"> \
<TYPE serif><WEIGHT bold><SIZE 12><ANGLE italic> \
@@ -126,26 +126,26 @@ $
的联机提示文件。</> 在某些应用程序中可以 \
直接在应用程序中选择‘提示’命令获得提示。</>
$
$
$ Specifies the title to use in the dthelpgen dtksh dialog.
$
$
6 dthelpgen
$
$
$ Specifies the message to display in the dthelpgen dtksh dialog.
$ This message indicates that dthelpgen is building (or rebuilding)
$ the browser information.
$
$
7 生成浏览器信息。请等待。
$
$
$set 3
$
$
$ ******* Text Formatting Templates ********
$ DO NOT TRANSLATE THESE MESSAGES
$ DO NOT CHANGE THESE MESSAGES
$ DO NOT LOCALIZE THESE MESSAGES
$
$
1 <TOPIC charset %s>
2 <TITLE><TYPE serif><WEIGHT bold><SIZE 14>%s</SIZE></WEIGHT></TYPE></TITLE>
3 <PARAGRAPH before 1 first 1 left 1>