[empathy] Updated Simplified Chinese translation.



commit d2a7455e20bfbf9787e69c60af8877205c5cd982
Author: Aron Xu <aronxu gnome org>
Date:   Wed Dec 9 13:06:45 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po |  743 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 465 insertions(+), 278 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3ca16d1..6be5530 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,14 +12,16 @@
 # Lyper Lai <lyp069 gmail com>, 2009.
 # Yun Nie <yun nie ptiglobal net>, 2009.
 # Richard Ma <richard ma 19850509 gmail com>, 2009.
+# Tao Wei <weitao1979 gmail com>, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:23+0800\n"
-"PO-Revision-Date: 2009-11-16 19:37+0800\n"
-"Last-Translator: Richard Ma <richard ma 1850509 gmail com>\n"
+"Project-Id-Version: empathy master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2009-12-08 15:17+0000\n"
+"PO-Revision-Date: 2009-12-09 13:06+0800\n"
+"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
 "Language-Team: Simplified Chinese <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -70,7 +72,6 @@ msgid "Connection managers should be used"
 msgstr "åº?该使ç?¨è¿?æ?¥ç®¡ç??å?¨"
 
 #: ../data/empathy.schemas.in.h:7
-#, fuzzy
 msgid "Contact list sort criterion"
 msgstr "è??系人å??表æ??åº?æ?¡ä»¶"
 
@@ -144,11 +145,11 @@ msgstr "é??è??主çª?å?£ã??"
 
 #: ../data/empathy.schemas.in.h:25
 msgid "MC 4 accounts have been imported"
-msgstr "MC 4 账�已被导�"
+msgstr "MC 4 账�已�被导�"
 
 #: ../data/empathy.schemas.in.h:26
 msgid "MC 4 accounts have been imported."
-msgstr "MC 4 accounts have been importedã??"
+msgstr "MC 4 å¸?æ?·å·²ç»?被导å?¥ã??"
 
 #: ../data/empathy.schemas.in.h:27
 msgid "Nick completed character"
@@ -414,14 +415,13 @@ msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
 
 #: ../data/empathy.schemas.in.h:86
-#, fuzzy
 msgid ""
 "Which criterion 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"
-"æ??åº?ã??å??å?¼ä¸º\"state\"æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
+"使ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼â??nameâ??以æ??è??系人å§?å??æ??åº?ã??å??å?¼"
+"为â??stateâ??æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
 
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
@@ -445,7 +445,7 @@ msgstr "é??è¿?ç??人"
 
 #: ../libempathy/empathy-tp-file.c:280
 msgid "Socket type not supported"
-msgstr "ä¸?æ?¯æ??Socketç±»å??"
+msgstr "ä¸?æ?¯æ?? Socket ç±»å??"
 
 #: ../libempathy/empathy-tp-file.c:399
 msgid "No reason was specified"
@@ -551,22 +551,22 @@ msgstr "å°?æ?¥"
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:439
-#: ../libempathy-gtk/empathy-account-widget.c:495
+#: ../libempathy-gtk/empathy-account-widget.c:519
+#: ../libempathy-gtk/empathy-account-widget.c:575
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1289
+#: ../libempathy-gtk/empathy-account-widget.c:1292
 msgid "L_og in"
-msgstr "��"
+msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1353
+#: ../libempathy-gtk/empathy-account-widget.c:1500
 msgid "Enabled"
 msgstr "��"
 
 #.  Translators: this is used only when built on a moblin platform 
-#: ../libempathy-gtk/empathy-account-widget.c:1359
+#: ../libempathy-gtk/empathy-account-widget.c:1506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -579,19 +579,19 @@ msgstr "账��"
 #. * 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.
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1770
 #, 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"
-#: ../libempathy-gtk/empathy-account-widget.c:1641
+#: ../libempathy-gtk/empathy-account-widget.c:1788
 #, c-format
 msgid "%s Account"
 msgstr "%s 账�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1645
+#: ../libempathy-gtk/empathy-account-widget.c:1792
 msgid "New account"
 msgstr "�建账�"
 
@@ -606,7 +606,7 @@ msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??称</span>"
 #: ../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
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "�级"
@@ -616,7 +616,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:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "��(_W)�"
@@ -696,6 +696,39 @@ msgstr "å­?符é??(_C)ï¼?"
 msgid "New Network"
 msgstr "�建��"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+msgid "Auto"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+msgid "Register"
+msgstr ""
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+msgid "Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+msgid "None"
+msgstr "æ? "
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "å­?符é??ï¼?"
@@ -722,7 +755,7 @@ msgstr "é??å?ºæ¶?æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
-msgstr "å?¨å??ï¼?"
+msgstr "ç??å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Servers"
@@ -821,31 +854,85 @@ msgid "_Published Name:"
 msgstr "å?¬å¼?ç??å??å­?(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Keep-Alive Options</b>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "<b>Miscellaneous Options</b>"
+msgstr "<b>æ??项é??项</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>NAT Traversal Options</b>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "<b>Proxy Options</b>"
+msgstr "<b>代ç??é??项</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
 msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Authentication username:"
+msgstr "éª?è¯?ç?¨æ?·å??ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Discover Binding"
+msgstr ""
+
 #. 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
-msgid "Discover STUN"
-msgstr "æ??ç´¢ STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Discover the STUN server automatically"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Hostname of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Interval (seconds)"
+msgstr "é?´é??(ç§?)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Loose Routing"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port:"
+msgstr "端��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "STUN æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN 端��"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Server:"
+msgstr "æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Transport:"
+msgstr "ä¼ è¾?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
@@ -898,145 +985,149 @@ msgstr "å?¾å??"
 msgid "All Files"
 msgstr "æ??æ??æ??件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:327
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:194
+#: ../libempathy-gtk/empathy-chat.c:199
 msgid "Failed to reconnect this chat"
 msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
 
-#: ../libempathy-gtk/empathy-chat.c:592
+#: ../libempathy-gtk/empathy-chat.c:621
 msgid "Failed to join chatroom"
 msgstr "å? å?¥è??天室失败"
 
-#: ../libempathy-gtk/empathy-chat.c:610
+#: ../libempathy-gtk/empathy-chat.c:639
 msgid "Failed to open private chat"
 msgstr "建��人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:649
+#: ../libempathy-gtk/empathy-chat.c:678
 msgid "Topic not supported on this conversation"
 msgstr "ä¸?æ?¯æ??å?¨æ­¤ä¼?è¯?ä¸?设置主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:684
 msgid "You are not allowed to change the topic"
 msgstr "�����主�"
 
-#: ../libempathy-gtk/empathy-chat.c:773
+#: ../libempathy-gtk/empathy-chat.c:802
 msgid "/clear, clear all messages from the current conversation"
-msgstr "/clear, æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
+msgstr "/clearï¼?æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:776
+#: ../libempathy-gtk/empathy-chat.c:805
 msgid "/topic <topic>, set the topic of the current conversation"
-msgstr ""
+msgstr "/topic <topic>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:779
+#: ../libempathy-gtk/empathy-chat.c:808
 msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <chatroom id>, å? å?¥è??天室"
+msgstr "/join <chatroom id>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:782
+#: ../libempathy-gtk/empathy-chat.c:811
 msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <chatroom id>, å? å?¥è??天室"
+msgstr "/j <chatroom id>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:814
 msgid "/query <contact id> [<message>], open a private chat"
-msgstr ""
+msgstr "/query <contact id> [<message>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:788
+#: ../libempathy-gtk/empathy-chat.c:817
 msgid "/msg <contact id> <message>, open a private chat"
-msgstr ""
+msgstr "/msg <contact id> <message>ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:820
 msgid "/nick <nickname>, change your nickname on current server"
-msgstr ""
+msgstr "/nick <nickname>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
 
-#: ../libempathy-gtk/empathy-chat.c:794
+#: ../libempathy-gtk/empathy-chat.c:823
 msgid "/me <message>, send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:797
+#: ../libempathy-gtk/empathy-chat.c:826
 msgid ""
 "/say <message>, send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chatroom\""
 msgstr ""
+"/say <message>ï¼?å??é?? <message> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?"
+"å¦?ï¼?â??/say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
 
-#: ../libempathy-gtk/empathy-chat.c:802
+#: ../libempathy-gtk/empathy-chat.c:831
 msgid ""
 "/help [<command>], show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
+"/help [<command>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <command> 被å®?ä¹?ç??ï¼?æ?¾ç¤ºå®?ç??ç?¨"
+"æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:812
+#: ../libempathy-gtk/empathy-chat.c:841
 #, c-format
 msgid "Usage: %s"
 msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:870
 msgid "Unknown command"
 msgstr "���令"
 
-#: ../libempathy-gtk/empathy-chat.c:962
+#: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command, see /help for the available commands"
 msgstr "æ?ªç?¥å?½ä»¤ï¼?请使ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1133
 msgid "invalid contact"
 msgstr "æ? æ??è??系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1106
+#: ../libempathy-gtk/empathy-chat.c:1136
 msgid "permission denied"
 msgstr "æ??é??ä¸?足"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1139
 msgid "too long message"
 msgstr "��太�"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 msgid "not implemented"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-chat.c:1115
+#: ../libempathy-gtk/empathy-chat.c:1145
 msgid "unknown"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1119
+#: ../libempathy-gtk/empathy-chat.c:1149
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
 msgstr "��被设置为�%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
 msgstr "�设置��"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1554
 msgid "(No Suggestions)"
 msgstr "(没æ??建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1578
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1596
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1545
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1660
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1745
+#: ../libempathy-gtk/empathy-chat.c:1775
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已����"
@@ -1044,12 +1135,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:1752
+#: ../libempathy-gtk/empathy-chat.c:1782
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢�"
 
-#: ../libempathy-gtk/empathy-chat.c:1755
+#: ../libempathy-gtk/empathy-chat.c:1785
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -1057,17 +1148,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:1763
+#: ../libempathy-gtk/empathy-chat.c:1793
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:1766
+#: ../libempathy-gtk/empathy-chat.c:1796
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:1770
+#: ../libempathy-gtk/empathy-chat.c:1800
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离å¼?äº?è??天室"
@@ -1077,64 +1168,69 @@ msgstr "%s 离å¼?äº?è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1779
+#: ../libempathy-gtk/empathy-chat.c:1809
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1802
+#: ../libempathy-gtk/empathy-chat.c:1834
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1934 ../src/empathy-call-window.c:1297
+#: ../libempathy-gtk/empathy-chat.c:1859
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s ç?°å?¨å?«å?? %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1534
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../libempathy-gtk/empathy-chat.c:2424
+#: ../libempathy-gtk/empathy-chat.c:2521
 msgid "Wrong password; please try again:"
-msgstr ""
+msgstr "å¯?ç ?é??误ï¼?请é??è¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2522
 msgid "Retry"
-msgstr ""
+msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:2430
+#: ../libempathy-gtk/empathy-chat.c:2527
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "è¿?个æ?¿é?´æ?¯ç?±ä¸?个å¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2431
+#: ../libempathy-gtk/empathy-chat.c:2528
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2668
 msgid "Connected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2621
+#: ../libempathy-gtk/empathy-chat.c:2721
 #: ../libempathy-gtk/empathy-log-window.c:546
 msgid "Conversation"
 msgstr "对�"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:557
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:650
 msgid "Topic:"
 msgstr "���"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:315
-#: ../libempathy-gtk/empathy-theme-adium.c:808
+#: ../libempathy-gtk/empathy-chat-text-view.c:317
+#: ../libempathy-gtk/empathy-theme-adium.c:817
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-theme-adium.c:815
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:824
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:422
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
@@ -1158,27 +1254,27 @@ msgstr "以å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "订é??请æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-list-view.c:1555
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1418
+#: ../libempathy-gtk/empathy-contact-list-view.c:1557
 msgid "Removing group"
 msgstr "��群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1465
-#: ../libempathy-gtk/empathy-contact-list-view.c:1542
+#: ../libempathy-gtk/empathy-contact-list-view.c:1604
+#: ../libempathy-gtk/empathy-contact-list-view.c:1681
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-list-view.c:1634
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1497
+#: ../libempathy-gtk/empathy-contact-list-view.c:1636
 msgid "Removing contact"
 msgstr "å? é?¤è??系人"
 
@@ -1244,120 +1340,120 @@ msgstr "ä¿?å­?头å??"
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å­?头å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1034
+#: ../libempathy-gtk/empathy-contact-widget.c:1010
+#: ../src/empathy-main-window.c:1026
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
 msgid "Country ISO Code:"
-msgstr "å??æ?¬ ISO ç¼?ç ?"
+msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
 msgid "Country:"
-msgstr "�家"
+msgstr "�家�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
 msgid "State:"
-msgstr "ç??"
+msgstr "ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
 msgid "City:"
-msgstr "�"
+msgstr "å??å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
 msgid "Area:"
-msgstr "å?°å?º"
+msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
 msgid "Postal Code:"
-msgstr "����"
+msgstr "�����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
 msgid "Street:"
-msgstr "è¡?"
+msgstr "è¡?é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
 msgid "Building:"
-msgstr "建��"
+msgstr "建���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
 msgid "Floor:"
 msgstr "楼��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1287
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1289
 msgid "Error:"
 msgstr "é??误ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1291
 msgid "Vertical Error (meters):"
-msgstr "å??ç?´è¯¯å·®(ç±³):"
+msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1293
 msgid "Horizontal Error (meters):"
-msgstr "水平误差(米):"
+msgstr "水平误差(米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1295
 msgid "Speed:"
-msgstr "é??度:"
+msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1297
 msgid "Bearing:"
-msgstr "æ?¹ä½?æ??å??:"
+msgstr "æ?¹ä½?æ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1299
 msgid "Climb Speed:"
-msgstr "ç?¬å??é??度:"
+msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1301
 msgid "Last Updated on:"
-msgstr "æ??è¿?æ?´æ?°äº?:"
+msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1303
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:1305
 msgid "Latitude:"
 msgstr "纬度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:1307
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1367
+#: ../libempathy-gtk/empathy-contact-widget.c:1368
 msgid "<b>Location</b>"
 msgstr "<b>ä½?ç½®</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1380
+#: ../libempathy-gtk/empathy-contact-widget.c:1381
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®</b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1430
+#: ../libempathy-gtk/empathy-contact-widget.c:1431
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y � %R UTC ��"
 
@@ -1382,7 +1478,7 @@ msgid "Client:"
 msgstr "客�端�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1017
+#: ../src/empathy-main-window.c:1009
 msgid "Contact"
 msgstr "è??系人"
 
@@ -1405,11 +1501,11 @@ msgstr "ç»?"
 #. Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
-msgstr "�� ID�"
+msgstr "��符�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
-msgstr "已请�信�..."
+msgstr "信�已请�..."
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
@@ -1496,34 +1592,34 @@ msgstr "�建对�"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:177
-#: ../libempathy-gtk/empathy-presence-chooser.c:213
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:230
-#: ../libempathy-gtk/empathy-presence-chooser.c:232
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages..."
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:331
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to remove this status as a favorite"
 msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:340
+#: ../libempathy-gtk/empathy-presence-chooser.c:353
 msgid "Click to make this status a favorite"
 msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:374
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "设置ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:876
+#: ../libempathy-gtk/empathy-presence-chooser.c:895
 msgid "Set your presence and current status"
 msgstr "设置你ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1082
 msgid "Custom messages..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
@@ -1599,21 +1695,21 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
+#: ../libempathy-gtk/empathy-ui-utils.c:1407
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1537
 msgid "Select a file"
 msgstr "é??æ?©æ??件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
+#: ../libempathy-gtk/empathy-ui-utils.c:1597
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "å½?å?? Locale"
+msgstr "å½?å??语è¨?ç?¯å¢?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -1690,7 +1786,7 @@ msgstr "å¸?è??语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr "�度 Gujarati 语"
+msgstr "å?¤å??æ??ç?¹è¯­"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
@@ -1794,19 +1890,19 @@ msgstr "æ? é??误信æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "����(Empathy)"
 
-#: ../src/empathy.c:889
+#: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "��������"
 
-#: ../src/empathy.c:893
+#: ../src/empathy.c:897
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
 
-#: ../src/empathy.c:897
+#: ../src/empathy.c:901
 msgid "Show the accounts dialog"
 msgstr "�示账�对��"
 
-#: ../src/empathy.c:909
+#: ../src/empathy.c:913
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客�端"
 
@@ -1963,8 +2059,8 @@ msgid "Select the accounts you want to import:"
 msgstr "é??æ?©æ?¨è¦?导å?¥ç??è´¦æ?·ï¼?"
 
 #: ../src/empathy-account-assistant.c:720
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -1991,7 +2087,7 @@ msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å­?ç??ä¿®æ?¹ã??"
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:67
 msgid "Your new account has not been saved yet."
-msgstr ""
+msgstr "æ?¨ç??æ?°å¸?æ?·è¿?没æ??ä¿?å­?ã??"
 
 #: ../src/empathy-accounts-dialog.c:484
 msgid ""
@@ -2023,7 +2119,7 @@ msgstr "æ?¨å°?è¦?å?³é?­æ­¤çª?å?£ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继续
 #.  Translators: this is used only when built on a moblin platform 
 #: ../src/empathy-accounts-dialog.c:1596
 msgid "_Next"
-msgstr "_��页"
+msgstr "��页(_N)"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
@@ -2057,7 +2153,7 @@ msgstr "å??建æ?°ç??å¸?æ?·(_C)"
 
 #: ../src/empathy-accounts-dialog.ui.h:8
 msgid "_Import..."
-msgstr "_导���"
+msgstr "导�(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:9
 msgid "_Reuse an existing account"
@@ -2067,124 +2163,219 @@ msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
 msgid "account"
 msgstr "账�"
 
-#: ../src/empathy-call-window.c:428
+#: ../src/empathy-call-window.c:452
 msgid "Contrast"
 msgstr "对�度"
 
-#: ../src/empathy-call-window.c:431
+#: ../src/empathy-call-window.c:455
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:434
+#: ../src/empathy-call-window.c:458
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:542
+#: ../src/empathy-call-window.c:566
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:676
+#: ../src/empathy-call-window.c:728
 msgid "Connecting..."
 msgstr "正���..."
 
-#: ../src/empathy-call-window.c:784
+#: ../src/empathy-call-window.c:1021
 msgid "_Sidebar"
 msgstr "侧边�(_S)"
 
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1040
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-call-window.c:809
+#: ../src/empathy-call-window.c:1046
 msgid "Audio input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:813
+#: ../src/empathy-call-window.c:1050
 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:876
+#: ../src/empathy-call-window.c:1113
 #, 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:957
+#: ../src/empathy-call-window.c:1194
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1457
+#: ../src/empathy-call-window.c:1697
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1517
-#, fuzzy
+#: ../src/empathy-call-window.c:1758
 msgid "Technical Details"
-msgstr "è??系人详æ??"
+msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-call-window.c:1796
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1556
+#: ../src/empathy-call-window.c:1801
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-call-window.c:1807
 #, 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:1604
+#: ../src/empathy-call-window.c:1813
+msgid "There was a failure on the network"
+msgstr "ç½?ç»?å?ºç?°ä¸?个é??误"
+
+#: ../src/empathy-call-window.c:1817
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
+
+#: ../src/empathy-call-window.c:1820
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
+
+#: ../src/empathy-call-window.c:1830
+#, c-format
+msgid ""
+"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Telepathy ç»?件å?ºç?°äº?ä¸?äº?æ??å¤?ã??请<a href=\"%s\">æ±?æ?¥è¿?个é??误</a>ï¼?并é??ä¸?帮å?©è??"
+"å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
+
+#: ../src/empathy-call-window.c:1838
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1877
 msgid "Can't establish audio stream"
 msgstr "��建����"
 
-#: ../src/empathy-call-window.c:1614
+#: ../src/empathy-call-window.c:1887
 msgid "Can't establish video stream"
 msgstr "��建����"
 
 #: ../src/empathy-call-window.ui.h:1
+msgid "Call the contact again"
+msgstr "å??次å?¼å?«è??系人"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Camera Off"
+msgstr "����"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera On"
+msgstr "����"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Disable camera and stop sending video"
+msgstr "ç¦?ç?¨ç?¸æ?ºå??æ­¢å??é??è§?é¢?"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Enable camera and send video"
+msgstr "å?¯ç?¨ç?¸æ?ºï¼?并å??é??è§?é¢?"
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Enable camera but don't send video"
+msgstr "å?¯ç?¨ç?¸æ?ºï¼?ä½?ä¸?å??é??è§?é¢?"
+
+#: ../src/empathy-call-window.ui.h:7
 msgid "Hang up"
 msgstr "æ??èµ·"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr "æ??èµ·å½?å??å?¼å?«"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Preview"
+msgstr "��"
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Redial"
 msgstr "é??æ?­"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:11
 msgid "Send Audio"
 msgstr "å??é??é?³é¢?"
 
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "å??é??è§?é¢?"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "å??æ?¢é?³é¢?ä¼ è¾?"
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr "��(_I)"
+
+#: ../src/empathy-call-window.ui.h:14
+msgid "Video Off"
+msgstr "����"
+
+#: ../src/empathy-call-window.ui.h:15
+msgid "Video On"
+msgstr "����"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video Preview"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:17
 msgid "_Call"
 msgstr "é??è¯?(_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:26
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:561
+#: ../src/empathy-chat-window.c:408 ../src/empathy-chat-window.c:428
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d �读)"
+
+#: ../src/empathy-chat-window.c:420
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (å?? %u å?¶å®?)"
+
+#: ../src/empathy-chat-window.c:436
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d ���读)"
+
+#: ../src/empathy-chat-window.c:445
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d ���读)"
+
+#: ../src/empathy-chat-window.c:654
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2248,15 +2439,15 @@ msgstr "æ?¾ç¤ºè??系人å??表(_S)"
 msgid "_Tabs"
 msgstr "æ ?ç­¾(_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
 msgid "Name"
 msgstr "å??称"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
 msgid "Auto-Connect"
 msgstr "����"
 
@@ -2354,105 +2545,105 @@ msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:105
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:181
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中ç?? %1$sï¼?é??度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:277
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中ç?? %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正�� %2$s �� \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:311
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?? %2$s å??é?? \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "ä»? %2$s æ?¥æ?¶ \"%1$s\" å?ºé??"
 
-#: ../src/empathy-ft-manager.c:344
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æ??件å?ºé??"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?? %2$s å??é?? \"%1$s\" å?ºé??"
 
-#: ../src/empathy-ft-manager.c:352
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "å??é??æ??件å?ºé??"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:491
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "å·²ç»?ä»? %2$s å®?æ??æ?¥æ?¶ \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "å·²ç»?å?? %2$s å®?æ??å??é?? \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:499
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "æ??件传é??å®?æ??"
 
-#: ../src/empathy-ft-manager.c:618 ../src/empathy-ft-manager.c:785
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??ä¸?è??ç??å??åº?"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "��\"%s\"���"
 
-#: ../src/empathy-ft-manager.c:647 ../src/empathy-ft-manager.c:685
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校�中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:991
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1053
+#: ../src/empathy-ft-manager.c:1003
 msgid "File"
 msgstr "æ??件"
 
-#: ../src/empathy-ft-manager.c:1075
+#: ../src/empathy-ft-manager.c:1025
 msgid "Remaining"
 msgstr "å?©ä½?"
 
@@ -2492,75 +2683,75 @@ msgstr "�"
 msgid "%s account"
 msgstr "%s 账�"
 
-#: ../src/empathy-main-window.c:413
+#: ../src/empathy-main-window.c:410
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:420
+#: ../src/empathy-main-window.c:417
 msgid "Edit Account"
 msgstr "��账�"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:424
 msgid "Close"
 msgstr "��"
 
-#: ../src/empathy-main-window.c:515
+#: ../src/empathy-main-window.c:512
 msgid "No error specified"
 msgstr "没æ??说æ??é??误"
 
-#: ../src/empathy-main-window.c:518
+#: ../src/empathy-main-window.c:515
 msgid "Network error"
 msgstr "ç½?ç»?é??误"
 
-#: ../src/empathy-main-window.c:521
+#: ../src/empathy-main-window.c:518
 msgid "Authentication failed"
 msgstr "��失败"
 
-#: ../src/empathy-main-window.c:524
+#: ../src/empathy-main-window.c:521
 msgid "Encryption error"
 msgstr "å? å¯?é??误"
 
-#: ../src/empathy-main-window.c:527
+#: ../src/empathy-main-window.c:524
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
 
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:527
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?书"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:530
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../src/empathy-main-window.c:536
+#: ../src/empathy-main-window.c:533
 msgid "Certificate expired"
 msgstr "è¯?书已è¿?æ??"
 
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:536
 msgid "Certificate not activated"
 msgstr "�书���活"
 
-#: ../src/empathy-main-window.c:542
+#: ../src/empathy-main-window.c:539
 msgid "Certificate hostname mismatch"
 msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:542
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?书æ??纹ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:548
+#: ../src/empathy-main-window.c:545
 msgid "Certificate self-signed"
 msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
 
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:548
 msgid "Certificate error"
 msgstr "è¯?书é??误"
 
-#: ../src/empathy-main-window.c:554
+#: ../src/empathy-main-window.c:551
 msgid "Unknown error"
 msgstr "æ?ªç?¥ç??é??误"
 
-#: ../src/empathy-main-window.c:1353
+#: ../src/empathy-main-window.c:1312
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -2593,9 +2784,8 @@ msgid "Normal Size With _Avatars"
 msgstr "����(_A)"
 
 #: ../src/empathy-main-window.ui.h:8
-#, fuzzy
 msgid "P_references"
-msgstr "é¦?é??项"
+msgstr "é¦?é??项(_R)"
 
 #: ../src/empathy-main-window.ui.h:9
 msgid "Sort by _Name"
@@ -2641,15 +2831,15 @@ msgstr "个人信�(_P)"
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
 msgid "Members"
 msgstr "æ??å??"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2665,16 +2855,16 @@ msgstr ""
 "é??è¦?é??请ï¼?%s\n"
 "æ??å??ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
 msgid "Could not start room listing"
 msgstr "æ? æ³?å¼?å§?è??天室å??表"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
 msgid "Could not stop room listing"
 msgstr "æ? æ³?å??æ­¢è??天室å??表"
 
@@ -2842,7 +3032,7 @@ msgstr "主�"
 
 #: ../src/empathy-preferences.ui.h:25
 msgid "_Cellphone"
-msgstr "_æ??æ?º"
+msgstr "æ??æ?º(_C)"
 
 #: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
@@ -2858,7 +3048,7 @@ msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:29
 msgid "_Network (IP, Wifi)"
-msgstr "_ç½?ç»? (IP, Wifi)"
+msgstr "ç½?ç»?(_N)(IP, Wifi)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -2872,7 +3062,7 @@ msgstr "å??æ??ç??è??系人å?¬å¸?ä½?置信æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?置信æ?¯ç²¾åº¦(_R)"
 
-#: ../src/empathy-status-icon.c:180
+#: ../src/empathy-status-icon.c:178
 msgid "Respond"
 msgstr "å??åº?"
 
@@ -2900,68 +3090,71 @@ msgstr "ä¸?个ç?± %s æ??å?¡æ??ä¾?é??请ï¼?ä½?æ?¯ä½ ä¸?é??è¦?åº?ç?¨ç¨?åº?å¤?ç??
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-window.c:1042
+#: ../src/empathy-debug-window.c:1063
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../src/empathy-debug-window.c:1164
+#: ../src/empathy-debug-window.c:1185
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1243
+#: ../src/empathy-debug-window.c:1265
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-window.c:1255
+#: ../src/empathy-debug-window.c:1277
 msgid "Level "
 msgstr "级� "
 
-#: ../src/empathy-debug-window.c:1275
+#: ../src/empathy-debug-window.c:1297
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1281
+#: ../src/empathy-debug-window.c:1303
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-window.c:1287 ../src/empathy-debug-window.c:1336
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1293
+#: ../src/empathy-debug-window.c:1315
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1321
 msgid "Critical"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1305
+#: ../src/empathy-debug-window.c:1327
 msgid "Error"
 msgstr "é??误"
 
-#: ../src/empathy-debug-window.c:1324
+#: ../src/empathy-debug-window.c:1346
 msgid "Time"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1349
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-window.c:1329
+#: ../src/empathy-debug-window.c:1351
 msgid "Category"
 msgstr "类�"
 
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1353
 msgid "Level"
 msgstr "级�"
 
-#: ../src/empathy-debug-window.c:1363
+#: ../src/empathy-debug-window.c:1385
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 
+#~ msgid "Send video"
+#~ msgstr "å??é??è§?é¢?"
+
 #~ msgid "Can't set an empty display name"
 #~ msgstr "æ? æ³?设置为空æ?¾ç¤ºå??称"
 
@@ -2984,9 +3177,6 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Talk!"
 #~ msgstr "说��"
 
-#~ msgid "_About"
-#~ msgstr "��(_A)"
-
 #~ msgid "_Information"
 #~ msgstr "ä¿¡æ?¯(_I)"
 
@@ -3114,9 +3304,6 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "对ä¸?èµ·ï¼?æ??ä¸?æ?³è®©æ?¨ä»¥å??å?ºç?°å?¨æ??ç??è??系人å??表中äº?ã??"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>客�端信�</b>"
-
 #~ msgid "<b>Contact Details</b>"
 #~ msgstr "<b>è??系人详æ??</b>"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]