message catalogs: fix comment lines, also remove linux hack in merge.c

[oweals/cde.git] / cde / programs / localized / zh_CN.dt-eucCN / msg / DtMail.msg

diff --git a/cde/programs/localized/zh_CN.dt-eucCN/msg/DtMail.msg b/cde/programs/localized/zh_CN.dt-eucCN/msg/DtMail.msg
index 577ff128b407122a0605dc202ca933e98a7d8287..75d77d6df17598cf8a49e9c6ed2f67fe4e502193 100644 (file)
--- a/cde/programs/localized/zh_CN.dt-eucCN/msg/DtMail.msg
+++ b/cde/programs/localized/zh_CN.dt-eucCN/msg/DtMail.msg
@@ -1,10 +1,10 @@
-$
+$ 
 $ +SNOTICE
-$
+$ 
 $  $TOG: DtMail.msg /main/5 1998/05/22 17:07:43 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 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ÊÇ¿ÉÖ´Ðеĸ½¼þ¡£ÄãÒªÖ´ÐÐËüÂð?" 
@@ -146,7 +146,7 @@ $ Strings from dtmail/Attachment.C
 88 "Óʼþ³ÌÐò" 
 
 
-$
+$ 
 $ Strings from dtmail/RoamCmds.C
 
 89 "Óʼþ³ÌÐò - ÆäËüÓÊÏä" 
@@ -177,7 +177,7 @@ $        */
 109 "ÎÒÔÚÐݼ١£\nÄãÖ \"$SUBJECT\" µÄÓʼþÔÚÎÒ»ØÀ´ºó»á±»ÔĶÁ¡£\n" 
 
 
-$
+$ 
 $ Strings from dtmail/MsgScrollingList.C
 
 110 "N" 
@@ -215,13 +215,13 @@ $  */
 114 "N" 
 
 
-$
+$ 
 $ Strings from dtmail/Undelete.C
 
 115 "»Ö¸´É¾³ý" 
 116 "¹Ø±Õ" 
 
-$
+$ 
 $ Strings from dtmail/SendMsgDialog.C
 
 117 "·¢ËÍ" 
@@ -279,7 +279,7 @@ $        * Compose Window.  This message replaces message 151 in set 1.
 $        */
 
 
-$
+$ 
 $ Strings from dtmail/ViewMsgDialog.C
 
 161 "¸´ÖÆ" 
@@ -301,7 +301,7 @@ $ Strings from dtmail/ViewMsgDialog.C
 177 "Óʼþ³ÌÐò" 
 
 
-$
+$ 
 $ Strings from dtmail/DtMailGenDialog.C
 
 178 "Óʼþ³ÌÐò - ¹ØÓÚDtmail" 
@@ -310,7 +310,7 @@ $ Strings from dtmail/DtMailGenDialog.C
 181 "È·¶¨" 
 182 "È¡Ïû" 
 
-$
+$ 
 $ Strings from dtmail/FindDialog.C
 
 183 "²éÕÒ" 
@@ -334,7 +334,7 @@ $   */
 
 
 
-$
+$ 
 $ Strings from dtmail/Editor.C
 
 195 "-------------- ¿ªÊ¼×ª·¢ÏûÏ¢ --------------\n\n" 
@@ -342,19 +342,19 @@ $ Strings from dtmail/Editor.C
 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 "Óʼþ³ÌÐò"
@@ -374,7 +374,7 @@ $ Strings from dtmail/ComposeCmds.C
 217 "Óʼþ³ÌÐò" 
 218 "¸ÃÑù°å¿´ÆðÀ´±»»Ù»µÁË¡£" 
 
-$
+$ 
 $ Strings from dtmail/SortCmd.C
 
 219 "ÕýÔÚÅÅÐò..." 
@@ -598,7 +598,7 @@ $
 $      These messages have been commented out to allow compilation.
 $      The english messages need to be translated.
 $      The conflicts in the Chinese messages need to be resolved.
-$
+$ 
 $ 84 "Mailer is unable to obtain exclusive access to this\nmailbox because the system is not responding.\n\nFor this time only, you can choose to open this mailbox\nread-only, or to open it read-write without exclusive\naccess (use only if no one else is using this mailbox)."
 $ 85 "Ö»¶Á"
 $ 86 "¶Áд"
@@ -684,7 +684,7 @@ $set 13
 1 "²»ÄÜ´´½¨" 
 2 "²»ÄÜд" 
 
-$
+$ 
 $ Strings from dtmail/AttachCmds.C
 
 $set 14