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
@@ -1,10 +1,10 @@
|
||||
$
|
||||
$
|
||||
$ +SNOTICE
|
||||
$
|
||||
$
|
||||
$ $TOG: DtMail.msg /main/4 1998/05/22 17:08:11 rafi $
|
||||
$
|
||||
$
|
||||
$ 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,15 +12,15 @@ $ 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, 1994, 1995 Sun Microsystems, Inc. All rights reserved.
|
||||
$
|
||||
$
|
||||
$ +ENOTICE
|
||||
$
|
||||
$
|
||||
|
||||
$quote "
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/RoamApp.C
|
||||
|
||||
$set 1
|
||||
@@ -34,7 +34,7 @@ $ */
|
||||
4 "种吞收浠你..."
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/RoamMenuWindow.C
|
||||
|
||||
5 "探旨"
|
||||
@@ -128,7 +128,7 @@ $ */
|
||||
79 "魉咝你... 声醛 %d %%"
|
||||
80 "缳耐庥堑"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/AttachArea.C
|
||||
|
||||
81 "缳耐庥堑"
|
||||
@@ -136,7 +136,7 @@ $ Strings from dtmail/AttachArea.C
|
||||
83 "缳耐庥堑"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/Attachment.C
|
||||
|
||||
84 "%s 岩摹远偏仝如嘻厢<E598BB>嬉弭· 诶泖仝如忝?"
|
||||
@@ -146,7 +146,7 @@ $ Strings from dtmail/Attachment.C
|
||||
88 "缳耐庥堑"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/RoamCmds.C
|
||||
|
||||
89 "缳耐庥堑 - 抬澎庥町"
|
||||
@@ -177,7 +177,7 @@ $ */
|
||||
109 "始七倾遣仵宓你·\n岖始沁唆靴、淠镥<E6B7A0>诶厥唆却<E59486> \"$SUBJECT\" 嘻庥堑·\n"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/MsgScrollingList.C
|
||||
|
||||
110 "N"
|
||||
@@ -215,13 +215,13 @@ $ */
|
||||
114 "N"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/Undelete.C
|
||||
|
||||
115 "探旨纱劓"
|
||||
116 "<22>蒺"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/SendMsgDialog.C
|
||||
|
||||
$ /* NL_COMMENT
|
||||
@@ -293,7 +293,7 @@ $ * Compose Window. This message replaces message 151 in set 1.
|
||||
$ */
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/ViewMsgDialog.C
|
||||
|
||||
161 "铒犒"
|
||||
@@ -315,7 +315,7 @@ $ Strings from dtmail/ViewMsgDialog.C
|
||||
177 "缳耐庥堑"
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/DtMailGenDialog.C
|
||||
|
||||
$ /* NL_COMMENT
|
||||
@@ -326,7 +326,7 @@ $ * 178 and 179 are obsolete messages, replaced by messages
|
||||
181 "睚贴"
|
||||
182 "探旨"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/FindDialog.C
|
||||
|
||||
183 "掾势"
|
||||
@@ -349,7 +349,7 @@ $ * This message replaces message 184 in set 1
|
||||
$ */
|
||||
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/Editor.C
|
||||
|
||||
195 "------------- Begin Forwarded Message -------------\n\n"
|
||||
@@ -357,34 +357,34 @@ $ Strings from dtmail/Editor.C
|
||||
197 "------------- End Forwarded Message -------------\n\n"
|
||||
198 "------------- End Included Message -------------\n\n"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/XmTextEditor.C
|
||||
|
||||
199 "\n------------- Begin Included Message -------------\n"
|
||||
200 "\n------------- End Included Message -------------\n"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/DtEditor.C
|
||||
|
||||
201 "\n------------- Begin Included Message -------------\n"
|
||||
202 "\n------------- End Included Message -------------\n"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/Editor.C
|
||||
$ 195 "------------- 魉厥毓丈怃填 -------------\n\n"
|
||||
$ 196 "------------- 芍涯毓丈怃填 -------------\n\n"
|
||||
$ 197 "------------- 魉厥毓丈岣手 -------------\n\n"
|
||||
$ 198 "------------- 芍涯毓丈岣手 -------------\n\n"
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/XmTextEditor.C
|
||||
$ 199 "\n------------- 芍涯毓丈怃填 -------------\n"
|
||||
$ 200 "\n------------- 芍涯毓丈岣手 -------------\n"
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/DtEditor.C
|
||||
$ 201 "\n------------- 芍涯毓丈怃填 -------------\n"
|
||||
$ 202 "\n------------- 芍涯毓丈岣手 -------------\n"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/ComposeCmds.C
|
||||
|
||||
203 "缳耐庥堑"
|
||||
@@ -404,7 +404,7 @@ $ Strings from dtmail/ComposeCmds.C
|
||||
217 "缳耐庥堑"
|
||||
218 "砑尾三喷呢浯溱·"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/SortCmd.C
|
||||
|
||||
219 "陉施你..."
|
||||
@@ -712,7 +712,7 @@ $set 13
|
||||
1 "嘁挝喧恰"
|
||||
2 "嘁挝煅墨"
|
||||
|
||||
$
|
||||
$
|
||||
$ Strings from dtmail/AttachCmds.C
|
||||
|
||||
$set 14
|
||||
|
||||
Reference in New Issue
Block a user