changeset 2fb3820fae40 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2fb3820fae40
description: merge

diffstat:

 po/zh_CN.po |  6818 +++++++++++++++++++++++-----------------------------------
 1 files changed, 2748 insertions(+), 4070 deletions(-)

diffs (truncated from 13251 to 300 lines):

diff -r 6f616ca3998a -r 2fb3820fae40 po/zh_CN.po
--- a/po/zh_CN.po       Sun Oct 31 18:21:33 2010 +0100
+++ b/po/zh_CN.po       Sun Oct 31 18:26:52 2010 +0100
@@ -4,6 +4,7 @@
 #
 # wwld <[email protected]>, 2005.
 # kangkang <[email protected]>, 2005.
+# Guanhao Yin <[email protected]>, 2010.
 #
 #: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
 #: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
@@ -13,22 +14,19 @@
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
-"PO-Revision-Date: 2009-08-20 00:07+0200\n"
-"Last-Translator: kangkang <[email protected]>\n"
-"Language-Team: sIyU <[email protected]>\n"
-"Language: \n"
+"POT-Creation-Date: 2010-10-30 23:53+0800\n"
+"PO-Revision-Date: 2010-10-31 17:37+0800\n"
+"Last-Translator: Guanhao Yin <[email protected]>\n"
+"Language-Team: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: CHINA\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
-#, fuzzy
 msgid "Join _Group Chat..."
-msgstr "加入群聊(_G)"
+msgstr "加入聊天室(_G)"
 
 #: ../data/gui/account_context_menu.ui.h:2
 msgid "_Add Contact..."
@@ -36,28 +34,25 @@
 
 #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
 msgid "_Discover Services"
-msgstr "发掘服务(_D)"
+msgstr "发现服务(_D)"
 
 #: ../data/gui/account_context_menu.ui.h:4
 msgid "_Execute Command..."
 msgstr "执行命令(_E)..."
 
 #: ../data/gui/account_context_menu.ui.h:5
-#, fuzzy
 msgid "_Modify Account"
-msgstr "修改帐户"
+msgstr "修改账户信息(_M)"
 
 #: ../data/gui/account_context_menu.ui.h:6
 msgid "_Open Gmail Inbox"
 msgstr "打开 Gmail 收件箱(_O)"
 
 #: ../data/gui/account_context_menu.ui.h:7
-#, fuzzy
 msgid "_Personal Events"
-msgstr "个人信息"
+msgstr "个人事件"
 
 #: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-#, fuzzy
 msgid "_Start Chat..."
 msgstr "开始聊天(_S)"
 
@@ -67,61 +62,59 @@
 msgstr "状态(_S)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
-#, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>正在创建帐户</b>\n"
+"<b>正在连接服务器</b>\n"
 "\n"
 "请等待..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>请选择一个选项</b>:"
+msgstr "<b>请选择一个选项</b>: "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:5
-#, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
-msgstr "<b>请填写您新同账户的数据</b>"
+msgstr "<b>请填写您现有账号的信息</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
-msgstr ""
+msgstr "<b>请选择一个服务器</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
+"将这个证书添加到可信任证书列表。\n"
+"这个证书的 SHA1 指纹信息: \n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
-#, fuzzy
 msgid "Anon_ymous authentication"
-msgstr "使用验证"
+msgstr "匿名认证(_Y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Connect when I press Finish"
-msgstr "当我点击“结束”时连接"
+msgstr "当我点击\"结束\"时连接"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: 帐户创建向导"
+msgstr "Gajim: 账户创建向导"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-#, fuzzy
 msgid "I already have an account I want to _use"
-msgstr "我已经拥有了一个帐户"
+msgstr "我已经有想要使用的账户了(_U)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I want to _register for a new account"
-msgstr "我想注册一个新帐户(_R)"
+msgstr "我想注册一个新账户(_R)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
 #: ../data/gui/accounts_window.ui.h:28
 msgid "If checked, Gajim will remember the password for this account"
-msgstr "如果选定,Gajim 会记录本帐户密码"
+msgstr "如果选定, Gajim 会记录本账户的密码"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
 msgid "Manage..."
@@ -131,17 +124,16 @@
 #: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
 #: ../src/config.py:1280 ../src/config.py:1383 ../src/config.py:1694
 #: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
+#: ../src/config.py:2357 ../src/config.py:3612 ../src/config.py:3687
+#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517
+#: ../src/dialogs.py:530 ../src/roster_window.py:2967
+#: ../src/roster_window.py:2973 ../src/roster_window.py:2978
 msgid "None"
 msgstr "无"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-#, fuzzy
 msgid "Prox_y:"
-msgstr "代理服务器:"
+msgstr "代理服务器(_Y): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
@@ -150,18 +142,18 @@
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
 msgid "Set my profile when I connect"
-msgstr "当连接上时设置我的模版"
+msgstr "连接后设置我的名片"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Use custom hostname/port"
-msgstr "使用自定义主机名/端口号"
+msgstr "使用自定义的主机名/端口"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr ""
-"您需要一个帐户来连接\n"
+"您必须拥有一个账户以连接\n"
 "Jabber 网络"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
@@ -174,19 +166,18 @@
 msgstr "完成(_F)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:26
-#, fuzzy
 msgid "_Hostname:"
-msgstr "主机名:"
+msgstr "主机名(_H): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
 #: ../data/gui/accounts_window.ui.h:62
 msgid "_Jabber ID:"
-msgstr "Jabber ID(_J):"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
 #: ../data/gui/accounts_window.ui.h:64
 msgid "_Password:"
-msgstr "密码(_P):"
+msgstr "密码(_P): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
@@ -194,7 +185,7 @@
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Server:"
-msgstr "服务器(_S):"
+msgstr "服务器(_S): "
 
 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
@@ -209,42 +200,36 @@
 msgstr "<b>个人信息</b>"
 
 #: ../data/gui/accounts_window.ui.h:4
-#, fuzzy
 msgid "<b>Proxy</b>"
-msgstr "<b>属性</b>"
+msgstr "<b>代理服务器</b>"
 
 #: ../data/gui/accounts_window.ui.h:5
-#, fuzzy
 msgid "A_djust to status"
-msgstr "调整状态(_A)"
+msgstr "依据状态调整(_A)"
 
 #: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
-msgstr "账户"
+msgstr "账号"
 
 #: ../data/gui/accounts_window.ui.h:7
 msgid "Accounts"
-msgstr "帐户"
+msgstr "账户"
 
 #: ../data/gui/accounts_window.ui.h:8
-#, fuzzy
 msgid "Administration operations"
-msgstr "管理员列表"
+msgstr "管理操作"
 
 #: ../data/gui/accounts_window.ui.h:9
-#, fuzzy
 msgid "Anonymous authentication"
-msgstr "使用验证"
+msgstr "匿名认证"
 
 #: ../data/gui/accounts_window.ui.h:10
-#, fuzzy
 msgid "Auto-reconnect when connection is lost"
-msgstr "连接丢失后自动重新连接"
+msgstr "连接断开后自动重连"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
 msgid "Browse..."
-msgstr "浏览(_B)"
+msgstr "浏览..."
 
 #: ../data/gui/accounts_window.ui.h:12
 msgid "C_onnect on Gajim startup"
@@ -252,38 +237,35 @@
 
 #: ../data/gui/accounts_window.ui.h:13
 msgid "Chan_ge Password"
-msgstr "更换密码(_G)"
+msgstr "更改密码(_G)"
 
 #: ../data/gui/accounts_window.ui.h:14
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
-msgstr ""
+msgstr "如果选定, Gajim 在通过不安全的网络连接发送密码前会询问您"
 
 #: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
 msgid "Choose Client Cert"
-msgstr "选择要发送的文件..."
+msgstr "选择客户端证书"
 
 #: ../data/gui/accounts_window.ui.h:16
 msgid "Choose _Key..."
-msgstr "选择您的 OpenPGP 钥匙(_K)..."
+msgstr "选择密钥(_K)..."
 
 #: ../data/gui/accounts_window.ui.h:17
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to