diff po/zh_CN.po @ 13545:cfc2f7fcb3dd

[gaim-migrate @ 15922] Way more changes that I initially thought I was going to make. I apologize for the commit message spam. These changes bring a lot of consistency to our capitalization and punctuation, especially of words like "e-mail". For reference, I've used these rules (after discussing in #gaim): e-mail, a case of two words joined: "e-mail" - in the middle of a sentence caps context "E-mail" - start of text in a sentence caps context "E-Mail" - in a header (title) caps context re-enable, a single word, would be: "re-enable", "Re-enable", and "Re-enable" (respectively) The reason this changeset exploded is that, as I went through and verified these changes, I realized we were using improper capitalization (e.g. header instead of sentence) in a number of dialogs. I fixed a number of these cases before, and this corrects another pile. This looks like I've made a LOT of work for the translators, but the impact is significantly mitigated by three factors: 1) Many of these changes use strings that already exist, or change one string in many places. 2) I've used sed to correct the .po files where possible. 3) The actual changes are extremely trivial. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Tue, 21 Mar 2006 04:32:45 +0000
parents f527fadcb5c5
children 82de2d93e40e
line wrap: on
line diff
--- a/po/zh_CN.po	Tue Mar 21 04:29:20 2006 +0000
+++ b/po/zh_CN.po	Tue Mar 21 04:32:45 2006 +0000
@@ -2746,7 +2746,7 @@
 msgid ""
 "%s was disconnected due to an error: %s\n"
 "Gaim will not attempt to reconnect the account until you correct the error "
-"and reenable the account."
+"and re-enable the account."
 msgstr ""
 
 #: ../src/gtkconv.c:373
@@ -7198,7 +7198,7 @@
 msgstr "错误(可能是 Gaim 的 bug)"
 
 #: ../src/protocols/msn/error.c:42
-msgid "Invalid email address"
+msgid "Invalid e-mail address"
 msgstr "无效的电子邮件地址"
 
 #: ../src/protocols/msn/error.c:45
@@ -8849,7 +8849,7 @@
 #: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
-"You have received an ICQ email from %s [%s]\n"
+"You have received an ICQ e-mail from %s [%s]\n"
 "\n"
 "Message is:\n"
 "%s"
@@ -9057,12 +9057,12 @@
 
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
-msgid "No results found for email address %s"
+msgid "No results found for e-mail address %s"
 msgstr "未找到与电子邮件地址 %s 匹配的结果"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
-msgid "You should receive an email asking to confirm %s."
+msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您应当收到询问确认 %s 的邮件。"
 
 #: ../src/protocols/oscar/oscar.c:6389
@@ -9095,21 +9095,21 @@
 #: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
+"Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
+"Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
+"Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
 
@@ -9133,7 +9133,7 @@
 
 #: ../src/protocols/oscar/oscar.c:6457
 #, c-format
-msgid "The email address for %s is %s"
+msgid "The e-mail address for %s is %s"
 msgstr "%s 的电子邮件地址为 %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
@@ -9371,7 +9371,7 @@
 "求认证”。"
 
 #: ../src/protocols/oscar/oscar.c:8388
-msgid "Find Buddy by E-mail"
+msgid "Find Buddy by E-Mail"
 msgstr "按电子邮件查找好友"
 
 #: ../src/protocols/oscar/oscar.c:8389
@@ -9421,7 +9421,7 @@
 msgstr "显示正在等候认证的好友"
 
 #: ../src/protocols/oscar/oscar.c:8540
-msgid "Search for Buddy by Email..."
+msgid "Search for Buddy by E-Mail..."
 msgstr "按电子邮件搜索好友..."
 
 #: ../src/protocols/oscar/oscar.c:8545
@@ -10914,17 +10914,17 @@
 
 #: ../src/protocols/silc/silc.c:924
 #, fuzzy
-msgid "Key Length"
+msgid "Key length"
 msgstr "密钥长度:\t%d 位\n"
 
 #: ../src/protocols/silc/silc.c:926
 #, fuzzy
-msgid "Public Key File"
+msgid "Public key file"
 msgstr "公钥文件"
 
 #: ../src/protocols/silc/silc.c:928
 #, fuzzy
-msgid "Private Key File"
+msgid "Private key file"
 msgstr "私钥文件"
 
 #: ../src/protocols/silc/silc.c:937
@@ -11228,7 +11228,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key Length: \t%d bits\n"
+msgid "Key length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11446,7 +11446,7 @@
 msgstr "目录服务暂时不可用。"
 
 #: ../src/protocols/toc/toc.c:524
-msgid "Email lookup restricted."
+msgid "E-mail lookup restricted."
 msgstr "电子邮件查阅被限制。"
 
 #: ../src/protocols/toc/toc.c:527