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:
@@ -1,10 +1,10 @@
|
||||
$
|
||||
$
|
||||
$ +SNOTICE
|
||||
$
|
||||
$
|
||||
$ $XConsortium: MotifApp.msg /main/3 1995/11/08 13:48:08 rswiston $
|
||||
$
|
||||
$
|
||||
$ RESTRICTED CONFIDENTIAL INFORMATION:
|
||||
$
|
||||
$
|
||||
$ The information in this document is subject to special
|
||||
$ restrictions in a confidential disclosure agreement between
|
||||
$ HP, IBM, Sun, USL, SCO and Univel. Do not distribute this
|
||||
@@ -12,21 +12,21 @@ $ document outside HP, IBM, Sun, USL, SCO, or Univel without
|
||||
$ Sun's specific written approval. This document and all copies
|
||||
$ and derivative works thereof must be returned or destroyed at
|
||||
$ Sun's request.
|
||||
$
|
||||
$
|
||||
$ Copyright 1993 Sun Microsystems, Inc. All rights reserved.
|
||||
$
|
||||
$
|
||||
$ +ENOTICE
|
||||
$
|
||||
$
|
||||
|
||||
$ -------------------------------------
|
||||
$ MotifApp/Application.C
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
$ -------------------------------------
|
||||
$ MotifApp/AskFirstCmd.C
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
@@ -35,7 +35,7 @@ $set 1
|
||||
1 "你确实想执行此命令吗ⅶ"
|
||||
$ -------------------------------------
|
||||
$ MotifApp/DialogManager.C
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
@@ -44,7 +44,7 @@ $quote "
|
||||
3 "取消"
|
||||
$ -------------------------------------
|
||||
$ MotifApp/Help.C
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
@@ -66,7 +66,7 @@ $quote "
|
||||
9 "关闭此文件夹?"
|
||||
$ -------------------------------------
|
||||
$ MotifApp/WarnNoUndoCmd.C
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
@@ -86,5 +86,5 @@ $set 2
|
||||
2 "选择被用户异常终止。\n"
|
||||
$ -------------------------------------
|
||||
$ MotifApp/QuitCmd.C
|
||||
$
|
||||
$
|
||||
|
||||
|
||||
Reference in New Issue
Block a user