[empathy] Update Simplified Chinese translation.



commit 0f533ff1229e8b3c6f0940ae85810f7f80b6c8b5
Author: Aron Xu <aronxu gnome org>
Date:   Sat Jul 17 15:37:54 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1434 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 758 insertions(+), 676 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a332636..7c49c1c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,14 +12,16 @@
 # 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.
 #
 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"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-07-16 08:58+0000\n"
+"PO-Revision-Date: 2010-07-17 15:37+0800\n"
 "Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -28,388 +30,403 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr "使ç?¨ Google Talkã??Facebookã??MSN 以å??许å¤?å?¶å®?è??天æ??å?¡"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy IM 客�端"
+msgid "Empathy"
+msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "IM 客�端"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy äº?è??ç½?é??讯"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "å??é??æ?¥æ?¶å?³æ?¶æ¶?æ?¯"
+msgid "IM Client"
+msgstr "IM 客�端"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "æ?»æ?¯ä¸ºæ?°è??天æ??å¼?å??ç?¬ç??è??天çª?å?£ã??"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "å?¨ç¾¤è??中使ç?¨æ?µç§°è¡¥å?¨æ?¶å?¨æ?µç§°å??é?¢æ·»å? ç??å­?符ã??"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "è??天çª?å?£ä¸»é¢?"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "ç?¨äº?æ?¼å??æ£?æ?¥å?¨ç??语è¨?ç??å??表ï¼?以é??å?·å??é??(ä¾?å¦?ï¼?en, fr, nl)ã??"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "ç´§å??æ?¾ç¤ºè??系人å??表"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
 msgstr "åº?该使ç?¨è¿?æ?¥ç®¡ç??å?¨"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Contact list sort criterion"
 msgstr "è??系人å??表æ??åº?æ?¡ä»¶"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "é»?认ç??é??å??头å??å?¾ç??ç??ç?®å½?"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "离å¼?æ?¶ç¦?ç?¨å¼¹å?ºæ??示"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "离����声�"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?件ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false present them right away "
+"to the user."
+msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?件ã??å¦?æ??为 false å??ç«?å?³æ?¾ç¤ºç»?ç?¨æ?·ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathy è?½å¤?å??å¸?ç?¨æ?·ç??ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy è?½å¤?é??è¿? GPS æ?¥ä¼°è®¡ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy è?½å¤?é??è¿?æ??æ?ºæ?¥ä¼°è®¡ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy è?½å¤?é??è¿?ç½?ç»?æ?¥ä¼°è®¡ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "Empathy é»?认ä¸?è½½æ??件夹"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已�询�导�账�"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "Empathy 已�移 telepathy-butterfly ��"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空������离�"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ���������"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should reduce the location's accuracy"
 msgstr "é??ä½? Emapthy ä½?置信æ?¯ç??å??确度"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è??系人头å??ä½?为è??天çª?å?£å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable WebKit Developer Tools"
 msgstr "å?¯ç?¨ WebKit å¼?å??å·¥å?·"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable popup notifications for new messages"
 msgstr "å?¯ç?¨æ?°æ¶?æ?¯å¼¹å?ºæ??示"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Enable spell checker"
 msgstr "å?¯ç?¨æ?¼å??æ£?æ?¥å?¨"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide main window"
 msgstr "é??è??主çª?å?£"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Hide the main window."
 msgstr "é??è??主çª?å?£ã??"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 账�已�被导�"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 å¸?æ?·å·²ç»?被导å?¥ã??"
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"
 msgstr "�称补��符"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??ç?¬çª?å?£ä¸­æ??å¼?æ?°è??天"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Path of the Adium theme to use"
 msgstr "Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天使ç?¨ Adium 主é¢?ï¼?使ç?¨ Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
 msgstr "�������声�"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for new conversations"
 msgstr "�对����声�"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound for outgoing messages"
 msgstr "å??å?ºæ¶?æ?¯æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs in"
 msgstr "è??系人ç?»å½?æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when a contact logs out"
 msgstr "è??系人注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log in"
 msgstr "�����声�"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound when we log out"
 msgstr "注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天çª?å?£ä¸?æ?¯ç?¦ç?¹å??å¼¹å?ºæ¶?æ?¯é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Pop up notifications when a contact logs in"
 msgstr "å½?è??系人ç?»å½?æ?¶å¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Pop up notifications when a contact logs out"
 msgstr "å½?è??系人注é??æ?¶å¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show avatars"
 msgstr "æ?¾ç¤ºå¤´å??"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室æ?¾ç¤ºè??系人å??表"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show hint about closing the main window"
 msgstr "å?³é?­ä¸»çª?å?£æ?¶æ?¾ç¤ºæ??示"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show offline contacts"
 msgstr "æ?¾ç¤ºç¦»çº¿è??系人"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Show protocols"
 msgstr "æ?¾ç¤ºå??è®®"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥å?¨è¯­è¨?"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The default folder to save file transfers in."
 msgstr "ä¿?å­?ä¼ é??æ??件ç??é»?认æ??件夹ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é??å??头å??å?¾ç??ç??ç?®å½?ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "è??天çª?å?£è¾¹æ ?ç??ä½?ç½®"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "è??天çª?å?£è¾¹æ ?ä¿?å­?ç??ä½?ç½®(å??ç´ )ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨äº?å?¨è??天çª?å?£ä¸­æ?¾ç¤ºä¼?è¯?ç??主é¢?ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use graphical smileys"
 msgstr "使ç?¨è¡¨æ??å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥å£°é?³"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Use theme for chat rooms"
 msgstr "为è??天室使ç?¨ä¸»é¢?"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "æ?¯å?¦å??许 Empathy å°?ç?¨æ?·ç??ä½?ç½®å?±äº«ç»?è??系人"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿? GPS 估计ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿?æ??æ?ºç½?ç»?估计ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿?ç½?ç»?估计ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?中导å?¥è´¦æ?·ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "Empathy æ?¯å?¦è¿?移 telepathy-butterfly æ?¥å¿?ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr "Empathy æ?¯å?¦å?¨ç©ºé?²æ?¶è?ªå?¨è¿?å?¥ç¦»å¼?ç?¶æ??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "æ?¯å?¦å?ºäº?é??ç§?å??å? é??ä½? Empathy ä½?置信æ?¯ç??å??确度ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit å¼?å??å·¥å?·ï¼?ä¾?å¦? Web Inspector æ?¯å?¦åº?该å?¯ç?¨ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?­å¼?è¿?æ?¥æ??é??æ?°è¿?æ?¥ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦å¯¹æ?¨æ?³è¦?ä½?æ?¼å??æ£?æ?¥ç??å??è¯?ä½?æ?¼å??æ£?æ?¥ã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "对è¯?æ?¶æ?¯å?¦å°?表æ??符å?·è½¬æ?¢ä¸ºè¡¨æ??å?¾æ ?ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦é??è¦?äº?件æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦é??è¦?æ¶?æ?¯å?°è¾¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦é??è¦?æ?°ä¼?è¯?æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦ä¸ºå¤?å?ºæ¶?æ?¯ä½¿ç?¨å£°é?³æ??示ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play a sound when logging into a network."
 msgstr "å½?è??ç½?ç?»å½?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound when logging out of a network."
 msgstr "å½?ç½?ç»?æ?­å¼?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to play sound notifications when away or busy."
 msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦ä½¿ç?¨å£°é?³æ??示ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "å½?è??系人离线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:78
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 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
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "å½?æ?¶å?°æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå¤´å??ã??"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦æ?¾ç¤ºè??系人æ¸?å??中离线ç??è??系人ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show popup notifications when away or busy."
 msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå??è®®ã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室æ?¾ç¤ºè??系人å??表ã??"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç´§å??模å¼?æ?¾ç¤ºè??系人å??表ã??"
 
-#: ../data/empathy.schemas.in.h:86
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "æ?¯å?¦å¯¹ä½¿ç?¨æ ?é¢?æ ?中ç??â??Xâ??æ??é?®å?³é?­ä¸»çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
 
-#: ../data/empathy.schemas.in.h:88
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 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 "
@@ -424,61 +441,56 @@ 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:2094 ../src/cc-empathy-accounts-page.c:244
 #: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
 
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:843
 msgid "The hash of the received file and the sent one do not match"
 msgstr "æ?¥æ?¶å?°ç??æ??件å??å??é??ç??é?£ä¸ªæ??件å??å¸?å?¼ä¸?å?¹é??"
 
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1103
 msgid "File transfer not supported by remote contact"
 msgstr "æ??件传è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
 
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1161
 msgid "The selected file is not a regular file"
 msgstr "æ??é??æ??件æ?¯é??正常ç??æ??件"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1170
 msgid "The selected file is empty"
 msgstr "æ??é??æ??件æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-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:315
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
@@ -502,71 +514,77 @@ msgstr "é??身"
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:249 ../src/empathy-call-window.c:1763
+#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
+#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+msgid "Unknown"
+msgstr "��"
+
+#: ../libempathy/empathy-utils.c:287
 msgid "No reason specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "ç?¶æ??已设置为离线"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:291
 msgid "Network error"
 msgstr "ç½?ç»?é??误"
 
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:293
 msgid "Authentication failed"
 msgstr "��失败"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Encryption error"
 msgstr "å? å¯?é??误"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:297
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
 
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:299
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?书"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:301
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:303
 msgid "Certificate expired"
 msgstr "è¯?书已è¿?æ??"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
 msgid "Certificate not activated"
 msgstr "�书���活"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
 msgid "Certificate hostname mismatch"
 msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?书æ??纹ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate self-signed"
 msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:313
 msgid "Certificate error"
 msgstr "è¯?书é??误"
 
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:436
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -610,25 +628,25 @@ msgstr[0] "%d æ??å??"
 msgid "in the future"
 msgstr "å°?æ?¥"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1136
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1479
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-account-widget.c:1547
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -636,16 +654,15 @@ msgstr "��(_O)"
 msgid "Account:"
 msgstr "账��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1553
+#: ../libempathy-gtk/empathy-account-widget.c:1558
 msgid "Enabled"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1618
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1623
 msgid "This account already exists on the server"
-msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
+msgstr "æ??å?¡å?¨ä¸?å·²å­?å?¨è¯¥è´¦æ?·ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1626
 msgid "Create a new account on the server"
 msgstr "å?¨æ??å?¡å?¨ä¸?å??建æ?°ç??å¸?æ?·"
 
@@ -654,19 +671,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:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1995
 #, 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:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2021
 #, c-format
 msgid "%s Account"
 msgstr "%s 账�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2025
 msgid "New account"
 msgstr "�建账�"
 
@@ -691,7 +708,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,40 +784,40 @@ 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 "�建��"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
 msgid "Options"
 msgstr "é??项"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
 msgid "None"
 msgstr "æ? "
 
@@ -864,6 +881,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 +976,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,179 +1062,173 @@ 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:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "æ? æ³?转æ?¢å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-#, fuzzy
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
 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:935
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??头å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "æ??æ??æ??件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:325
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "å? å?¥è??天室失败"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:645
 msgid "Failed to open private chat"
 msgstr "建��人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:685
 msgid "Topic not supported on this conversation"
 msgstr "ä¸?æ?¯æ??å?¨æ­¤ä¼?è¯?ä¸?设置主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:691
 msgid "You are not allowed to change the topic"
 msgstr "�����主�"
 
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主é¢?>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:831
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:834
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:842
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:846
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
 
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:849
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??对è¯?中å??é??ä¸?个å?¨ä½?æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:852
 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 chat room\""
 msgstr ""
-"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?"
-"å¦?ï¼?â??/say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
+"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
+"say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
 
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:857
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨"
-"æ³?ã??"
+"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:867
 #, c-format
 msgid "Usage: %s"
 msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:896
 msgid "Unknown command"
 msgstr "���令"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1017
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥å?½ä»¤ï¼?请使ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "invalid contact"
 msgstr "æ? æ??è??系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "permission denied"
 msgstr "æ??é??ä¸?足"
 
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "too long message"
 msgstr "��太�"
 
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1167
 msgid "not implemented"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1170
 msgid "unknown"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1174
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-chat.c:1296
 #, c-format
 msgid "Topic set to: %s"
 msgstr "��被设置为�%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1298
 msgid "No topic defined"
 msgstr "�设置��"
 
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1777
 msgid "(No Suggestions)"
 msgstr "(没æ??建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1831
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1849
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1883
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1960
 msgid "Failed to retrieve recent logs"
 msgstr "è?·å??æ??è¿?æ?¥å¿?失败"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2066
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已����"
@@ -1253,12 +1236,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:2073
 #, 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:2076
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -1266,17 +1249,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:2084
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2087
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2091
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离å¼?äº?è??天室"
@@ -1286,81 +1269,77 @@ 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:2100
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2125
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2150
 #, 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:2289 ../src/empathy-call-window.c:1802
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2927
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç ?é??误ï¼?请é??è¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2928
 msgid "Retry"
 msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2933
 msgid "This room is protected by a password:"
 msgstr "è¿?个æ?¿é?´æ?¯ç?±ä¸?个å¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2934
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3074
 msgid "Connected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-log-window.c:639
 msgid "Conversation"
 msgstr "对�"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672
-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-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:785
 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-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:792
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
 msgid "Edit Contact Information"
 msgstr "ç¼?è¾?è??系人信æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
 msgid "Personal Information"
 msgstr "个人信�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
 msgid "New Contact"
 msgstr "æ?°å»ºè??系人"
 
@@ -1372,214 +1351,234 @@ msgstr "以å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "订é??请æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
 msgid "Removing group"
 msgstr "��群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
 msgid "Removing contact"
 msgstr "å? é?¤è??系人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ·»å? è??系人(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:261
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "����(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:291
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "����(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:331
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "æ??è¿?ä¼?è¯?(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:353
+msgid "Send File"
 msgstr "å??é??æ??件"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:376
+msgid "Share My Desktop"
 msgstr "å?±äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:416
+#: ../libempathy-gtk/empathy-contact-widget.c:1819
 msgid "Favorite"
 msgstr "æ?¶è??夹"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:445
 msgid "Infor_mation"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:491
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../libempathy-gtk/empathy-contact-menu.c:545
+#: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??请å?°æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:576
+msgid "_Invite to Chat Room"
 msgstr "é??请å?°è??天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é??æ?©ä¸?个è??ç³»"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:238
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+msgid "Full name:"
+msgstr "�称�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+msgid "Phone number:"
+msgstr "�����"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+msgid "E-mail address:"
+msgstr "E-mail å?°å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:222
+msgid "Website:"
+msgstr "ç½?ç«?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:223
+msgid "Birthday:"
+msgstr "ç??æ?¥ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:614
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../src/empathy-main-window.c:1171
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 msgid "Country ISO Code:"
 msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:856
 msgid "Country:"
 msgstr "�家�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:858
 msgid "State:"
 msgstr "ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 msgid "Area:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 msgid "Postal Code:"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:866
 msgid "Street:"
 msgstr "è¡?é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:868
 msgid "Building:"
 msgstr "建���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:870
 msgid "Floor:"
 msgstr "楼��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:874
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:876
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:878
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:880
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:882
 msgid "Error:"
 msgstr "é??误ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:884
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:886
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:888
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:890
 msgid "Bearing:"
 msgstr "æ?¹ä½?æ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:892
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:894
 msgid "Last Updated on:"
 msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:896
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:898
 msgid "Latitude:"
 msgstr "纬度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:900
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:963
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:979
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®</b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:1030
 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:1113
 msgid "Save Avatar"
 msgstr "ä¿?å­?头å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:1169
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å­?头å??"
 
@@ -1592,61 +1591,45 @@ msgid "Alias:"
 msgstr "å?«å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "ç??æ?¥ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
 msgstr "客�端信�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "客�端�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Contact Details"
 msgstr "è??系人详æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "�称�"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "Groups"
 msgstr "ç»?"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Identifier:"
 msgstr "��符�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Information requestedâ?¦"
 msgstr "å·²å??é??ä¿¡æ?¯è¯·æ±?..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "OS:"
 msgstr "æ??ä½?ç³»ç»?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "é??æ?©æ?¨æ?³å°?该è??系人å? å?¥ç??群ç»?ã??注æ??æ?¨å?¯ä»¥é??æ?©å¤?个群ç»?ï¼?ä¹?å?¯ä»¥ä¸?é??æ?©ã??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "ç½?ç«?ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "_Add Group"
 msgstr "添�群�(_A)"
 
@@ -1666,12 +1649,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:632
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "账�"
 
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:649
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1696,28 +1679,28 @@ msgid "Contact ID:"
 msgstr "è??系人 IDï¼?"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
 msgid "C_hat"
 msgstr "è??天(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "�建对�"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
 msgid "Send _Video"
 msgstr "å??é??è§?é¢?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
+#: ../src/empathy-call-window.ui.h:22
 msgid "_Call"
 msgstr "é??è¯?(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
 msgid "New Call"
 msgstr "æ?°å»ºé??è¯?"
 
@@ -1754,7 +1737,7 @@ msgid "Set your presence and current status"
 msgstr "设置你ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
 msgid "Custom messagesâ?¦"
 msgstr "�����..."
 
@@ -1770,43 +1753,43 @@ msgstr "å?ºå??大å°?å??"
 msgid "Phrase not found"
 msgstr "����语"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "�������"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "å??é??å?³æ?¶æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "æ?¶å?°ç??è??天请æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "è??系人已è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "è??系人已æ?­å¼?"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "å·²è¿?æ?¥å?°æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "å·²ä»?æ??å?¡å?¨æ?­å¼?è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "å?¼å?¥ç??语é?³é??è¯?"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "å?¼å?ºç??语é?³é??è¯?"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "语é?³é??è¯?ç»?æ??"
 
@@ -1842,17 +1825,18 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
 msgid "Select a file"
 msgstr "é??æ?©æ??件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
-msgid "Select a destination"
-msgstr "é??æ?©ç?®ç??å?°"
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
+#, c-format
+msgid "Incoming file from %s"
+msgstr "ä»? %s ä¼ é??æ?¥æ??件"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2033,19 +2017,20 @@ msgstr "é??æ?©ç??è??系人离线ã??"
 msgid "No error message"
 msgstr "æ? é??误信æ?¯"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
 msgid "Instant Message (Empathy)"
 msgstr "����(Empathy)"
 
-#: ../src/empathy.c:584
+#: ../src/empathy.c:474
 msgid "Don't connect on startup"
 msgstr "��������"
 
-#: ../src/empathy.c:588
+#: ../src/empathy.c:478
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
 
-#: ../src/empathy.c:600
+#: ../src/empathy.c:490
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客�端"
 
@@ -2086,8 +2071,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";
@@ -2127,7 +2121,7 @@ msgstr ""
 "æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??中å? å?¥è´¦æ?·ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "å??ç??é??误"
 
@@ -2136,36 +2130,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:412 ../src/empathy-accounts-dialog.c:606
 #, c-format
 msgid "New %s account"
 msgstr "�建 %s 账�"
 
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:510
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨å·²ç»?æ?¥æ??å?ªä¸ªç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:516
 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:522
 msgid "Enter your account details"
 msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
 
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:527
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³å??建é?£ç§?ç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:533
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¨æ?³è¦?å??建å?¶å®?ç??è??天账æ?·å??ã??"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:540
 msgid "Enter the details for the new account"
 msgstr "è¾?å?¥æ?°è´¦æ?·ç??详ç»?èµ?æ??"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:655
 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,146 +2170,152 @@ msgstr ""
 "Live å??许å¤?å?¶å®?è??天软件ç??æ??å??å??å??äº?è??天ã??使ç?¨éº¦å??é£?æ??æ??å??头ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
 "å??è§?é¢?é??è¯?ã??"
 
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:672
 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:695
 msgid "Yes, import my account details from "
 msgstr "æ??ï¼?请导å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:716
 msgid "Yes, I'll enter my account details now"
 msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:738
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?个æ?°ç??è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:748
 msgid "No, I just want to see people online nearby for now"
 msgstr "没æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:769
 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:853
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:860
 msgid "No, that's all for now"
 msgstr "没æ??ï¼?å°±è¿?æ ·å?§ã??"
 
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1129
 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:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "��->账�"
 
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ä¸?å?¯ç?¨æ­¤ç?¹æ?§"
 
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1187
 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:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ���"
 
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
 
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "欢�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "导å?¥ç?°æ??å¸?æ?·"
 
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1300
 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
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å­?ç??ä¿®æ?¹ã??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
 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:273 ../src/empathy-call-window.c:799
 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:314
 #, c-format
 msgid "Offline â?? %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:326
+#, c-format
+msgid "Disconnected â?? %s"
+msgstr "已�� - %s"
+
+#: ../src/empathy-accounts-dialog.c:337
 msgid "Offline â?? No Network Connection"
 msgstr "离线 - �����"
 
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:344
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç?¶æ??"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:356
 msgid "Offline â?? Account Disabled"
 msgstr "离线 - ��被��"
 
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:797
 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:1144
 #, 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:1148
 msgid "This will not remove your account on the server."
 msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
 
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1385
 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:1962
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2343,98 +2343,107 @@ msgstr "添�(_A)..."
 msgid "_Importâ?¦"
 msgstr "导�(_I)..."
 
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auto-salut-account-helper.c:78
+msgid "People nearby"
+msgstr "é??è¿?ç??人"
+
+#: ../src/empathy-call-window.c:470
 msgid "Contrast"
 msgstr "对�度"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:473
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:476
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:581
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1146
 msgid "_Sidebar"
 msgstr "侧边�(_S)"
 
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1165
 msgid "Audio input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1169
 msgid "Video input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1173
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
+#: ../src/empathy-call-window.c:1178
+#| msgid "Contact Details"
+msgid "Details"
+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:1246
 #, 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:1325
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2117
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2178
 msgid "Technical Details"
 msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2216
 #, 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:2221
 #, 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:2227
 #, 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:2233
 msgid "There was a failure on the network"
 msgstr "ç½?ç»?å?ºç?°ä¸?个é??误"
 
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2237
 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:2240
 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:2250
+#, 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,111 +2452,129 @@ msgstr ""
 "Telepathy ç»?件å?ºç?°äº?ä¸?äº?æ??å¤?ã??请<a href=\"%s\">æ±?æ?¥è¿?个é??误</a>ï¼?并é??ä¸?帮å?©è??"
 "å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
 
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2258
 msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?个æ??é??"
 
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2297
 msgid "Can't establish audio stream"
 msgstr "��建����"
 
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2307
 msgid "Can't establish video stream"
 msgstr "��建����"
 
 #: ../src/empathy-call-window.ui.h:1
+#| msgid "Auto"
+msgid "Audio"
+msgstr "��"
+
+#: ../src/empathy-call-window.ui.h:2
 msgid "Call the contact again"
 msgstr "å??次å?¼å?«è??系人"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
 msgid "Camera Off"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
 msgid "Camera On"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "解���"
+
+#: ../src/empathy-call-window.ui.h:6
 msgid "Disable camera and stop sending video"
 msgstr "ç¦?ç?¨ç?¸æ?ºå??æ­¢å??é??è§?é¢?"
 
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
 msgid "Enable camera and send video"
 msgstr "å?¯ç?¨ç?¸æ?ºï¼?并å??é??è§?é¢?"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
 msgid "Enable camera but don't send video"
 msgstr "å?¯ç?¨ç?¸æ?ºï¼?ä½?ä¸?å??é??è§?é¢?"
 
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "����"
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "æ??èµ·"
 
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
 msgid "Hang up current call"
 msgstr "æ??èµ·å½?å??å?¼å?«"
 
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
 msgid "Preview"
 msgstr "��"
 
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:13
 msgid "Redial"
 msgstr "é??æ?­"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:14
 msgid "Send Audio"
 msgstr "å??é??é?³é¢?"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:15
 msgid "Toggle audio transmission"
 msgstr "å??æ?¢é?³é¢?ä¼ è¾?"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:17
 msgid "V_ideo"
 msgstr "��(_I)"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:18
+#| msgid "V_ideo"
+msgid "Video"
+msgstr "��"
+
+#: ../src/empathy-call-window.ui.h:19
 msgid "Video Off"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:20
 msgid "Video On"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:21
 msgid "Video Preview"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
 #, 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:464
 #, 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:480
 #, 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:489
 #, 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:695
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2569,7 +2596,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"
@@ -2579,55 +2606,63 @@ msgstr "左移�签(_L)"
 msgid "Move Tab _Right"
 msgstr "�移�签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "æ??示æ??æ??æ¶?æ?¯"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "å??容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "对�(_C)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "�移�签(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "æ?¶è??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "���签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "���签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "æ?¾ç¤ºè??系人å??表(_S)"
 
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "æ ?ç­¾(_T)"
 
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "æ?¤é??å?³é?­æ ?ç­¾(_U)"
+
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "å??称"
 
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "����"
 
@@ -2635,77 +2670,81 @@ msgstr "����"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??è??天室æ?¶è??"
 
-#: ../src/empathy-event-manager.c:339
-#, fuzzy
+#: ../src/empathy-event-manager.c:473
 msgid "Incoming video call"
-msgstr "å?¼å?¥ç??语é?³é??è¯?"
+msgstr "å?¼å?¥ç??è§?é¢?é??è¯?"
 
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:473
 msgid "Incoming call"
 msgstr "��"
 
-#: ../src/empathy-event-manager.c:343
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:477
+#, 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
+#: ../src/empathy-event-manager.c:478
+#, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s ç??æ?¥ç?µ"
+
+#: ../src/empathy-event-manager.c:506
 msgid "_Reject"
 msgstr "æ??ç»?(_R)"
 
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:512
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:489
-#, fuzzy, c-format
-msgid "Incoming video call from %s"
-msgstr "%s ç??æ?¥ç?µ"
-
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:623
 #, c-format
-msgid "Incoming call from %s"
-msgstr "%s ç??æ?¥ç?µ"
+msgid "Incoming video call from %s"
+msgstr "%s ç??è§?é¢?å?¼å?«"
 
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:700
 msgid "Room invitation"
 msgstr "è??天室é??请"
 
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:702
+#, c-format
+msgid "Invitation to join %s"
+msgstr "é??请æ?¨å? å?¥ %s"
+
+#: ../src/empathy-event-manager.c:709
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:717
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:722
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??件传è¾?"
 
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:988
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ç??订é??请æ±?"
 
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:992
 #, c-format
 msgid ""
 "\n"
@@ -2714,118 +2753,116 @@ msgstr ""
 "\n"
 "���%s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1035
 #, c-format
 msgid "%s is now offline."
 msgstr "%s å½?å??离线ã??"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1055
 #, c-format
 msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, 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:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中ç?? %1$sï¼?é??度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, 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:306
+#: ../src/empathy-ft-manager.c:305
 #, 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:309
+#: ../src/empathy-ft-manager.c:308
 #, 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:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "ä»? %2$s æ?¥æ?¶ \"%1$s\" å?ºé??"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æ??件å?ºé??"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?? %2$s å??é?? \"%1$s\" å?ºé??"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "å??é??æ??件å?ºé??"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, 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:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "å·²ç»?å?? %2$s å®?æ??å??é?? \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "æ??件传é??å®?æ??"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??ä¸?è??ç??å??åº?"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "��\"%s\"���"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校�中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:990
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1002
 msgid "File"
 msgstr "æ??件"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1024
 msgid "Remaining"
 msgstr "å?©ä½?"
 
@@ -2848,138 +2885,133 @@ 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
-#, c-format
-msgid "%s account"
-msgstr "%s 账�"
-
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:457
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:463
 msgid "Edit Account"
 msgstr "��账�"
 
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:469
 msgid "Close"
 msgstr "��"
 
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1154
 msgid "Contact"
 msgstr "è??系人"
 
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "è??系人å??表"
+
+#: ../src/empathy-main-window.c:1583
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "è??系人å??表"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "è??系人å?°å?¾(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "ä¸?ä¸?æ??"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "å? å?¥å·²æ?¶è??ç??è??天室(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "管ç??æ?¶è??夹"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "常���(_O)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
-msgstr ""
+msgstr "�建��(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "����(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
 msgid "P_references"
 msgstr "é¦?é??项(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
 msgid "Show P_rotocols"
 msgstr "æ?¾ç¤ºå??è®®(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "æ??å§?å??æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "æ??ç?¶æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "账�(_A)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "ç´§å??è§?å?¾(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "æ??件传è¾?(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "�建对�(_N)..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "离线è??系人(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "个人信�(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
 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:605
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -2992,16 +3024,16 @@ msgstr ""
 "é??è¦?å¯?ç ?ï¼?%s\n"
 "æ??å??ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:635
 msgid "Could not start room listing"
 msgstr "æ? æ³?å¼?å§?è??天室å??表"
 
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:645
 msgid "Could not stop room listing"
 msgstr "æ? æ³?å??æ­¢è??天室å??表"
 
@@ -3032,62 +3064,66 @@ msgstr "è??天室å??表"
 msgid "_Room:"
 msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:136
 msgid "Message received"
 msgstr "�����"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:137
 msgid "Message sent"
 msgstr "å??å?ºäº?æ¶?æ?¯"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:138
 msgid "New conversation"
 msgstr "�对�"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:139
 msgid "Contact goes online"
 msgstr "离线人�线"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:140
 msgid "Contact goes offline"
 msgstr "è??系人离线"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:141
 msgid "Account connected"
 msgstr "账�已��"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:142
 msgid "Account disconnected"
 msgstr "账�已��"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:437
 msgid "Language"
 msgstr "语�"
 
+#: ../src/empathy-preferences.c:873
+msgid "Preferences"
+msgstr "é¦?é??项"
+
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "�������(_C) "
-
-#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "�为"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "è??天主é¢?(_E)ï¼?"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "离å¼?æ??å¿?ç¢?æ?¶ç¦?ç?¨æ??示(_A)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "离å¼?æ??å¿?ç¢?æ?¶ç¦?ç?¨å£°é?³(_A)"
 
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "å??æ??示å?ºå??æ?¾ç¤ºå?¼å?¥äº?件"
+
 #: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "å½?è??系人ä¸?线æ?¶å??许æ??示"
@@ -3121,14 +3157,10 @@ msgid "Play sound for events"
 msgstr "���件声�"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "é¦?é??项"
-
-#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "é??ç§?"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:17
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3137,32 +3169,36 @@ msgstr ""
 "é??ä½?å®?ä½?精度æ??å?³ç??æ¯?æ?¨æ??å?¨ç??å??å¸?ã??å·?å??å?½å®¶æ?´æ??ç¡®ç??ä¿¡æ?¯å°?ä¸?ä¼?被å?¬å¸?ã?? GPS å??æ ?"
 "å°?精确å?°ä¸?ä½?å°?æ?°ã?? "
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:18
 msgid "Show _smileys as images"
 msgstr "æ?¾ç¤ºè¡¨æ??符å?·ä¸ºå?¾å½¢(_S)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??天室æ?¾ç¤ºè??系人å??表(_L)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:20
 msgid "Sounds"
 msgstr "声�"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:21
 msgid "Spell Checking"
 msgstr "æ?¼å??æ£?æ?¥"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:22
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "语è¨?å??表ä»?å??æ? å·²å®?è£?ç??å­?å?¸"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:23
 msgid "Themes"
 msgstr "主�"
 
+#: ../src/empathy-preferences.ui.h:24
+msgid "_Automatically connect on startup"
+msgstr "�������(_A) "
+
 #: ../src/empathy-preferences.ui.h:25
 msgid "_Cellphone"
 msgstr "æ??æ?º(_C)"
@@ -3195,10 +3231,26 @@ msgstr "å??æ??ç??è??系人å?¬å¸?ä½?置信æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?置信æ?¯ç²¾åº¦(_R)"
 
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
 msgid "Respond"
 msgstr "å??åº?"
 
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "æ??ç»?"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "��"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "æ??ç»?"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "æ?¥å??"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç?¶æ??"
@@ -3211,63 +3263,63 @@ msgstr "é??å?º(_Q)"
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "级� "
 
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
 msgid "Critical"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
 msgid "Error"
 msgstr "é??误"
 
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "类�"
 
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "级�"
 
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3276,33 +3328,37 @@ 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
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "é??请"
+
+#: ../src/empathy-accounts.c:182
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
+msgstr "ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?ï¼?æ?§è¡?ä»»å?¡(å¦?ï¼?导å?¥)ç?¶å??é??å?º"
 
-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186
 msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr ""
+msgstr "å¦?æ??æ??ä»»ä½? non-salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?"
 
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
+msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?· (å¦?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
 msgid "<account-id>"
 msgstr "<账� ID>"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
 msgid "- Empathy Accounts"
 msgstr "- Empathy 账�"
 
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
 msgid "Empathy Accounts"
 msgstr "Empathy 账�"
 
@@ -3310,6 +3366,38 @@ msgstr "Empathy 账�"
 msgid "Empathy Debugger"
 msgstr "Empathy ���"
 
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语�/��客�端"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语�/��客�端"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "å??é??æ?¥æ?¶å?³æ?¶æ¶?æ?¯"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 账�已�被导�"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 å¸?æ?·å·²ç»?被导å?¥ã??"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "å?ºç«?代ç??端å?£"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "å? å?¥è??天室失败"
+
+#~ msgid "Select a destination"
+#~ msgstr "é??æ?©ç?®ç??å?°"
+
+#~ msgid "%s account"
+#~ msgstr "%s 账�"
+
 #~ msgid "Salut account is created"
 #~ msgstr "å·²å??建 Salut è´¦æ?·"
 
@@ -3495,9 +3583,6 @@ msgstr "Empathy ���"
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy å?³æ?¶é??讯ç¨?åº?"
-
 #~ msgid "- Empathy Instant Messenger"
 #~ msgstr "- Empathy å?³æ?¶é??讯ç¨?åº?"
 
@@ -3636,9 +3721,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]