GNOME.org
 

[empathy/gnome-2-28] Updated Simplified Chinese translation.

commit 56b335a54f4ee007bbb5bc7c70f8f4c04dfc0c41
Author: Aron Xu <aronxu gnome org>
Date:   Mon Nov 16 19:25:40 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po |  636 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 381 insertions(+), 255 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 70d8f33..c9c2ae4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,10 +14,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 19:26+0800\n"
-"PO-Revision-Date: 2009-07-25 21:28+0000\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-11-12 11:03+0000\n"
+"PO-Revision-Date: 2009-10-09 17:06-0800\n"
+"Last-Translator: Yun Nie <yun nie ptiglobal net>\n"
 "Language-Team: Simplified Chinese <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,10 +26,18 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy IM Client"
 msgstr "Empathy IM 客�端"
 
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "IM 客�端"
+
+#: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
 msgstr "å??é??æ?¥æ?¶å?³æ?¶æ¶?æ?¯"
 
@@ -56,13 +65,13 @@ msgid "Compact contact list"
 msgstr "ç´§å??æ?¾ç¤ºè??系人å??表"
 
 #: ../data/empathy.schemas.in.h:6
-#, fuzzy
 msgid "Connection managers should be used"
-msgstr "��使� NetworkManager"
+msgstr "åº?该使ç?¨è¿?æ?¥ç®¡ç??å?¨"
 
 #: ../data/empathy.schemas.in.h:7
+#, fuzzy
 msgid "Contact list sort criterium"
-msgstr "è??系人å??表æ??åº?è§?å??"
+msgstr "è??系人å??表æ??åº?æ?¡ä»¶"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
@@ -134,11 +143,11 @@ msgstr "é??è??主çª?å?£ã??"
 
 #: ../data/empathy.schemas.in.h:25
 msgid "MC 4 accounts have been imported"
-msgstr ""
+msgstr "MC 4 账�已被导�"
 
 #: ../data/empathy.schemas.in.h:26
 msgid "MC 4 accounts have been imported."
-msgstr ""
+msgstr "MC 4 accounts have been importedã??"
 
 #: ../data/empathy.schemas.in.h:27
 msgid "Nick completed character"
@@ -291,11 +300,10 @@ msgid ""
 msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
 
 #: ../data/empathy.schemas.in.h:62
-#, fuzzy
 msgid ""
 "Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
-msgstr "æ?¯å?¦ä½¿ç?¨ NetworkManager(ç½?ç»?管ç??å?¨) è?ªå?¨æ?­å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
+msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?­å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
 
 #: ../data/empathy.schemas.in.h:63
 msgid ""
@@ -405,17 +413,18 @@ msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
 
 #: ../data/empathy.schemas.in.h:86
+#, fuzzy
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"使ç?¨ä½?ç§?å??å??æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼\"name\"以æ??è??系人å§?å??\n"
+"使ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼\"name\"以æ??è??系人å§?å??\n"
 "æ??åº?ã??å??å?¼ä¸º\"state\"æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
 
-#: ../libempathy/empathy-account.c:1086
+#: ../libempathy/empathy-account.c:1158
 msgid "Can't set an empty display name"
-msgstr ""
+msgstr "æ? æ³?设置为空æ?¾ç¤ºå??称"
 
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
@@ -433,7 +442,7 @@ msgstr "æ??é??æ??件æ?¯é??正常ç??æ??件"
 msgid "The selected file is empty"
 msgstr "æ??é??æ??件æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:288
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
@@ -489,10 +498,18 @@ msgstr "é??身"
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:378 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
+#: ../libempathy/empathy-utils.c:385
+msgid "Yahoo! Japan"
+msgstr "Yahoo! ��"
+
+#: ../libempathy/empathy-utils.c:386
+msgid "Facebook Chat"
+msgstr "Facebook è??天"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -537,25 +554,38 @@ msgstr "å°?æ?¥"
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:448
-#: ../libempathy-gtk/empathy-account-widget.c:504
+#: ../libempathy-gtk/empathy-account-widget.c:433
+#: ../libempathy-gtk/empathy-account-widget.c:489
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1224
+#: ../libempathy-gtk/empathy-account-widget.c:1252
+msgid "L_og in"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1302
 msgid "Enabled"
 msgstr "��"
 
+#.  Translators: this is used only when built on a moblin platform 
+#: ../libempathy-gtk/empathy-account-widget.c:1308
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "账��"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??称</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
@@ -566,7 +596,7 @@ msgstr "�级"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -579,16 +609,16 @@ msgstr "ç?¨æ?·å??(_N)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 msgid "What is your AIM password?"
-msgstr ""
+msgstr "æ?¨ç?? AIM å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "What is your AIM screen name?"
-msgstr ""
+msgstr "æ?¨ç?? AIM å±?å¹?å??称æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -597,7 +627,7 @@ msgstr "端�(_P)�"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -607,25 +637,25 @@ msgstr "æ??å?¡å?¨(_S)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "�� I_D�"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 msgid "What is your GroupWise User ID?"
-msgstr ""
+msgstr "æ?¨ç?? GroupWise ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 msgid "What is your GroupWise password?"
-msgstr ""
+msgstr "æ?¨ç?? GroupWise å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>���</b>123456789</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -633,11 +663,11 @@ msgstr "ICQ _UINï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 msgid "What is your ICQ UIN?"
-msgstr ""
+msgstr "æ?¨ç?? ICQ UIN æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ password?"
-msgstr ""
+msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
@@ -681,60 +711,72 @@ msgid "Servers"
 msgstr "æ??å?¡å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
+msgstr "<span size=\"small\"><b>���</b> user gmail com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>���</b> user jabber org</span>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
 msgstr "è¦?ç??æ??å?¡å?¨è®¾ç½®"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "ä¼?å??级(_O)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "��(_U)�"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Use old SS_L"
 msgstr "使ç?¨æ?§ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google ID?"
+msgstr "æ?¨ç?? Google ID æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your Google password?"
+msgstr "æ?¨ç?? Google å¯?ç ?æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "What is your Jabber ID?"
-msgstr ""
+msgstr "æ?¨ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "What is your Jabber password?"
-msgstr ""
+msgstr "æ?¨ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your desired Jabber ID?"
-msgstr ""
+msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your desired Jabber password?"
-msgstr ""
+msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "é??è¦?å? å¯?(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "忽ç?¥ SSL è¯?书é??误(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>���</b> user hotmail com</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 msgid "What is your Windows Live password?"
-msgstr ""
+msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 msgid "What is your Windows Live user name?"
-msgstr ""
+msgstr "æ?¨ç?? Windows Live ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_Email:"
@@ -762,7 +804,7 @@ msgstr "å?¬å¼?ç??å??å­?(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
@@ -779,11 +821,11 @@ msgstr "STUN 端��"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "What is your SIP account password?"
-msgstr ""
+msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "What is your SIP login ID?"
-msgstr ""
+msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "_Username:"
@@ -795,11 +837,11 @@ msgstr "使� _Yahoo ��"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "What is your Yahoo! ID?"
-msgstr ""
+msgstr "æ?¨ç?? Yahoo ID æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "What is your Yahoo! password?"
-msgstr ""
+msgstr "æ?¨ç?? Yahooï¼?å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Yahoo I_D:"
@@ -822,19 +864,19 @@ msgstr "æ? æ³?转æ?¢å?¾å??"
 msgid "None of the accepted image formats is supported on your system"
 msgstr "没æ??ä¸?个å?¬è®¤ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:913
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??头å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:916
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:978
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:982
 msgid "All Files"
 msgstr "æ??æ??æ??件"
 
@@ -846,67 +888,67 @@ msgstr "å??å?»ä»¥æ?¾å¤§"
 msgid "Failed to reconnect this chat"
 msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
 
-#: ../libempathy-gtk/empathy-chat.c:413
+#: ../libempathy-gtk/empathy-chat.c:403
 msgid "Unsupported command"
 msgstr "ä¸?æ?¯æ??ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:549
+#: ../libempathy-gtk/empathy-chat.c:535
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:538
 msgid "invalid contact"
 msgstr "æ? æ??è??系人"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:541
 msgid "permission denied"
 msgstr "æ??é??ä¸?足"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:544
 msgid "too long message"
 msgstr "��太�"
 
-#: ../libempathy-gtk/empathy-chat.c:561
+#: ../libempathy-gtk/empathy-chat.c:547
 msgid "not implemented"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-chat.c:564
+#: ../libempathy-gtk/empathy-chat.c:550
 msgid "unknown"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:568
+#: ../libempathy-gtk/empathy-chat.c:554
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:598
+#: ../libempathy-gtk/empathy-chat.c:584
 #, c-format
 msgid "Topic set to: %s"
 msgstr "��被设置为�%s"
 
-#: ../libempathy-gtk/empathy-chat.c:600
+#: ../libempathy-gtk/empathy-chat.c:586
 msgid "No topic defined"
 msgstr "�设置��"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:956
 msgid "(No Suggestions)"
 msgstr "(没æ??建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
+#: ../libempathy-gtk/empathy-chat.c:1010
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1042
-#: ../libempathy-gtk/empathy-ui-utils.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1492
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1062
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1177
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已����"
@@ -914,12 +956,12 @@ msgstr "%s 已����"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1184
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢�"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1187
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -927,17 +969,17 @@ msgstr "%s 被踢�"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1195
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1198
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:1216
+#: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离å¼?äº?è??天室"
@@ -947,42 +989,42 @@ msgstr "%s 离å¼?äº?è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1211
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1234
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../libempathy-gtk/empathy-chat.c:1817
+#: ../libempathy-gtk/empathy-chat.c:1803
 msgid "Connected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1867
+#: ../libempathy-gtk/empathy-chat.c:1853
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "对�"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:497
 msgid "Topic:"
 msgstr "���"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:266
+#: ../libempathy-gtk/empathy-theme-adium.c:276
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:274
+#: ../libempathy-gtk/empathy-theme-adium.c:284
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -1013,27 +1055,27 @@ msgstr "以å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "订é??请æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1416
 msgid "Removing group"
 msgstr "��群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1463
+#: ../libempathy-gtk/empathy-contact-list-view.c:1540
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1495
 msgid "Removing contact"
 msgstr "å? é?¤è??系人"
 
@@ -1103,7 +1145,7 @@ msgid "Select"
 msgstr "é??æ?©"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "群�"
 
@@ -1219,13 +1261,6 @@ msgstr "%B %e,%Y � %R UTC ��"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "账��"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "å?«å??ï¼?"
@@ -1243,7 +1278,7 @@ msgid "Client:"
 msgstr "客�端�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
+#: ../src/empathy-main-window.c:1006
 msgid "Contact"
 msgstr "è??系人"
 
@@ -1311,7 +1346,7 @@ msgid "SSL"
 msgstr "SSL"
 
 #: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../src/empathy-import-widget.c:302
 msgid "Account"
 msgstr "账�"
 
@@ -1357,34 +1392,34 @@ msgstr "�建对�"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:177
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Custom Message..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:230
+#: ../libempathy-gtk/empathy-presence-chooser.c:232
 msgid "Edit Custom Messages..."
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:331
 msgid "Click to remove this status as a favorite"
 msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:340
 msgid "Click to make this status a favorite"
 msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:374
 msgid "Set status"
 msgstr "设置ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:845
 msgid "Set your presence and current status"
 msgstr "设置你ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1104
 msgid "Custom messages..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
@@ -1460,15 +1495,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1373
+#: ../libempathy-gtk/empathy-ui-utils.c:1394
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1463
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
 msgid "Select a file"
 msgstr "é??æ?©æ??件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1523
+#: ../libempathy-gtk/empathy-ui-utils.c:1544
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
@@ -1656,7 +1691,7 @@ msgid "Megaphone"
 msgstr "��"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
+#: ../megaphone/src/megaphone-applet.c:522
 msgid "Talk!"
 msgstr "说��"
 
@@ -1691,19 +1726,19 @@ msgstr "ç?¶æ??"
 msgid "Set your own presence"
 msgstr "设置æ?¨ç??ç?¶æ??"
 
-#: ../src/empathy.c:588
+#: ../src/empathy.c:823
 msgid "Don't connect on startup"
 msgstr "��������"
 
-#: ../src/empathy.c:592
+#: ../src/empathy.c:827
 msgid "Don't show the contact list on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
 
-#: ../src/empathy.c:596
+#: ../src/empathy.c:831
 msgid "Show the accounts dialog"
 msgstr "�示账�对��"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:843
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客�端"
 
@@ -1755,131 +1790,162 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr ""
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "导å?¥è´¦æ?·æ?¶å?ºç?°é??误ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr ""
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "å?¨è§£æ??è´¦æ?·ä¿¡æ?¯æ?¶å?ºç?°é??误ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr ""
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "å?¨å??建账æ?·æ?¯å?ºç?°é??误ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr ""
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "å??ç??é??误ã??"
 
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
 #, c-format
 msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr ""
+msgstr "é??误信æ?¯æ?¯ï¼?<span style=\"italic\">%s</span>"
 
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
 msgstr ""
+"æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??中å? å?¥è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
 msgid "An error occurred"
-msgstr ""
+msgstr "å??ç??é??误"
 
 #. Create account
 #. To translator: %s is the protocol name
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1094
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:321
+#: ../src/empathy-accounts-dialog.c:1431
 #, c-format
 msgid "New %s account"
 msgstr "�建 %s 账�"
 
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:393
 msgid "What kind of chat account do you have?"
-msgstr ""
+msgstr "æ?¨æ??ä»?ä¹?æ ·ç??è??天账æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:403
-#, fuzzy
+#: ../src/empathy-account-assistant.c:399
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "æ??å·²ç»?æ?¥æ??è´¦æ?·ï¼?æ??æ?³ä½¿ç?¨å®?"
+msgstr "æ?¨è¿?è¦?设置å?¶å®?è??天账æ?·å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:405
 msgid "Enter your account details"
 msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
 
-#: ../src/empathy-account-assistant.c:414
-#, fuzzy
+#: ../src/empathy-account-assistant.c:410
 msgid "What kind of chat account do you want to create?"
-msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+msgstr "æ?¨æ?³è¦?å??建ä»?ä¹?æ ·ç??è??天账æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:420
-#, fuzzy
+#: ../src/empathy-account-assistant.c:416
 msgid "Do you want to create other chat accounts?"
-msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
+msgstr "æ?¨æ?³è¦?å??建å?¶å®?ç??è??天账æ?·å??ã??"
 
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:423
 msgid "Enter the details for the new account"
-msgstr ""
+msgstr "è¾?å?¥æ?°è´¦æ?·ç??详ç»?èµ?æ??"
 
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:509
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
+"使ç?¨ Empathyï¼?æ?¨å?¯ä»¥ä¸?é??è¿?ç??æ??å??è??天ï¼?è¿?å?¯ä»¥ä¸?使ç?¨ Google Talkï¼?AIMï¼?Windows "
+"Live å??许å¤?å?¶å®?è??天软件ç??æ??å??å??å??äº?è??天ã??使ç?¨éº¦å??é£?æ??æ??å??头ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
+"å??è§?é¢?é??è¯?ã??"
 
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:526
 msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
+msgstr "æ?¨æ??没æ??å?¶å®?è??天软件ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:549
 msgid "Yes, import my account details from "
-msgstr ""
+msgstr "æ??ï¼?请导å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:570
 msgid "Yes, I'll enter my account details now"
-msgstr ""
+msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:596
-#, fuzzy
+#: ../src/empathy-account-assistant.c:592
 msgid "No, I want a new account"
-msgstr "å??建æ?°ç??å¸?æ?·(_C)"
+msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?个æ?°ç??è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
+msgstr "没æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 
-#: ../src/empathy-account-assistant.c:627
-#, fuzzy
+#: ../src/empathy-account-assistant.c:623
 msgid "Select the accounts you want to import:"
-msgstr "é??æ?©æ?¨è¦?é??请ç??人ï¼?"
+msgstr "é??æ?©æ?¨è¦?导å?¥ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:710
 #: ../src/empathy-new-chatroom-dialog.c:496
 #: ../src/empathy-new-chatroom-dialog.c:497
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:717
 msgid "No, that's all for now"
-msgstr ""
+msgstr "没æ??ï¼?å°±è¿?æ ·å?§ã??"
 
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:910
 msgid "Welcome to Empathy"
 msgstr "欢�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:923
+#: ../src/empathy-account-assistant.c:919
 msgid "Import your existing accounts"
 msgstr "导å?¥ç?°æ??å¸?æ?·"
 
-#: ../src/empathy-accounts-dialog.c:616
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:63
+#, c-format
+msgid "There are unsaved modification regarding your %s account."
+msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å­?ç??ä¿®æ?¹ã??"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../src/empathy-accounts-dialog.c:231
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%2$s 中ç?? %1$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../src/empathy-accounts-dialog.c:249
+#, c-format
+msgid "%s Account"
+msgstr "%s 账�"
+
+#: ../src/empathy-accounts-dialog.c:253
+msgid "New account"
+msgstr "�账�"
+
+#: ../src/empathy-accounts-dialog.c:517
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr "æ?¨å°?è¦?å??建ä¸?个æ?°è´¦æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继续å??ï¼?"
+
+#: ../src/empathy-accounts-dialog.c:801
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1888,7 +1954,13 @@ msgstr ""
 "æ?¨å°?è¦?å? é?¤æ?¨ç?? %s è´¦æ?·ï¼?\n"
 "æ?¨ç¡®å®?è¦?继续å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:622
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:805
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "æ?¨è¦?ä»?ç?µè??中移é?¤ %s å??ï¼?"
+
+#: ../src/empathy-accounts-dialog.c:811
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1900,13 +1972,35 @@ msgstr ""
 "\n"
 "å¦?æ??å°?æ?¥æ?¨é??æ?°æ·»å? æ­¤è´¦æ?·ï¼?å®?们å°?ä»?ç?¶å­?å?¨ã??"
 
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:818
+msgid "This will not remove your account on the server."
+msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
+
+#: ../src/empathy-accounts-dialog.c:1009
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr "æ?¨å°?è¦?é??æ?©å?¦ä¸?个账æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继续å??ï¼?"
+
+#: ../src/empathy-accounts-dialog.c:1508
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr "æ?¨å°?è¦?å?³é?­æ­¤çª?å?£ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继续å??ï¼?"
+
+#.  Translators: this is used only when built on a moblin platform 
+#: ../src/empathy-accounts-dialog.c:1674
+msgid "_Next"
+msgstr "_��页"
+
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "账�"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Add new"
-msgstr ""
+msgstr "添�"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
@@ -1938,56 +2032,57 @@ msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
 msgid "account"
 msgstr "账�"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:427
 msgid "Contrast"
 msgstr "对�度"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:430
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:433
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:541
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:671
+#: ../src/empathy-call-window.c:675
 msgid "Connecting..."
 msgstr "正���..."
 
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:782
 msgid "_Sidebar"
 msgstr "侧边�(_S)"
 
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:801
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:807
 msgid "Audio input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:811
 msgid "Video input"
 msgstr "����"
 
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:874
 #, c-format
 msgid "Call with %s"
 msgstr "ä¸? %s é??è¯?"
 
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:955
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
@@ -2020,12 +2115,12 @@ msgstr "é??è¯?(_C)"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:369
 #, c-format
 msgid "Conversations (%d)"
 msgstr "对� (%d)"
 
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:501
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2122,58 +2217,58 @@ msgstr "æ??ç»?(_R)"
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:446
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:490
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å??é??é??请ç»?æ?¨"
 
-#: ../src/empathy-event-manager.c:503
+#: ../src/empathy-event-manager.c:496
 msgid "An external application will be started to handle it."
 msgstr "å°?å?¯å?¨ä¸?个å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:501
 msgid "You don't have the needed external application to handle it."
 msgstr "æ?¨æ²¡æ??å¿?é??ç??å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:628
 msgid "Room invitation"
 msgstr "è??天室é??请"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:631
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:639
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:644
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:709
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??件传è¾?"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:889
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ç??订é??请æ±?"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid ""
 "\n"
@@ -2183,13 +2278,13 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:929
 #, c-format
 msgid "%s is now offline."
 msgstr "%s å½?å??离线ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
@@ -2316,15 +2411,15 @@ msgid "Import Accounts"
 msgstr "导�账�"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:282
 msgid "Import"
 msgstr "导�"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:291
 msgid "Protocol"
 msgstr "å??è®®"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:315
 msgid "Source"
 msgstr "�"
 
@@ -2333,67 +2428,67 @@ msgstr "�"
 msgid "%s account"
 msgstr "%s 账�"
 
-#: ../src/empathy-main-window.c:399
+#: ../src/empathy-main-window.c:402
 msgid "_Edit account"
 msgstr "��账�(_E)"
 
-#: ../src/empathy-main-window.c:502
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "没æ??说æ??é??误"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "ç½?ç»?é??误"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "��失败"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "å? å¯?é??误"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?书"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "è¯?书已è¿?æ??"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "�书���活"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?书æ??纹ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "è¯?书é??误"
 
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "æ?ªç?¥ç??é??误"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1292
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -2650,14 +2745,13 @@ msgid "Privacy"
 msgstr "é??ç§?"
 
 #: ../src/empathy-preferences.ui.h:21
-#, fuzzy
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"é??ä½?ä½?置精度æ??å?³ç??ä½ å?¬å¼?ç??å??å¸?ã??å·?å??å?½å®¶ä¿¡æ?¯ä¸?å?¨ç²¾ç¡®ã?? GPS 座æ ?ä¼?æ??ä¸?个é??æ?ºæ?°"
-"å? å?¥ (&#xB1;0.25&#xB0;) ã??"
+"é??ä½?å®?ä½?精度æ??å?³ç??æ¯?æ?¨æ??å?¨ç??å??å¸?ã??å·?å??å?½å®¶æ?´æ??ç¡®ç??ä¿¡æ?¯å°?ä¸?ä¼?被å?¬å¸?ã?? GPS å??æ ?"
+"å°?精确å?°ä¸?ä½?å°?æ?°ã?? "
 
 #: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
@@ -2705,6 +2799,10 @@ msgstr "å??æ??ç??è??系人å?¬å¸?ä½?置信æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?置信æ?¯ç²¾åº¦(_R)"
 
+#: ../src/empathy-status-icon.c:182
+msgid "Respond"
+msgstr "å??åº?"
+
 #: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "ç?¶æ??"
@@ -2729,64 +2827,64 @@ msgstr "ä¸?个ç?± %s æ??å?¡æ??ä¾?é??请ï¼?ä½?æ?¯ä½ ä¸?é??è¦?åº?ç?¨ç¨?åº?å¤?ç??
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
+#: ../src/empathy-debug-window.c:112 ../src/empathy-debug-window.c:1099
 msgid "Error"
 msgstr "é??误"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
+#: ../src/empathy-debug-window.c:115 ../src/empathy-debug-window.c:1093
 msgid "Critical"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
+#: ../src/empathy-debug-window.c:118 ../src/empathy-debug-window.c:1087
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
-#: ../src/empathy-debug-dialog.c:1109
+#: ../src/empathy-debug-window.c:121 ../src/empathy-debug-window.c:1081
+#: ../src/empathy-debug-window.c:1129
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
+#: ../src/empathy-debug-window.c:124 ../src/empathy-debug-window.c:1075
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
+#: ../src/empathy-debug-window.c:127 ../src/empathy-debug-window.c:1069
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:841
+#: ../src/empathy-debug-window.c:842
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../src/empathy-debug-dialog.c:944
+#: ../src/empathy-debug-window.c:959
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-dialog.c:1017
+#: ../src/empathy-debug-window.c:1037
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-dialog.c:1029
+#: ../src/empathy-debug-window.c:1049
 msgid "Level "
 msgstr "级� "
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-window.c:1118
 msgid "Time"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-window.c:1120
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1122
 msgid "Category"
 msgstr "类�"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1124
 msgid "Level"
 msgstr "级�"
 
-#: ../src/empathy-debug-dialog.c:1136
+#: ../src/empathy-debug-window.c:1156
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -2855,6 +2953,7 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Group Chat"
 #~ msgstr "群è??"
 
+#, fuzzy
 #~ msgid "Contact Information"
 #~ msgstr "è??系人信æ?¯"
 
@@ -3097,3 +3196,30 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 
 #~ msgid "Invitation Error"
 #~ msgstr "é??请å?ºé??"
+
+#~ msgid "The contact selected cannot receive files."
+#~ msgstr "é??æ?©ç??è??系人æ? æ³?æ?¥å??æ??件ã??"
+
+#~ msgid "The contact selected is offline."
+#~ msgstr "è??系人离线"
+
+#~ msgid "No error message"
+#~ msgstr "æ? é??误信æ?¯"
+
+#~ msgid "Instant Message (Empathy)"
+#~ msgstr "�����Empathy�"
+
+#~ msgid "_Import..."
+#~ msgstr "_导���"
+
+#~ msgid "Location sources:"
+#~ msgstr "�����"
+
+#~ msgid "_Cellphone"
+#~ msgstr "_æ??æ?º"
+
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
+
+#~ msgid "_Network (IP, Wifi)"
+#~ msgstr "_ç½?ç»? (IP, Wifi)"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]