[empathy/gnome-2-30] Merge Simplified Chinese translation from master

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy/gnome-2-30] Merge Simplified Chinese translation from master
Date: Wed, 15 Sep 2010 07:19:28 +0000 (UTC)
commit 379cdf066cd8691b6d7aff3e56ad833bc17bce2d
Author: Aron Xu <aronxu gnome org>
Date:   Wed Sep 15 15:18:50 2010 +0800

    Merge Simplified Chinese translation from master

 po/zh_CN.po |  819 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 546 insertions(+), 273 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a332636..6885ba0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,15 +12,17 @@
 # Yun Nie <yun nie ptiglobal net>, 2009.
 # Richard Ma <richard ma 19850509 gmail com>, 2009.
 # Tao Wei <weitao1979 gmail com>, 2009.
+# Tao Wang <dancefire gmail com>, 2010.
 # Aron Xu <happyaron xu gmail com>, 2009, 2010.
+# Dean Lee <xslidian gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 15:43+0800\n"
-"PO-Revision-Date: 2010-03-29 18:36+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2010-09-15 15:16+0800\n"
+"PO-Revision-Date: 2010-09-15 15:18+0800\n"
+"Last-Translator: Dean Lee <xslidian lidian info>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -111,8 +113,9 @@ msgid "Empathy has asked about importing accounts"
 msgstr "Empathy å·²ç»?è¯¢é?®å¯¼å?¥è´¦æ?·"
 
 #: ../data/empathy.schemas.in.h:17
+#, fuzzy
 msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "Empathy å·²ç»?è¿?ç§»ç¼?å?ç??æ?¥å¿?"
 
 #: ../data/empathy.schemas.in.h:18
 msgid "Empathy should auto-connect on startup"
@@ -279,8 +282,9 @@ msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦åº?è¯¥å·²ç»?è¯¢é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?ä¸å¯¼å?¥è´¦æ?·ã??"
 
 #: ../data/empathy.schemas.in.h:59
+#, fuzzy
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "Empathy æ?¯å?¦å·²ç»?è¿?ç§»ç¼?å?æ?¥å¿?ã??"
 
 #: ../data/empathy.schemas.in.h:60
 msgid "Whether Empathy should automatically log into your accounts on startup."
@@ -362,11 +366,10 @@ msgid "Whether to show a popup notification when a contact goes online."
 msgstr "å½?è??ç³»äººä¸?çº¿æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:78
-#, fuzzy
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
-msgstr "å½?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºæ??ç¤ºå?³è??å¤©çª?å?£å·²å¼?å?¯ï¼?ä½?æ?ªé?²ç½®ã??"
+msgstr "å¦?æ??è??å¤©çª?å?£å·²å¼?å?¯ï¼?ä½?ä¸?æ?¯å½?å??çª?å?£ï¼?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ??ç¤ºã??"
 
 #: ../data/empathy.schemas.in.h:79
 msgid "Whether to show a popup notification when receiving a new message."
@@ -398,25 +401,23 @@ msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç´§å??æ¨¡å¼?æ?¾ç¤ºè??ç³»äººå??è¡¨ã??"
 
 #: ../data/empathy.schemas.in.h:86
-#, fuzzy
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr "æ?¯å?¦å¯¹ä½¿ç?¨æ ?é¢?æ ?ä¸ç??â??Xâ??æ??é?®å?³é?ä¸»çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
+msgstr "å½?ä½¿ç?¨æ ?é¢?æ ?ä¸ç??â??Xâ??æ??é?®å?³é?ä¸»çª?å?£æ?¶æ?¯å?¦æ?¾ç¤ºæ??ç¤ºå¯¹è¯?æ¡?ã??"
 
 #: ../data/empathy.schemas.in.h:87
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦å¯¹è??å¤©å®¤ä½¿ç?¨ä¸»é¢?ã??"
 
 #: ../data/empathy.schemas.in.h:88
-#, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"ä½¿ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??ç³»äººå??è¡¨ã??é»?è®¤æ??å?µä¸?ä½¿ç?¨å?¼â??nameâ??ä»¥æ??è??ç³»äººå§?å??æ??åº?ã??å??å?¼"
-"ä¸ºâ??stateâ??æ?¶å°?æ??ç?¶æ??æ??åº?è??ç³»äººå??è¡¨ã??"
+"ä½¿ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??ç³»äººå??è¡¨ã??é»?è®¤æ??å?µä¸?ä½¿ç?¨å?¼â??å§?å??â??ä»¥æ??è??ç³»äººå§?å??æ??åº?ã??å??å?¼"
+"ä¸ºâ??ç?¶æ??â??æ?¶å°?æ??ç?¶æ??æ??åº?è??ç³»äººå??è¡¨ã??"
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
@@ -424,7 +425,7 @@ msgstr "ç®¡ç??æ¶?æ?¯å?? VoIP å¸?æ?·"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2096 ../src/cc-empathy-accounts-page.c:243
 #: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
@@ -445,40 +446,40 @@ msgstr "æ??é??æ??ä»¶æ?¯é??æ£å¸¸ç??æ??ä»¶"
 msgid "The selected file is empty"
 msgstr "æ??é??æ??ä»¶æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
+#: ../libempathy/empathy-tp-contact-list.c:911
+#: ../src/empathy-auto-salut-account-helper.c:79
 msgid "People nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:281
 msgid "Socket type not supported"
 msgstr "ä¸?æ?¯æ?? Socket ç±»å??"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:400
 msgid "No reason was specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:403
 msgid "The change in state was requested"
 msgstr "é??è¦?ç?¶æ??æ?¹å??ä¿¡æ?¯"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:406
 msgid "You canceled the file transfer"
 msgstr "æ?¨å??æ¶?äº?æ??ä»¶ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:409
 msgid "The other participant canceled the file transfer"
 msgstr "å?¦å¤?ç??å??ä¸?è??å??æ¶?äº?æ??ä»¶ç??ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:412
 msgid "Error while trying to transfer the file"
 msgstr "å½?ä¼ è¾?è¿?ä¸ªæ??ä»¶ç??æ?¶å??å??ç??é??è¯¯"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:415
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¦å¤?ç??å??ä¸?è??æ? æ³?ä¼ è¾?è¿?ä¸ªæ??ä»¶"
 
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:314
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
@@ -558,7 +559,7 @@ msgstr "è¯?ä¹¦æ?¯è?ªç¾å±?ç??"
 msgid "Certificate error"
 msgstr "è¯?ä¹¦é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:106
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
@@ -638,12 +639,11 @@ msgstr "è´¦æ?·ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1553
 msgid "Enabled"
-msgstr "å?¯ç?¨"
+msgstr "å·²å?¯ç?¨"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1618
-#, fuzzy
 msgid "This account already exists on the server"
-msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
+msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1621
 msgid "Create a new account on the server"
@@ -691,7 +691,7 @@ msgstr "é«?çº§"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../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:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
@@ -767,7 +767,7 @@ msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 msgid "_Character set:"
 msgstr "å?ç¬¦é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "æ?°å»ºç½?ç»?"
 
@@ -864,6 +864,10 @@ msgid ""
 "Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
 "Facebook username if you don't have one."
 msgstr ""
+"è¿?æ?¯æ?¨ç??ç?¨æ?·å??ï¼?è??ä¸?æ?¯æ?¨é??å¸¸ç?»é?? Facebook ç??å??ç§°ã??\n"
+"å¦?æ??æ?¨æ?¯ facebook.com/<b>badger</b>ï¼?è¾?å?¥\n"
+"<b>badger</b>ã??å¦?æ??æ?¨è¿?æ²¡æ?? Facebook ç?¨æ?·å??ç??è¯?ï¼?ä½¿ç?¨<a href=\"http://www.";
+"facebook.com/username/\">è¿?ä¸ªé¡µé?¢</a> æ?¥é??æ?©ä¸?ä¸ªã??"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
@@ -955,97 +959,65 @@ msgstr "éª?è¯?ç?¨æ?·å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr ""
+msgstr "å??ç?°ç»?å®?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "è?ªå?¨å??ç?° STUN æ??å?¡å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "é?´é??(ç§?)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Keep-Alive Options"
 msgstr "Keep-Alive é??é¡¹"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Loose Routing"
-msgstr ""
+msgstr "å®½æ?¾è·¯ç?±"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Mechanism:"
 msgstr "æ?ºå?¶ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Miscellaneous Options"
 msgstr "æ??é¡¹"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "NAT Traversal Options"
 msgstr "NAT é??é¡¹"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "å?ºç«?ä»£ç??ç«¯å?£"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Port:"
 msgstr "ç«¯å?£ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Proxy Options"
 msgstr "ä»£ç??é??é¡¹"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
 msgstr "STUN æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Server:"
 msgstr "æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Transport:"
 msgstr "ä¼ è¾?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "What is your SIP login ID?"
 msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
@@ -1073,33 +1045,32 @@ msgstr "å¿½ç?¥ä¼?è®®å??è??å¤©å®¤é??è¯·(_I)"
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤å??è¡¨ locale(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:451
+#: ../libempathy-gtk/empathy-avatar-chooser.c:527
 msgid "Couldn't convert image"
 msgstr "æ? æ³?è½¬æ?¢å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-#, fuzzy
+#: ../libempathy-gtk/empathy-avatar-chooser.c:452
 msgid "None of the accepted image formats are supported on your system"
-msgstr "æ²¡æ??ä¸?ä¸ªå?¬è®¤ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
+msgstr "æ²¡æ??ä»»ä½?æ?¥å??ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??å¤´å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "æ??æ??æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:325
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
@@ -1161,16 +1132,15 @@ msgid ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??å¯¹è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?ä¸ªâ??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?"
-"å¦?ï¼?â??/say /join æ?¯ç?¨æ?¥å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤â??"
+"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??å¯¹è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?ä¸ªâ??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
+"say /join æ?¯ç?¨æ?¥å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤â??"
 
 #: ../libempathy-gtk/empathy-chat.c:876
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨"
-"æ³?ã??"
+"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
 
 #: ../libempathy-gtk/empathy-chat.c:886
 #, c-format
@@ -1223,29 +1193,29 @@ msgstr "è¯?é¢?è¢«è®¾ç½®ä¸ºï¼?%s"
 msgid "No topic defined"
 msgstr "æ?ªè®¾ç½®è¯?é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "(No Suggestions)"
 msgstr "(æ²¡æ??å»ºè®®)"
 
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1680
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1636
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1732
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??å»ºè®®(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Failed to retrieve recent logs"
 msgstr "è?·å??æ??è¿?æ?¥å¿?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:1957
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -1253,12 +1223,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:1967
+#: ../libempathy-gtk/empathy-chat.c:1964
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?º"
 
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:1967
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1266,17 +1236,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:1978
+#: ../libempathy-gtk/empathy-chat.c:1975
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s å·²è¢« %s ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:1978
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:1982
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
@@ -1286,63 +1256,63 @@ msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:1991
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2016
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2041
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?°å?¨å?«å?? %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2176 ../src/empathy-call-window.c:1540
 msgid "Disconnected"
 msgstr "å·²æ?å¼?è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2698
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç ?é??è¯¯ï¼?è¯·é??è¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2699
 msgid "Retry"
 msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2704
 msgid "This room is protected by a password:"
 msgstr "è¿?ä¸ªæ?¿é?´æ?¯ç?±ä¸?ä¸ªå¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2705
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:2845
 msgid "Connected"
 msgstr "å·²è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:2898
+#: ../libempathy-gtk/empathy-log-window.c:710
 msgid "Conversation"
 msgstr "å¯¹è¯?"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:671
 msgid "Topic:"
 msgstr "è¯?é¢?ï¼?"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-theme-adium.c:787
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -1431,7 +1401,7 @@ msgid "Share my desktop"
 msgstr "å?±äº«æ??ç??æ¡?é?¢"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-widget.c:1380
 msgid "Favorite"
 msgstr "æ?¶è??å¤¹"
 
@@ -1445,7 +1415,7 @@ msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../src/empathy-chat-window.c:856
 msgid "Inviting you to this room"
 msgstr "é??è¯·å?°æ¤è??å¤©å®¤"
 
@@ -1462,7 +1432,7 @@ msgid "Select"
 msgstr "é??æ?©"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1153
 msgid "Group"
 msgstr "ç¾¤ç»?"
 
@@ -1571,15 +1541,15 @@ msgstr "ä½?ç½®"
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®</b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:654
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y äº? %R UTC æ?¶é?´"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:737
 msgid "Save Avatar"
 msgstr "ä¿?å?å¤´å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å?å¤´å??"
 
@@ -1609,7 +1579,7 @@ msgstr "è??ç³»äººè¯¦æ??"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "E-mail address:"
-msgstr ""
+msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Full name:"
@@ -1666,12 +1636,12 @@ msgstr "ç«¯å?£"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
+#: ../libempathy-gtk/empathy-log-window.c:703
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:720
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1730,7 +1700,7 @@ msgstr "æ?°å»ºé??è¯?"
 #: ../libempathy-gtk/empathy-presence-chooser.c:168
 #: ../libempathy-gtk/empathy-presence-chooser.c:204
 msgid "Custom Messageâ?¦"
-msgstr "è?ªå®?ä¹?æ¶?æ?¯"
+msgstr "è?ªå®?ä¹?æ¶?æ?¯..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
@@ -1842,15 +1812,15 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-ui-utils.c:1511
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1628
 msgid "Select a file"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
+#: ../libempathy-gtk/empathy-ui-utils.c:1692
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
@@ -2039,7 +2009,7 @@ msgstr "å?³æ?¶æ¶?æ?¯(Empathy)"
 
 #: ../src/empathy.c:584
 msgid "Don't connect on startup"
-msgstr "å?¯å?¨æ?¶ä¸?è?ªå?¨ç?»å½?"
+msgstr "å?¯å?¨æ?¶ä¸?è?ªå?¨è¿?æ?¥"
 
 #: ../src/empathy.c:588
 msgid "Don't display the contact list or any other dialogs on startup"
@@ -2086,8 +2056,17 @@ msgstr "ä¸?ä¸ª GNOME å?³æ?¶æ¶?æ?¯å®¢æ?·ç«¯"
 #: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
-"YangZhang, <zyangmath gmail com>\n"
-"Aron Xu <aronxu gnome org>\n"
+"Abel Cheung <maddog linux org hk>, 2003\n"
+"Mai Haohui <maihaohui hotmail com>, 2003\n"
+"Rongjun Mu <elanmu sina com>, 2003\n"
+"YangZhang <zyangmath gmail com>, 2008\n"
+"Funda Wang <fundawang gmail com>, 2009\n"
+"Lyper Lai <lyp069 gmail com>, 2009\n"
+"Yun Nie <yun nie ptiglobal net>, 2009\n"
+"Richard Ma <richard ma 19850509 gmail com>, 2009\n"
+"Tao Wei <weitao1979 gmail com>, 2009\n"
+"Aron Xu <happyaron xu gmail com>, 2009, 2010\n"
+"Tao Wang <dancefire gmail com>, 2010\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n";
@@ -2098,36 +2077,36 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#: ../src/empathy-account-assistant.c:167
+#: ../src/empathy-account-assistant.c:168
 msgid "There was an error while importing the accounts."
 msgstr "å¯¼å?¥å¸?æ?·æ?¶å??ç??é??è¯¯ã??"
 
-#: ../src/empathy-account-assistant.c:170
+#: ../src/empathy-account-assistant.c:171
 msgid "There was an error while parsing the account details."
 msgstr "å?¨è§£æ??è´¦æ?·è¯¦æ??æ?¶å?ºç?°é??è¯¯ã??"
 
-#: ../src/empathy-account-assistant.c:173
+#: ../src/empathy-account-assistant.c:174
 msgid "There was an error while creating the account."
 msgstr "å?¨å??å»ºè´¦æ?·æ?¶å?ºç?°é??è¯¯ã??"
 
-#: ../src/empathy-account-assistant.c:175
+#: ../src/empathy-account-assistant.c:176
 msgid "There was an error."
 msgstr "å??ç??é??è¯¯ã??"
 
-#: ../src/empathy-account-assistant.c:179
+#: ../src/empathy-account-assistant.c:180
 #, c-format
 msgid "The error message was: %s"
 msgstr "é??è¯¯ä¿¡æ?¯ä¸ºï¼?%s"
 
-#: ../src/empathy-account-assistant.c:183
+#: ../src/empathy-account-assistant.c:184
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
 "æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??ä¸å? å?¥è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:221
+#: ../src/empathy-account-assistant.c:1316
 msgid "An error occurred"
 msgstr "å??ç??é??è¯¯"
 
@@ -2136,36 +2115,36 @@ msgstr "å??ç??é??è¯¯"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:607
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å»º %s è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:511
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨å·²ç»?æ?¥æ??å?ªä¸ªç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:517
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨è¿?è¦?è®¾ç½®å?¶å®?è??å¤©è´¦æ?·å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:523
 msgid "Enter your account details"
 msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
 
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:528
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³å??å»ºé?£ç§?ç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:534
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¨æ?³è¦?å??å»ºå?¶å®?ç??è??å¤©è´¦æ?·å??ã??"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:541
 msgid "Enter the details for the new account"
 msgstr "è¾?å?¥æ?°è´¦æ?·ç??è¯¦ç»?èµ?æ??"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:656
 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 "
@@ -2176,84 +2155,90 @@ msgstr ""
 "Live å??è®¸å¤?å?¶å®?è??å¤©è½¯ä»¶ç??æ??å??å??å??äº?è??å¤©ã??ä½¿ç?¨éº¦å??é£?æ??æ??å??å¤´ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
 "å??è§?é¢?é??è¯?ã??"
 
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:673
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ??æ²¡æ??å?¶å®?è??å¤©è½¯ä»¶ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:696
 msgid "Yes, import my account details from "
 msgstr "æ??ï¼?è¯·å¯¼å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:717
 msgid "Yes, I'll enter my account details now"
 msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:739
 msgid "No, I want a new account"
-msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?ä¸ªæ?°ç??è´¦æ?·ã??"
+msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?ä¸ªæ?°ç??è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:749
 msgid "No, I just want to see people online nearby for now"
 msgstr "æ²¡æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:770
 msgid "Select the accounts you want to import:"
 msgstr "é??æ?©æ?¨è¦?å¯¼å?¥ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:854
+#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:861
 msgid "No, that's all for now"
-msgstr "æ²¡æ??ï¼?å°±è¿?æ ·å?§ã??"
+msgstr "æ²¡æ??ï¼?å°±è¿?æ ·å?§"
 
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1130
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
+"Empathy å?¯ä»¥è?ªå?¨å??ç?°å??æ?¨è¿?æ?¥å?°å??ä¸?ä¸ªç½?ç»?ä¸ç??äººä»¬ï¼?å¹¶ä¸?å?¯ä»¥å??ä»?ä»¬è??å¤©ã??å¦?æ??æ?¨"
+"æ?³ä½¿ç?¨è¿?ä¸ªå??è?½ï¼?è¯·ä»?ç»?æ?¥ç??ä¸?å??ä¿¡æ?¯æ?¯å?¦æ£ç¡®ã??æ?¨ä¹?å??ä¹?å?¯ä»¥é??è¿?â??è´¦æ?·â??å¯¹è¯?æ¡?è½»æ?¾"
+"ç??ä¿®æ?¹è¿?äº?ä¿¡æ?¯æ??å?³é?è¿?ä¸ªå??è?½"
 
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
 msgid "Edit->Accounts"
 msgstr "ç¼?è¾?->è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1152
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ä¸?å?¯ç?¨æ¤ç?¹æ?§"
 
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1188
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
+"æ?¨æ? æ³?å??è¿?æ?¥å?°æ?¨å±?å??ç½?ä¸ç??ç?¨æ?·è??å¤©ï¼?å? ä¸ºæ²¡æ??å®?è£? telepathy-salutã??å¦?æ??æ?¨æ?³å?¯"
+"ç?¨è¯¥å??è?½ï¼?è¯·å®?è£? telepathy-salut å??ï¼?å¹¶ä¸?å?¨è´¦æ?·å¯¹è¯?æ¡?ä¸å??å»ºé??è¿?ç??äºº(People "
+"Nearby)è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1194
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1240
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
 
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1274
 msgid "Welcome to Empathy"
 msgstr "æ¬¢è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1283
 msgid "Import your existing accounts"
 msgstr "å¯¼å?¥ç?°æ??å¸?æ?·"
 
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1301
 msgid "Please enter personal details"
-msgstr ""
+msgstr "è¯·è¾?å?¥ä¸ªäººä¿¡æ?¯"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
@@ -2268,54 +2253,54 @@ msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å?ç??ä¿®æ?¹ã??"
 msgid "Your new account has not been saved yet."
 msgstr "æ?¨ç??æ?°å¸?æ?·è¿?æ²¡æ??ä¿?å?ã??"
 
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:274 ../src/empathy-call-window.c:730
 msgid "Connectingâ?¦"
 msgstr "æ£å?¨è¿?æ?¥..."
 
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected â?? %s"
-msgstr "å·²æ?å¼? - %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:315
 #, c-format
 msgid "Offline â?? %s"
 msgstr "ç¦»çº¿ - %s"
 
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:327
+#, c-format
+msgid "Disconnected â?? %s"
+msgstr "å·²æ?å¼? - %s"
+
+#: ../src/empathy-accounts-dialog.c:338
 msgid "Offline â?? No Network Connection"
 msgstr "ç¦»çº¿ - æ? å?¯ç?¨ç½?ç»?"
 
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:345
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç?¶æ??"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:357
 msgid "Offline â?? Account Disabled"
 msgstr "ç¦»çº¿ - å¸?æ?·è¢«ç¦?ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:798
 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:1115
+#: ../src/empathy-accounts-dialog.c:1145
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¨è¦?ä»?ç?µè??ä¸ç§»é?¤ %s å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1149
 msgid "This will not remove your account on the server."
 msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
 
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1386
 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:1933
+#: ../src/empathy-accounts-dialog.c:1963
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2343,98 +2328,98 @@ msgstr "æ·»å? (_A)..."
 msgid "_Importâ?¦"
 msgstr "å¯¼å?¥(_I)..."
 
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-call-window.c:454
 msgid "Contrast"
 msgstr "å¯¹æ¯?åº¦"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:457
 msgid "Brightness"
 msgstr "äº®åº¦"
 
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:460
 msgid "Gamma"
 msgstr "ä¼½é©¬"
 
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:568
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1030
 msgid "_Sidebar"
 msgstr "ä¾§è¾¹æ ?(_S)"
 
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1049
 msgid "Audio input"
 msgstr "é?³é¢?è¾?å?¥"
 
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1053
 msgid "Video input"
 msgstr "è§?é¢?è¾?å?¥"
 
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1057
 msgid "Dialpad"
 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:1117
+#: ../src/empathy-call-window.c:1125
 #, 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:1198
+#: ../src/empathy-call-window.c:1206
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:1845
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:1906
 msgid "Technical Details"
 msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:1944
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?é?³é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:1949
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?è§?é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:1955
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ä¸?è?½ä¸? %s å»ºç«?è¿?æ?¥ã??å?¯è?½æ?¯ä¸¤å?°è®¡ç®?æ?ºä¹?ä¸?ä¸?å??è®¸ç?´æ?¥è¿?æ?¥ã??"
 
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:1961
 msgid "There was a failure on the network"
 msgstr "ç½?ç»?å?ºç?°ä¸?ä¸ªé??è¯¯"
 
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:1965
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:1968
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1828
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:1978
+#, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
@@ -2443,15 +2428,15 @@ msgstr ""
 "Telepathy ç»?ä»¶å?ºç?°äº?ä¸?äº?æ??å¤?ã??è¯·<a href=\"%s\">æ±?æ?¥è¿?ä¸ªé??è¯¯</a>ï¼?å¹¶é??ä¸?å¸®å?©è??"
 "å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
 
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:1986
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?ä¸ªæ??é??"
 
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2025
 msgid "Can't establish audio stream"
 msgstr "ä¸?è?½å»ºç«?é?³é¢?æµ?"
 
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2035
 msgid "Can't establish video stream"
 msgstr "ä¸?è?½å»ºç«?è§?é¢?æµ?"
 
@@ -2493,7 +2478,7 @@ msgstr "é¢?è§?"
 
 #: ../src/empathy-call-window.ui.h:10
 msgid "Redial"
-msgstr "é??æ?"
+msgstr "é??æ?¨"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Send Audio"
@@ -2523,31 +2508,31 @@ msgstr "è§?é¢?é¢?è§?"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:447
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (å?? %u å?¶å®?)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:463
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d å?¶å®?æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:472
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d å?¨é?¨æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:675
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2569,7 +2554,7 @@ msgstr "æ??å?¥è¡¨æ??(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participantâ?¦"
-msgstr ""
+msgstr "é??è¯·å??ä¸?è??(_P)â?¦"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2636,21 +2621,20 @@ msgid "Manage Favorite Rooms"
 msgstr "ç®¡ç??è??å¤©å®¤æ?¶è??"
 
 #: ../src/empathy-event-manager.c:339
-#, fuzzy
 msgid "Incoming video call"
-msgstr "å?¼å?¥ç??è¯é?³é??è¯?"
+msgstr "å?¼å?¥ç??è§?é¢?é??è¯?"
 
 #: ../src/empathy-event-manager.c:339
 msgid "Incoming call"
 msgstr "æ?¥ç?µ"
 
 #: ../src/empathy-event-manager.c:343
-#, fuzzy, c-format
+#, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+msgstr "%s è§?é¢?æ?¥ç?µã??æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
 #: ../src/empathy-event-manager.c:344
-#, fuzzy, c-format
+#, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
@@ -2663,9 +2647,9 @@ msgid "_Answer"
 msgstr "æ?¥å?¬(_A)"
 
 #: ../src/empathy-event-manager.c:489
-#, fuzzy, c-format
+#, c-format
 msgid "Incoming video call from %s"
-msgstr "%s ç??æ?¥ç?µ"
+msgstr "%s ç??è§?é¢?å?¼å?«"
 
 #: ../src/empathy-event-manager.c:489
 #, c-format
@@ -2848,40 +2832,40 @@ msgid "Import Accounts"
 msgstr "å¯¼å?¥è´¦æ?·"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
 msgid "Import"
 msgstr "å¯¼å?¥"
 
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
 msgid "Protocol"
 msgstr "å??è®®"
 
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
 msgid "Source"
 msgstr "æº?"
 
-#: ../src/empathy-import-mc4-accounts.c:106
+#: ../src/empathy-import-mc4-accounts.c:108
 #, c-format
 msgid "%s account"
 msgstr "%s è´¦æ?·"
 
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:438
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:444
 msgid "Edit Account"
 msgstr "ç¼?è¾?è´¦æ?·"
 
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:450
 msgid "Close"
 msgstr "å?³é?"
 
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1136
 msgid "Contact"
 msgstr "è??ç³»äºº"
 
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1517
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -2911,7 +2895,7 @@ msgstr "å¸¸è§?è§?å?¾(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
-msgstr ""
+msgstr "æ?°å»ºå?¼å?«(_C)..."
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
@@ -2969,17 +2953,17 @@ msgstr "ä¸ªäººä¿¡æ?¯(_P)"
 msgid "_Room"
 msgstr "è??å¤©å®¤(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:382
 msgid "Chat Room"
 msgstr "è??å¤©å®¤"
 
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:398
 msgid "Members"
 msgstr "æ??å??"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:606
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -2988,20 +2972,20 @@ msgid ""
 "Members: %s"
 msgstr ""
 "<b>%s</b>\n"
-"é??è¦?é??è¯·ï¼?%s\n"
-"é??è¦?å¯?ç ?ï¼?%s\n"
-"æ??å??ï¼?%s"
+"é??è¦?é??è¯·: %s\n"
+"é??è¦?å¯?ç ?: %s\n"
+"æ??å??: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:636
 msgid "Could not start room listing"
 msgstr "æ? æ³?å¼?å§?è??å¤©å®¤å??è¡¨"
 
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:646
 msgid "Could not stop room listing"
 msgstr "æ? æ³?å??æ¢è??å¤©å®¤å??è¡¨"
 
@@ -3070,7 +3054,7 @@ msgstr "å¤?è§?"
 
 #: ../src/empathy-preferences.ui.h:2
 msgid "Automatically _connect on startup "
-msgstr "å?¯å?¨æ?¶è?ªå?¨ç?»å½?(_C) "
+msgstr "å?¯å?¨æ?¶è?ªå?¨è¿?æ?¥(_C) "
 
 #: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
@@ -3195,7 +3179,7 @@ msgstr "å??æ??ç??è??ç³»äººå?¬å¸?ä½?ç½®ä¿¡æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®ä¿¡æ?¯ç²¾åº¦(_R)"
 
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:153
 msgid "Respond"
 msgstr "å??åº?"
 
@@ -3276,23 +3260,24 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #: ../src/empathy-invite-participant-dialog.c:34
 #: ../src/empathy-invite-participant-dialog.c:48
 msgid "Invite Participant"
-msgstr ""
+msgstr "é??è¯·å??ä¸?è??"
 
 #: ../src/empathy-invite-participant-dialog.c:35
 msgid "Choose a contact to invite into the conversation:"
-msgstr ""
+msgstr "é??æ?©ä¸?ä¸ªè??ç³»äººä»¥å? å?¥è¯¥ä¼?è¯?ï¼?"
 
 #: ../src/empathy-accounts.c:213
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
+msgstr "ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?ï¼?å®?æ??æ??æ??å·¥ä½?ï¼?å¦?å¯¼å?¥ï¼?ç?¶å??é??å?º"
 
 #: ../src/empathy-accounts.c:217
 msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr ""
+msgstr "å¦?æ??æ??ä»»ä½?é?? salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?"
 
+# lainmeï¼?å??æ¬¡é??æ?©ç»?å®?ç??è´¦æ?·(æ¯?å¦? gabble/jabber/foo_40example_2eorg0)
 #: ../src/empathy-accounts.c:221
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
+msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?·(å¦? gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:223
 msgid "<account-id>"
@@ -3310,6 +3295,312 @@ msgstr "Empathy è´¦æ?·"
 msgid "Empathy Debugger"
 msgstr "Empathy è°?è¯?å?¨"
 
+#~ msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+#~ msgstr "ä½¿ç?¨ Google Talkã??Facebookã??MSN ä»¥å??è®¸å¤?å?¶å®?è??å¤©æ??å?¡"
+
+#~ msgid "Empathy Internet Messaging"
+#~ msgstr "Empathy å?³æ?¶é??è®¯ç¨?åº?"
+
+#~ msgid "Display incoming events in the status area"
+#~ msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?ä»¶ã??"
+
+#~ msgid ""
+#~ "Display incoming events in the status area. If false, present them to the "
+#~ "user immediately."
+#~ msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?ä»¶ã??å¦?æ??ä¸º false å??ç«?å?³æ?¾ç¤ºç»?ç?¨æ?·ã??"
+
+#~ msgid "Empathy should auto-away when idle"
+#~ msgstr "Empathy ç©ºé?²æ?¶æ?¯å?¦è?ªå?¨ç¦»å¼?"
+
+#~ msgid "The position for the chat window side pane"
+#~ msgstr "è??å¤©çª?å?£è¾¹æ ?ç??ä½?ç½®"
+
+#~ msgid "The stored position (in pixels) of the chat window side pane."
+#~ msgstr "è??å¤©çª?å?£è¾¹æ ?ä¿?å?ç??ä½?ç½®(å??ç´ )ã??"
+
+#~ msgid ""
+#~ "Whether Empathy should go into away mode automatically if the user is "
+#~ "idle."
+#~ msgstr "Empathy æ?¯å?¦åº?å?¨ç?¨æ?·ç©ºé?²æ?¶è?ªå?¨è¿?å?¥ç¦»å¼?æ¨¡å¼?ã??"
+
+#~ msgid "Unknown"
+#~ msgstr "æ?ªç?¥"
+
+#~ msgid "Encryption is not available"
+#~ msgstr "å? å¯?ä¸?å?¯ç?¨"
+
+#~ msgid "Certificate is invalid"
+#~ msgstr "è¯?ä¹¦æ? æ??"
+
+#~ msgid "Connection has been refused"
+#~ msgstr "è¿?æ?¥è¢«æ??ç»?"
+
+#~ msgid "Connection can't be established"
+#~ msgstr "æ? æ³?å»ºç«?è¿?æ?¥"
+
+#~ msgid "Connection has been lost"
+#~ msgstr "è¿?æ?¥å·²ä¸¢å¤±"
+
+#~ msgid "This resource is already connected to the server"
+#~ msgstr "è¯¥èµ?æº?å·²è¢«è¿?æ?¥è?³æ??å?¡å?¨"
+
+#~ msgid ""
+#~ "Connection has been replaced by a new connection using the same resource"
+#~ msgstr "è¿?æ?¥å·²è¢«ä½¿ç?¨ç?¸å??èµ?æº?ç??æ?°è¿?æ?¥å??ä»£"
+
+#~ msgid "The account already exists on the server"
+#~ msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
+
+#~ msgid "Server is currently too busy to handle the connection"
+#~ msgstr "æ??å?¡å?¨å¤ªå¿?ï¼?æ? æ³?å¤?ç??å½?å??è¿?æ?¥"
+
+#~ msgid "Certificate has been revoked"
+#~ msgstr "è¯?ä¹¦å·²è¢«å??é??"
+
+#~ msgid ""
+#~ "The length of the server certificate, or the depth of the server "
+#~ "certificate chain, exceed the limits imposed by the cryptography library"
+#~ msgstr "æ??å?¡å?¨è¯?ä¹¦ç??é?¿åº¦â??â??æ??æ??å?¡å?¨è¯?ä¹¦é?¾ç??æ·±åº¦â??â??è¶?å?ºäº?å? å¯?åº?ç??ç¡¬æ?§é??å?¶"
+
+#~ msgid "Password"
+#~ msgstr "å¯?ç ?"
+
+#~ msgid "A_pply"
+#~ msgstr "åº?ç?¨(_P)"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "å??æ¶?(_N)"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "å?ç¬¦é??(_A):"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "æ?¨ç?? IRC æ?µç§°æ?¯ä»?ä¹??"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "å?ªä¸ª IRC ç½?ç»??"
+
+#~ msgid "E-_mail address:"
+#~ msgstr "ç?µå?é?®ä»¶å?°å??(_M):"
+
+#~ msgid "Nic_kname:"
+#~ msgstr "æ?µç§°(_K):"
+
+#~ msgid "Phone number:"
+#~ msgstr "ç?µè¯?å?·ç ?ï¼?"
+
+#~ msgid "%s, %s"
+#~ msgstr "%s, %s"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "å·²ç»?å®?ç??è??ç³»äºº"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "é??æ?©è¦?ç»?å®?ç??è??ç³»äºº"
+
+#~ msgid "New contact preview"
+#~ msgstr "æ?°è??ç³»äººé¢?è§?"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "å?¨å·¦ä¾§å??è¡¨ä¸é??ä¸ç??è??ç³»äººå°?è¢«ç»?å®?å?¨ä¸?èµ·ã??"
+
+#~ msgid "%s (%s)"
+#~ msgstr "%s (%s)"
+
+#~ msgctxt "Edit individual (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "ç¼?è¾?(_E)"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contactsâ?¦"
+#~ msgstr "ç»?å®?è??ç³»äºº(_L)â?¦"
+
+#~ msgid "Meta-contact containing %u contact"
+#~ msgid_plural "Meta-contact containing %u contacts"
+#~ msgstr[0] "å??å?« %u ä½?è??ç³»äººç??å??è??ç³»äºº"
+
+#~ msgid "<b>Location</b> at (date)"
+#~ msgstr "<b>ä½?ç½®</b> äº? (æ?¥æ??)"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "é??æ?©ä¸?ä¸ª IRC ç½?ç»?"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ç»?å®?è??ç³»äºº"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlinkâ?¦"
+#~ msgstr "è§£é?¤ç»?å®?(_U)â?¦"
+
+#~ msgid ""
+#~ "Completely split the displayed meta-contact into the contacts it contains."
+#~ msgstr "å°?æ?¾ç¤ºç??å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
+
+#~ msgid "_Link"
+#~ msgstr "ç»?å®?(_L)"
+
+#~ msgid "Unlink meta-contact '%s'?"
+#~ msgstr "è§£é?¤ç»?å®?å??è??ç³»äºº '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink this meta-contact? This will completely "
+#~ "split the meta-contact into the contacts it contains."
+#~ msgstr ""
+#~ "æ?¯å?¦å¸?æ??è§£é?¤ç»?å®?è¯¥å??è??ç³»äºº? è¿?å°?å°?è¯¥å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "è§£é?¤ç»?å®?(_U)"
+
+#~ msgid "Find Next"
+#~ msgstr "å??ä¸?æ?¥æ?¾"
+
+#~ msgid "Find Previous"
+#~ msgstr "å??ä¸?æ?¥æ?¾"
+
+#~ msgid "C_all"
+#~ msgstr "é??è¯?(_A)"
+
+#~ msgid "The identity provided by the chat server cannot be verified.\n"
+#~ msgstr "è??å¤©æ??å?¡å?¨æ??æ??ä¾?ç??èº«ä»½æ? æ³?éª?è¯?ã??\n"
+
+#~ msgid "The certificate is not signed by a Certification Authority"
+#~ msgstr "è¯?ä¹¦å¹¶é??ç?± CA ç¾å??"
+
+#~ msgid "The certificate has expired"
+#~ msgstr "è¯?ä¹¦å·²è¿?æ??"
+
+#~ msgid "The certificate hasn't yet been activated"
+#~ msgstr "è¯?ä¹¦å°?æ?ªè¢«æ¿?æ´»"
+
+#~ msgid "The certificate does not have the expected fingerprint"
+#~ msgstr "è¯?ä¹¦ç¼ºé¢?æ??ç??æ??çº¹"
+
+#~ msgid ""
+#~ "The hostname verified by the certificate doesn't match the server name"
+#~ msgstr "è¯?ä¹¦æ??éª?è¯?ç??ä¸»æ?ºå??ä¸?æ??å?¡å?¨å??ä¸?å?¹é??"
+
+#~ msgid "The certificate is self-signed"
+#~ msgstr "è¯?ä¹¦æ?¯è?ªç¾å±?ç??"
+
+#~ msgid ""
+#~ "The certificate has been revoked by the issuing Certification Authority"
+#~ msgstr "è¯?ä¹¦è¢«è¯?ä¹¦ç¾å??æ?ºæ??å??é??"
+
+#~ msgid "The certificate length exceeds verifiable limits"
+#~ msgstr "è¯?ä¹¦é?¿åº¦è¶?å?ºå?¯éª?è¯?é??å?¶"
+
+#~ msgid "The certificate is malformed"
+#~ msgstr "è¯?ä¹¦å¼?å¸¸"
+
+#~ msgid "Expected hostname: %s"
+#~ msgstr "é¢?æ??ä¸»æ?ºå??: %s"
+
+#~ msgid "Certificate hostname: %s"
+#~ msgstr "è¯?ä¹¦ä¸»æ?ºå??: %s"
+
+#~ msgid "Continue"
+#~ msgstr "ç»§ç»"
+
+#~ msgid "This connection is untrusted. Would you like to continue anyway?"
+#~ msgstr "è¿?æ?¥ä¸?å??ä¿¡ä»»ã??æ?¯å?¦ä»?è¦?ç»§ç»?"
+
+#~ msgid "Remember this choice for future connections"
+#~ msgstr "ä¸ºå°?æ?¥ç??è¿?æ?¥è®°ä½?æ?¬æ¬¡é??æ?©"
+
+#~ msgid "Certificate Details"
+#~ msgstr "è¯?ä¹¦è¯¦æ??"
+
+#~ msgid "Incoming file from %s"
+#~ msgstr "ä»? %s ä¼ æ?¥ç??æ??ä»¶"
+
+#~ msgid "Loading account information"
+#~ msgstr "æ£å?¨å? è½½è´¦å?·ä¿¡æ?¯"
+
+#~ msgid " - Empathy authentication client"
+#~ msgstr " - Empathy è®¤è¯?å®¢æ?·ç«¯"
+
+#~ msgid "Empathy authentication client"
+#~ msgstr "Empathy è®¤è¯?å®¢æ?·ç«¯"
+
+#~ msgid "- Empathy Audio/Video Client"
+#~ msgstr " - Empathy è¯é?³/è§?é¢?å®¢æ?·ç«¯"
+
+#~ msgid "Empathy Audio/Video Client"
+#~ msgstr "Empathy è¯é?³/è§?é¢?å®¢æ?·ç«¯"
+
+#~ msgid "Details"
+#~ msgstr "è¯¦ç»?ä¿¡æ?¯"
+
+#~ msgid "The IP address as seen by the machine"
+#~ msgstr "æ?ºå?¨æ??è§?ç?? IP å?°å??"
+
+#~ msgid "The IP address as seen by a server on the Internet"
+#~ msgstr "Internet ä¸?æ??å?¡å?¨æ??è§?ç?? IP å?°å??"
+
+#~ msgid "The IP address of the peer as seen by the other side"
+#~ msgstr "å?¦ä¸?æ?¹æ??è§?ç?? IP å?°å??"
+
+#~ msgid "The IP address of a relay server"
+#~ msgstr "ä¸è½¬æ??å?¡å?¨ IP å?°å??"
+
+#~ msgid "The IP address of the multicast group"
+#~ msgstr "å¤?æ?ç»?ç?? IP å?°å??"
+
+#~ msgid "The end of the stream was reached"
+#~ msgstr "å·²å?°è¾¾æµ?ç??æ?«å°¾"
+
+#~ msgid "Audio"
+#~ msgstr "é?³é¢?"
+
+#~ msgid "Decoding Codec:"
+#~ msgstr "è§£ç ?å?¨ï¼?"
+
+#~ msgid "Encoding Codec:"
+#~ msgstr "ç¼?ç ?å?¨ï¼?"
+
+#~ msgid "Video"
+#~ msgstr "è§?é¢?"
+
+#~ msgid "Notify for All Messages"
+#~ msgstr "æ??ç¤ºæ??æ??æ¶?æ?¯"
+
+#~ msgid "_Undo Close Tab"
+#~ msgstr "æ?¤é??å?³é?æ ?ç¾(_U)"
+
+#~ msgid "Invitation to join %s"
+#~ msgstr "é??è¯·æ?¨å? å?¥ %s"
+
+#~ msgid "You have been invited to join %s"
+#~ msgstr "æ?¨è¢«é??è¯·å? å?¥ %s"
+
+#~ msgid "No match found"
+#~ msgstr "æ²¡æ??æ?¾å?°å?¹é??é¡¹"
+
+#~ msgid "Display incoming events in the notification area"
+#~ msgstr "å??æ??ç¤ºå?ºå??æ?¾ç¤ºå?¼å?¥äº?ä»¶"
+
+#~ msgid "Log conversations"
+#~ msgstr "è®°å½?å¯¹è¯?"
+
+#~ msgid "Reject"
+#~ msgstr "æ??ç»?"
+
+#~ msgid "Answer"
+#~ msgstr "æ?¥å?¬"
+
+#~ msgid "Decline"
+#~ msgstr "æ??ç»?"
+
+#~ msgid "Accept"
+#~ msgstr "æ?¥å??"
+
+#~ msgid "Invite"
+#~ msgstr "é??è¯·"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "å?ºç«?ä»£ç??ç«¯å?£"
+
 #~ msgid "Salut account is created"
 #~ msgstr "å·²å??å»º Salut è´¦æ?·"
 
@@ -3327,9 +3618,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "Email:"
 #~ msgstr "ç?µå?é?®ä»¶ï¼?"
 
-#~ msgid "C_all"
-#~ msgstr "é??è¯?(_A)"
-
 #~ msgid "Custom Message..."
 #~ msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
@@ -3495,9 +3783,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy å?³æ?¶é??è®¯ç¨?åº?"
-
 #~ msgid "- Empathy Instant Messenger"
 #~ msgstr "- Empathy å?³æ?¶é??è®¯ç¨?åº?"
 
@@ -3513,9 +3798,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>æ??å?¡å?¨</b>"
 
-#~ msgid "Create a new IRC network"
-#~ msgstr "å??å»ºæ?°ç?? IRC ç½?ç»?"
-
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "ç¼?è¾?é??ä¸ç?? IRC ç½?ç»?"
 
@@ -3553,9 +3835,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>ç¾¤ç»?</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "è??ç³»äººä¿¡æ?¯"
-
 #~ msgid "Message:"
 #~ msgstr "æ¶?æ?¯ï¼?"
 
@@ -3589,9 +3868,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "Invitation _message:"
 #~ msgstr "é??è¯·æ¶?æ?¯(_M)ï¼?"
 
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "æ?¨è¢«é??è¯·å? å?¥ä¸?ä¸ªè??å¤©ä¼?è®®ã??"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ç¼?è¾?è??å¤©å®¤æ?¶è??"
 
@@ -3636,9 +3912,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr "æ?¨æ?³è¦?æ?¥æ?¶æ??ä»¶â??%sâ??(%s)å??ï¼?"
 
-#~ msgid "_Accept"
-#~ msgstr "æ?¥å??(_A)"
-
 #~ msgid "File transfers"
 #~ msgstr "æ??ä»¶ä¼ é??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]