[empathy] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa
Author: Aron Xu <aronxu gnome org>
Date:   Mon Mar 29 18:36:47 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1686 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 960 insertions(+), 726 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6be5530..a332636 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Abel Cheung <maddog linux org hk>, 2003.
@@ -8,21 +8,20 @@
 # Rongjun Mu <elanmu sina com>, 2003.
 # YangZhang <zyangmath gmail com>, 2008.
 # Funda Wang <fundawang gmail com>, 2009.
-# Aron Xu <aronxu gnome org>, 2009.
 # Lyper Lai <lyp069 gmail com>, 2009.
 # Yun Nie <yun nie ptiglobal net>, 2009.
 # Richard Ma <richard ma 19850509 gmail com>, 2009.
 # Tao Wei <weitao1979 gmail com>, 2009.
+# Aron Xu <happyaron xu gmail com>, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-12-08 15:17+0000\n"
-"PO-Revision-Date: 2009-12-09 13:06+0800\n"
-"Last-Translator: Tao Wei <weitao1979 gmail com>\n"
-"Language-Team: Simplified Chinese <i18n-zh googlegroups com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-29 15:43+0800\n"
+"PO-Revision-Date: 2010-03-29 18:36+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +59,7 @@ msgstr "è??天çª?å?£ä¸»é¢?"
 
 #: ../data/empathy.schemas.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "ç?¨äº?æ?¼å??æ£?æ?¥å?¨ç??语è¨?ç??å??表ï¼?以é??å?·å??é??(ä¾?å¦?ï¼?en, fr, nl)ã??"
 
 #: ../data/empathy.schemas.in.h:5
@@ -93,15 +92,15 @@ msgstr "Empathy è?½å¤?å??å¸?ç?¨æ?·ç??ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:12
 msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy è?½å¤?é??è¿? GPS æ?¥ä¼°ç®?ä½?ç½®"
+msgstr "Empathy è?½å¤?é??è¿? GPS æ?¥ä¼°è®¡ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy è?½å¤?é??è¿?æ??æ?ºæ?¥ä¼°ç®?ä½?ç½®"
+msgstr "Empathy è?½å¤?é??è¿?æ??æ?ºæ?¥ä¼°è®¡ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
-msgstr "Empathy è?½å¤?é??è¿?ç½?ç»?æ?¥ä¼°ç®?ä½?ç½®"
+msgstr "Empathy è?½å¤?é??è¿?ç½?ç»?æ?¥ä¼°è®¡ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:15
 msgid "Empathy default download folder"
@@ -112,104 +111,104 @@ msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已�询�导�账�"
 
 #: ../data/empathy.schemas.in.h:17
+msgid "Empathy has migrated butterfly logs"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ���������"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should reduce the location's accuracy"
 msgstr "é??ä½? Emapthy ä½?置信æ?¯ç??å??确度"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è??系人头å??ä½?为è??天çª?å?£å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable WebKit Developer Tools"
 msgstr "å?¯ç?¨ WebKit å¼?å??å·¥å?·"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable popup notifications for new messages"
 msgstr "å?¯ç?¨æ?°æ¶?æ?¯å¼¹å?ºæ??示"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Enable spell checker"
 msgstr "å?¯ç?¨æ?¼å??æ£?æ?¥å?¨"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "Hide main window"
 msgstr "é??è??主çª?å?£"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:25
 msgid "Hide the main window."
 msgstr "é??è??主çª?å?£ã??"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:26
 msgid "MC 4 accounts have been imported"
 msgstr "MC 4 账�已�被导�"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:27
 msgid "MC 4 accounts have been imported."
 msgstr "MC 4 å¸?æ?·å·²ç»?被导å?¥ã??"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:28
 msgid "Nick completed character"
 msgstr "�称补��符"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??ç?¬çª?å?£ä¸­æ??å¼?æ?°è??天"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
+#: ../data/empathy.schemas.in.h:30
+msgid "Path of the Adium theme to use"
 msgstr "Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+#: ../data/empathy.schemas.in.h:31
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天使ç?¨ Adium 主é¢?ï¼?使ç?¨ Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "�������声�"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "�对����声�"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "å??å?ºæ¶?æ?¯æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "è??系人ç?»å½?æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "è??系人注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:37
 msgid "Play a sound when we log in"
 msgstr "�����声�"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:38
 msgid "Play a sound when we log out"
 msgstr "注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
-msgstr "å¦?æ??è??天çª?å?£ä¸?æ?¯ç?¦ç?¹å??å¼¹å?ºæ¶?æ?¯é??ç?¥"
-
 #: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
-msgstr "å½?è??系人ç?»å½?æ?¶å¼¹å?ºé??ç?¥"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "å¦?æ??è??天çª?å?£ä¸?æ?¯ç?¦ç?¹å??å¼¹å?ºæ¶?æ?¯é??ç?¥"
 
 #: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
-msgstr "å½?è??系人注é??æ?¶å¼¹å?ºé??ç?¥"
+msgid "Pop up notifications when a contact logs in"
+msgstr "å½?è??系人ç?»å½?æ?¶å¼¹å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "å·²å??建 Salut è´¦æ?·"
+msgid "Pop up notifications when a contact logs out"
+msgstr "å½?è??系人注é??æ?¶å¼¹å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:42
 msgid "Show avatars"
@@ -228,218 +227,226 @@ msgid "Show offline contacts"
 msgstr "æ?¾ç¤ºç¦»çº¿è??系人"
 
 #: ../data/empathy.schemas.in.h:46
+msgid "Show protocols"
+msgstr "æ?¾ç¤ºå??è®®"
+
+#: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥å?¨è¯­è¨?"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "ä¿?å­?ä¼ é??æ??件ç??é»?认æ??件夹ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é??å??头å??å?¾ç??ç??ç?®å½?ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨äº?å?¨è??天çª?å?£ä¸­æ?¾ç¤ºä¼?è¯?ç??主é¢?ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
 msgid "Use graphical smileys"
 msgstr "使ç?¨è¡¨æ??å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥å£°é?³"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
 msgid "Use theme for chat rooms"
 msgstr "为è??天室使ç?¨ä¸»é¢?"
 
-#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit å¼?å??å·¥å?·ï¼?ä¾?å¦? Web Inspector æ?¯å?¦åº?该å?¯ç?¨ã??"
-
 #: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "æ?¯å?¦å??许 Empathy å°?ç?¨æ?·ç??ä½?ç½®å?±äº«ç»?è??系人"
 
 #: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "æ?¯å?¦å??许 Empathy é??è¿? GPS ä¼°ç®?ä½?ç½®"
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "æ?¯å?¦å??许 Empathy é??è¿? GPS 估计ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "æ?¯å?¦å??许 Empathy é??è¿?æ??æ?ºä¼°ç®?ä½?ç½®"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "æ?¯å?¦å??许 Empathy é??è¿?æ??æ?ºç½?ç»?估计ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "æ?¯å?¦å??许 Empathy é??è¿?ç½?ç»?ä¼°ç®?ä½?ç½®"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "æ?¯å?¦å??许 Empathy é??è¿?ç½?ç»?估计ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?中导å?¥è´¦æ?·ã??"
 
 #: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr ""
 
 #: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "æ?¯å?¦å?ºäº?é??ç§?å??å? é??ä½? Empathy ä½?置信æ?¯ç??å??确度ã??"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
 
 #: ../data/empathy.schemas.in.h:61
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "æ?¯å?¦å?ºäº?é??ç§?å??å? é??ä½? Empathy ä½?置信æ?¯ç??å??确度ã??"
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
-msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?­å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
 
 #: ../data/empathy.schemas.in.h:63
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次è¿?è¡?æ?¶å??建 Salut è´¦æ?·ã??"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit å¼?å??å·¥å?·ï¼?ä¾?å¦? Web Inspector æ?¯å?¦åº?该å?¯ç?¨ã??"
 
 #: ../data/empathy.schemas.in.h:64
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
-msgstr "æ?¯å?¦å¯¹æ?¨æ?³è¦?ä½?æ?¼å??æ£?æ?¥ç??å??è¯?ä½?æ?¼å??æ£?æ?¥ã??"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?­å¼?è¿?æ?¥æ??é??æ?°è¿?æ?¥ã??"
 
 #: ../data/empathy.schemas.in.h:65
 msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "对è¯?æ?¶æ?¯å?¦å°?表æ??符å?·è½¬æ?¢ä¸ºç??æ­£ç??å?¾æ ?ã??"
+"Whether to check words typed against the languages you want to check with."
+msgstr "æ?¯å?¦å¯¹æ?¨æ?³è¦?ä½?æ?¼å??æ£?æ?¥ç??å??è¯?ä½?æ?¼å??æ£?æ?¥ã??"
 
 #: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对è¯?æ?¶æ?¯å?¦å°?表æ??符å?·è½¬æ?¢ä¸ºè¡¨æ??å?¾æ ?ã??"
 
 #: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "æ?¯å?¦é??è¦?äº?件æ??示é?³ã??"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "æ?¯å?¦é??è¦?æ¶?æ?¯å?°è¾¾æ??示é?³ã??"
+msgid "Whether to play a sound to notify of events."
+msgstr "æ?¯å?¦é??è¦?äº?件æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "æ?¯å?¦é??è¦?æ?°ä¼?è¯?æ??示é?³ã??"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æ?¯å?¦é??è¦?æ¶?æ?¯å?°è¾¾æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "æ?¯å?¦ä¸ºå¤?å?ºæ¶?æ?¯ä½¿ç?¨è¯­é?³æ??示ã??"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "æ?¯å?¦é??è¦?æ?°ä¼?è¯?æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "å½?è??ç½?ç?»å½?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "æ?¯å?¦ä¸ºå¤?å?ºæ¶?æ?¯ä½¿ç?¨å£°é?³æ??示ã??"
 
 #: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "å½?ç½?ç»?æ?­å¼?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
+msgid "Whether to play a sound when logging into a network."
+msgstr "å½?è??ç½?ç?»å½?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦ä½¿ç?¨è¯­é?³é??ç?¥ã??"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "å½?ç½?ç»?æ?­å¼?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
 #: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
-msgstr "å½?è??系人离线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥ã??"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦ä½¿ç?¨å£°é?³æ??示ã??"
 
 #: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "å½?è??系人离线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:77
-msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
-msgstr "å½?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºæ??示å?³è??天çª?å?£å·²å¼?å?¯ï¼?ä½?æ?ªé?²ç½®ã??"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:78
+#, fuzzy
 msgid ""
-"Whether or not to show a popup notification when receiving a new message."
-msgstr "å½?æ?¶å?°æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "å½?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºæ??示å?³è??天çª?å?£å·²å¼?å?¯ï¼?ä½?æ?ªé?²ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå¤´å??ã??"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "å½?æ?¶å?°æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
 #: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "æ?¯å?¦æ?¾ç¤ºè??系人æ¸?å??中离线ç??è??系人ã??"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå¤´å??ã??"
 
 #: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "å½?离å¼?æ´»å¿?ç¢?æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "æ?¯å?¦æ?¾ç¤ºè??系人æ¸?å??中离线ç??è??系人ã??"
 
 #: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "æ?¯å?¦å?¨è??天室æ?¾ç¤ºè??系人å??表ã??"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
 #: ../data/empathy.schemas.in.h:83
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "æ?¯å?¦å¯¹ä½¿ç?¨æ ?é¢?æ ?中ç??â??Xâ??æ??é?®å?³é?­ä¸»çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå??è®®ã??"
 
 #: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "æ?¯å?¦ä»¥ç´§å??æ ¼å¼?æ?¾ç¤ºè??系人å??表ã??"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "æ?¯å?¦å?¨è??天室æ?¾ç¤ºè??系人å??表ã??"
 
 #: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
+msgid "Whether to show the contact list in compact mode."
+msgstr "æ?¯å?¦ä»¥ç´§å??模å¼?æ?¾ç¤ºè??系人å??表ã??"
 
 #: ../data/empathy.schemas.in.h:86
+#, fuzzy
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "æ?¯å?¦å¯¹ä½¿ç?¨æ ?é¢?æ ?中ç??â??Xâ??æ??é?®å?³é?­ä¸»çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
+
+#: ../data/empathy.schemas.in.h:87
+msgid "Whether to use the theme for chat rooms."
+msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
+
+#: ../data/empathy.schemas.in.h:88
+#, fuzzy
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
 "使ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼â??nameâ??以æ??è??系人å§?å??æ??åº?ã??å??å?¼"
 "为â??stateâ??æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
 
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+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/cc-empathy-accounts-panel.c:91
+msgid "Messaging and VoIP Accounts"
+msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
+
+#: ../libempathy/empathy-ft-handler.c:842
 msgid "The hash of the received file and the sent one do not match"
 msgstr "æ?¥æ?¶å?°ç??æ??件å??å??é??ç??é?£ä¸ªæ??件å??å¸?å?¼ä¸?å?¹é??"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1102
 msgid "File transfer not supported by remote contact"
 msgstr "æ??ä»¶ä¼ è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1160
 msgid "The selected file is not a regular file"
 msgstr "æ??é??æ??件æ?¯é??正常ç??æ??件"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is empty"
 msgstr "æ??é??æ??件æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:77
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
@@ -471,7 +478,7 @@ msgstr "å½?ä¼ è¾?è¿?个æ??件ç??æ?¶å??å??ç??é??误"
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¦å¤?ç??å??ä¸?è??æ? æ³?ä¼ è¾?è¿?个æ??件"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
@@ -488,22 +495,78 @@ msgid "Away"
 msgstr "离�"
 
 #: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
+msgid "Invisible"
 msgstr "é??身"
 
 #: ../libempathy/empathy-utils.c:247
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+msgid "No reason specified"
+msgstr "æ?ªæ??å®?å??å? "
+
+#: ../libempathy/empathy-utils.c:288
+msgid "Status is set to offline"
+msgstr "ç?¶æ??已设置为离线"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "ç½?ç»?é??误"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "��失败"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "å? å¯?é??误"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "æ?ªæ??ä¾?è¯?书"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "�书�被信任"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "è¯?书已è¿?æ??"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "�书���活"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "è¯?书æ??纹ä¸?å?¹é??"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "è¯?书é??误"
+
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:388
+#: ../libempathy/empathy-utils.c:434
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:389
+#: ../libempathy/empathy-utils.c:435
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -547,57 +610,69 @@ msgstr[0] "%d æ??å??"
 msgid "in the future"
 msgstr "å°?æ?¥"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:450
+#: ../libempathy-gtk/empathy-account-chooser.c:462
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:519
-#: ../libempathy-gtk/empathy-account-widget.c:575
+#: ../libempathy-gtk/empathy-account-widget.c:538
+#: ../libempathy-gtk/empathy-account-widget.c:594
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1292
+#: ../libempathy-gtk/empathy-account-widget.c:1126
+msgid "Username:"
+msgstr "ç?¨æ?·å??ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1474
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1500
-msgid "Enabled"
-msgstr "��"
-
-#.  Translators: this is used only when built on a moblin platform 
-#: ../libempathy-gtk/empathy-account-widget.c:1506
+#: ../libempathy-gtk/empathy-account-widget.c:1542
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "账��"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1553
+msgid "Enabled"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1618
+#, fuzzy
+msgid "This account already exists on the server"
+msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1621
+msgid "Create a new account on the server"
+msgstr "å?¨æ??å?¡å?¨ä¸?å??建æ?°ç??å¸?æ?·"
+
 #. To translators: The first parameter is the login id and the
 #. * second one is the server. The resulting string will be something
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1770
+#: ../libempathy-gtk/empathy-account-widget.c:2013
 #, 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:1788
+#: ../libempathy-gtk/empathy-account-widget.c:2039
 #, c-format
 msgid "%s Account"
 msgstr "%s 账�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1792
+#: ../libempathy-gtk/empathy-account-widget.c:2043
 msgid "New account"
 msgstr "�建账�"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??称</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??称"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -606,7 +681,7 @@ msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??称</span>"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "�级"
@@ -616,7 +691,7 @@ msgstr "�级"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
@@ -636,7 +711,7 @@ msgstr "æ?¨ç?? AIM å±?å¹?å??称æ?¯ä»?ä¹?ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -645,7 +720,7 @@ msgstr "端�(_P)�"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -654,8 +729,8 @@ msgstr "æ??å?¡å?¨(_S)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -672,8 +747,8 @@ msgid "What is your GroupWise password?"
 msgstr "æ?¨ç?? GroupWise å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>���</b>123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>���</b>123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -689,7 +764,7 @@ msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
+msgid "_Character set:"
 msgstr "å­?符é??(_C)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.c:244
@@ -717,20 +792,20 @@ msgstr "TLS"
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:222
 msgid "Register"
-msgstr ""
+msgstr "注å??"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:227
 msgid "Options"
-msgstr ""
+msgstr "é??项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:230
 msgid "None"
 msgstr "æ? "
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
 msgstr "å­?符é??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -762,12 +837,12 @@ msgid "Servers"
 msgstr "æ??å?¡å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user gmail com</span>"
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>���</b>user gmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
-msgstr "<span size=\"small\"><b>���</b> user jabber org</span>"
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>���</b>user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
@@ -781,56 +856,73 @@ msgstr "ä¼?å??级(_O)ï¼?"
 msgid "Reso_urce:"
 msgstr "��(_U)�"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
 msgstr "使ç?¨æ?§ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook password?"
+msgstr "æ?¨ç?? Facebook å¯?ç ?æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "What is your Facebook username?"
+msgstr "æ?¨ç?? Facebook ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Google ID?"
 msgstr "æ?¨ç?? Google ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Google password?"
 msgstr "æ?¨ç?? Google å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Jabber ID?"
 msgstr "æ?¨ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Jabber password?"
 msgstr "æ?¨ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your desired Jabber ID?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your desired Jabber password?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "_Encryption required (TLS/SSL)"
 msgstr "é??è¦?å? å¯?(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "_Ignore SSL certificate errors"
 msgstr "忽ç?¥ SSL è¯?书é??误(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user hotmail com</span>"
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>���</b>user hotmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
+msgid "What is your Windows Live ID?"
+msgstr "æ?¨ç?? Windows Live å¸?æ?·æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "æ?¨ç?? Windows Live ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
+msgid "What is your Windows Live password?"
+msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
+msgid "_E-mail address:"
 msgstr "���件(_E)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
@@ -854,90 +946,111 @@ msgid "_Published Name:"
 msgstr "å?¬å¼?ç??å??å­?(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<b>Keep-Alive Options</b>"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "<b>Miscellaneous Options</b>"
-msgstr "<b>æ??项é??项</b>"
+msgid "<b>Example:</b> user my sip server"
+msgstr "<b>���</b>user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>NAT Traversal Options</b>"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "<b>Proxy Options</b>"
-msgstr "<b>代ç??é??项</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Authentication username:"
 msgstr "éª?è¯?ç?¨æ?·å??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
 msgstr ""
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../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:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "é?´é??(ç§?)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+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
 msgid "Loose Routing"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "���"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "æ??项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+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
 msgid "Port:"
 msgstr "端��"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "代ç??é??项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Server:"
 msgstr "æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "Transport:"
 msgstr "ä¼ è¾?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../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
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
 msgid "What is your SIP login ID?"
 msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
+msgid "Use _Yahoo! Japan"
 msgstr "使� _Yahoo ��"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
@@ -949,11 +1062,11 @@ msgid "What is your Yahoo! password?"
 msgstr "æ?¨ç?? Yahoo! å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+msgid "Yahoo! I_D:"
 msgstr "Yahoo I_Dï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
 msgstr "忽ç?¥ä¼?è®®å??è??天室é??请(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -966,7 +1079,8 @@ msgid "Couldn't convert image"
 msgstr "æ? æ³?转æ?¢å?¾å??"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+#, fuzzy
+msgid "None of the accepted image formats are supported on your system"
 msgstr "没æ??ä¸?个å?¬è®¤ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:915
@@ -989,145 +1103,149 @@ msgstr "æ??æ??æ??件"
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:199
+#: ../libempathy-gtk/empathy-chat.c:233
 msgid "Failed to reconnect this chat"
 msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
 
-#: ../libempathy-gtk/empathy-chat.c:621
-msgid "Failed to join chatroom"
+#: ../libempathy-gtk/empathy-chat.c:655
+msgid "Failed to join chat room"
 msgstr "å? å?¥è??天室失败"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:673
 msgid "Failed to open private chat"
 msgstr "建��人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:678
+#: ../libempathy-gtk/empathy-chat.c:712
 msgid "Topic not supported on this conversation"
 msgstr "ä¸?æ?¯æ??å?¨æ­¤ä¼?è¯?ä¸?设置主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:718
 msgid "You are not allowed to change the topic"
 msgstr "�����主�"
 
-#: ../libempathy-gtk/empathy-chat.c:802
-msgid "/clear, clear all messages from the current conversation"
+#: ../libempathy-gtk/empathy-chat.c:847
+msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:805
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "/topic <topic>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
+#: ../libempathy-gtk/empathy-chat.c:850
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主é¢?>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:808
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <chatroom id>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:853
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:811
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <chatroom id>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:856
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:814
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr "/query <contact id> [<message>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
+#: ../libempathy-gtk/empathy-chat.c:859
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:817
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr "/msg <contact id> <message>ï¼?æ??å¼?ä¸?个ç§?人è??天"
+#: ../libempathy-gtk/empathy-chat.c:862
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?个ç§?人è??天"
 
-#: ../libempathy-gtk/empathy-chat.c:820
-msgid "/nick <nickname>, change your nickname on current server"
-msgstr "/nick <nickname>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
+#: ../libempathy-gtk/empathy-chat.c:865
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
 
-#: ../libempathy-gtk/empathy-chat.c:823
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:868
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??对è¯?中å??é??ä¸?个å?¨ä½?æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:871
 msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chatroom\""
+"join a new chat room\""
 msgstr ""
-"/say <message>ï¼?å??é?? <message> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?"
+"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?"
 "å¦?ï¼?â??/say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:876
 msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<command>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <command> 被å®?ä¹?ç??ï¼?æ?¾ç¤ºå®?ç??ç?¨"
+"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:886
 #, c-format
 msgid "Usage: %s"
 msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "Unknown command"
 msgstr "���令"
 
-#: ../libempathy-gtk/empathy-chat.c:991
-msgid "Unknown command, see /help for the available commands"
+#: ../libempathy-gtk/empathy-chat.c:1036
+msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥å?½ä»¤ï¼?请使ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1130
+#: ../libempathy-gtk/empathy-chat.c:1174
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1133
+#: ../libempathy-gtk/empathy-chat.c:1177
 msgid "invalid contact"
 msgstr "æ? æ??è??系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1136
+#: ../libempathy-gtk/empathy-chat.c:1180
 msgid "permission denied"
 msgstr "æ??é??ä¸?足"
 
-#: ../libempathy-gtk/empathy-chat.c:1139
+#: ../libempathy-gtk/empathy-chat.c:1183
 msgid "too long message"
 msgstr "��太�"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1186
 msgid "not implemented"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1189
 msgid "unknown"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1193
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1228
 #, c-format
 msgid "Topic set to: %s"
 msgstr "��被设置为�%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1230
 msgid "No topic defined"
 msgstr "�设置��"
 
-#: ../libempathy-gtk/empathy-chat.c:1554
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "(No Suggestions)"
 msgstr "(没æ??建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1683
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1626
-#: ../libempathy-gtk/empathy-ui-utils.c:1545
+#: ../libempathy-gtk/empathy-chat.c:1701
+#: ../libempathy-gtk/empathy-ui-utils.c:1675
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1660
+#: ../libempathy-gtk/empathy-chat.c:1735
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1829
+msgid "Failed to retrieve recent logs"
+msgstr "è?·å??æ??è¿?æ?¥å¿?失败"
+
+#: ../libempathy-gtk/empathy-chat.c:1960
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已����"
@@ -1135,12 +1253,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:1782
+#: ../libempathy-gtk/empathy-chat.c:1967
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢�"
 
-#: ../libempathy-gtk/empathy-chat.c:1785
+#: ../libempathy-gtk/empathy-chat.c:1970
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -1148,17 +1266,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:1793
+#: ../libempathy-gtk/empathy-chat.c:1978
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:1796
+#: ../libempathy-gtk/empathy-chat.c:1981
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1985
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离å¼?äº?è??天室"
@@ -1168,81 +1286,81 @@ msgstr "%s 离å¼?äº?è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1994
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:2019
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:2044
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?°å?¨å?«å?? %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1534
+#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../libempathy-gtk/empathy-chat.c:2521
+#: ../libempathy-gtk/empathy-chat.c:2701
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç ?é??误ï¼?请é??è¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2702
 msgid "Retry"
 msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2707
 msgid "This room is protected by a password:"
 msgstr "è¿?个æ?¿é?´æ?¯ç?±ä¸?个å¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2528
+#: ../libempathy-gtk/empathy-chat.c:2708
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2668
+#: ../libempathy-gtk/empathy-chat.c:2848
 msgid "Connected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2721
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Conversation"
 msgstr "对�"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:650
+#: ../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:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-chat-text-view.c:318
+#: ../libempathy-gtk/empathy-theme-adium.c:786
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-chat-text-view.c:325
+#: ../libempathy-gtk/empathy-theme-adium.c:793
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:422
+#: ../libempathy-gtk/empathy-chat-text-view.c:423
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
 msgid "Edit Contact Information"
 msgstr "ç¼?è¾?è??系人信æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:301
 msgid "Personal Information"
 msgstr "个人信�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:406
 msgid "New Contact"
 msgstr "æ?°å»ºè??系人"
 
@@ -1254,209 +1372,217 @@ msgstr "以å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "订é??请æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1555
+#: ../libempathy-gtk/empathy-contact-list-view.c:1633
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1557
+#: ../libempathy-gtk/empathy-contact-list-view.c:1635
 msgid "Removing group"
 msgstr "å? é?¤ç¾¤ç»?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1604
-#: ../libempathy-gtk/empathy-contact-list-view.c:1681
+#: ../libempathy-gtk/empathy-contact-list-view.c:1684
+#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1634
+#: ../libempathy-gtk/empathy-contact-list-view.c:1714
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1636
+#: ../libempathy-gtk/empathy-contact-list-view.c:1716
 msgid "Removing contact"
 msgstr "å? é?¤è??系人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:12
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:206
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Add Contactâ?¦"
 msgstr "æ·»å? è??系人(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:233
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:264
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "����(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:296
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "����(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-#: ../src/empathy-main-window.ui.h:24
+#: ../libempathy-gtk/empathy-contact-menu.c:347
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "æ??è¿?ä¼?è¯?(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
+#: ../libempathy-gtk/empathy-contact-menu.c:369
 msgid "Send file"
 msgstr "å??é??æ??件"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:392
 msgid "Share my desktop"
 msgstr "å?±äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:432
+#: ../libempathy-gtk/empathy-contact-widget.c:1379
+msgid "Favorite"
+msgstr "æ?¶è??夹"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:462
 msgid "Infor_mation"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:508
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:562
+#: ../src/empathy-chat-window.c:857
+msgid "Inviting you to this room"
 msgstr "é??请å?°æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:593
+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:447
-msgid "Save Avatar"
-msgstr "ä¿?å­?头å??"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "æ? æ³?ä¿?å­?头å??"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:238
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1010
-#: ../src/empathy-main-window.c:1026
+#: ../libempathy-gtk/empathy-contact-widget.c:247
+#: ../src/empathy-main-window.c:1050
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:478
 msgid "Country ISO Code:"
 msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:480
 msgid "Country:"
 msgstr "�家�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:482
 msgid "State:"
 msgstr "ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:484
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:486
 msgid "Area:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:488
 msgid "Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:490
 msgid "Street:"
 msgstr "è¡?é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:492
 msgid "Building:"
 msgstr "建���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:494
 msgid "Floor:"
 msgstr "楼��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:498
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:500
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:502
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1287
+#: ../libempathy-gtk/empathy-contact-widget.c:504
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1289
+#: ../libempathy-gtk/empathy-contact-widget.c:506
 msgid "Error:"
 msgstr "é??误ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-widget.c:508
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1293
+#: ../libempathy-gtk/empathy-contact-widget.c:510
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1295
+#: ../libempathy-gtk/empathy-contact-widget.c:512
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1297
+#: ../libempathy-gtk/empathy-contact-widget.c:514
 msgid "Bearing:"
 msgstr "æ?¹ä½?æ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1299
+#: ../libempathy-gtk/empathy-contact-widget.c:516
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1301
+#: ../libempathy-gtk/empathy-contact-widget.c:518
 msgid "Last Updated on:"
 msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1303
+#: ../libempathy-gtk/empathy-contact-widget.c:520
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1305
+#: ../libempathy-gtk/empathy-contact-widget.c:522
 msgid "Latitude:"
 msgstr "纬度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1307
+#: ../libempathy-gtk/empathy-contact-widget.c:524
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1368
-msgid "<b>Location</b>"
-msgstr "<b>ä½?ç½®</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1381
+#: ../libempathy-gtk/empathy-contact-widget.c:603
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®</b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1431
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y � %R UTC ��"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+msgid "Save Avatar"
+msgstr "ä¿?å­?头å??"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+msgid "Unable to save avatar"
+msgstr "æ? æ³?ä¿?å­?头å??"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
@@ -1478,54 +1604,49 @@ msgid "Client:"
 msgstr "客�端�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1009
-msgid "Contact"
-msgstr "è??系人"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Contact Details"
 msgstr "è??系人详æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "���件�"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
 msgstr "�称�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Groups"
 msgstr "ç»?"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid "Identifier:"
 msgstr "æ ?è¯?符ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "信�已请�..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requestedâ?¦"
+msgstr "å·²å??é??ä¿¡æ?¯è¯·æ±?..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "OS:"
 msgstr "æ??ä½?ç³»ç»?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 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:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
 msgstr "ç½?ç«?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "_Add Group"
 msgstr "æ·»å? 群ç»?(_A)"
 
@@ -1545,12 +1666,12 @@ msgstr "端�"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:700
 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "账�"
 
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:717
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1570,58 +1691,84 @@ msgstr "æ??ç´¢"
 msgid "_For:"
 msgstr "å??å?«(_F)ï¼?"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "é??è¯?(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "è??系人 IDï¼?"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
 msgid "C_hat"
 msgstr "è??天(_H)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "è??系人 IDï¼?"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
 msgid "New Conversation"
 msgstr "�建对�"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+msgid "Send _Video"
+msgstr "å??é??è§?é¢?(_V)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "é??è¯?(_C)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+msgid "New Call"
+msgstr "æ?°å»ºé??è¯?"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
-msgid "Custom Message..."
-msgstr "è?ªå®?ä¹?ç?¶æ??..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Messageâ?¦"
+msgstr "�����"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
-msgid "Edit Custom Messages..."
-msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messagesâ?¦"
+msgstr "�������"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
 msgid "Click to remove this status as a favorite"
 msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
 msgid "Click to make this status a favorite"
 msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
 msgid "Set status"
 msgstr "设置ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:895
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
 msgid "Set your presence and current status"
 msgstr "è®¾ç½®ä½ ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1082
-msgid "Custom messages..."
-msgstr "è?ªå®?ä¹?ç?¶æ??..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+msgid "Custom messagesâ?¦"
+msgstr "�����..."
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "å?ºå??大å°?å??"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "����语"
 
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
@@ -1663,11 +1810,11 @@ msgstr "å?¼å?ºç??语é?³é??è¯?"
 msgid "Voice call ended"
 msgstr "语é?³é??è¯?ç»?æ??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "è¾?å?¥è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??"
 
@@ -1695,15 +1842,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1407
+#: ../libempathy-gtk/empathy-ui-utils.c:1550
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1537
+#: ../libempathy-gtk/empathy-ui-utils.c:1667
 msgid "Select a file"
 msgstr "é??æ?©æ??件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-ui-utils.c:1731
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
@@ -1875,12 +2022,12 @@ msgid "Vietnamese"
 msgstr "è¶?å??语"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
-msgstr "é??æ?©ç??è??系人æ? æ³?æ?¥å??æ??件ã??"
+msgid "The selected contact cannot receive files."
+msgstr "é??æ?©ç??è??系人æ? æ³?æ?¥æ?¶æ??件ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
-msgstr "è??系人离线"
+msgid "The selected contact is offline."
+msgstr "é??æ?©ç??è??系人离线ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
 msgid "No error message"
@@ -1890,23 +2037,19 @@ msgstr "æ? é??误信æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "����(Empathy)"
 
-#: ../src/empathy.c:893
+#: ../src/empathy.c:584
 msgid "Don't connect on startup"
 msgstr "��������"
 
-#: ../src/empathy.c:897
+#: ../src/empathy.c:588
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
 
-#: ../src/empathy.c:901
-msgid "Show the accounts dialog"
-msgstr "�示账�对��"
-
-#: ../src/empathy.c:913
+#: ../src/empathy.c:600
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客�端"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1916,7 +2059,7 @@ msgstr ""
 "Empathy æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?ä¸?é??æ?°å??å¸?"
 "æ??ä¿®æ?¹å®?ï¼?许å?¯è¯?å?¯ä½¿ç?¨ç¬¬äº?ç??æ??æ?¨æ?³é??æ?©ç??æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1926,7 +2069,7 @@ msgstr ""
 "Empathy å??å¸?ç??ç?®ç??æ?¯å¸?æ??å®?对æ?¨æ??ç?¨ï¼?ä½?æ?¯æ²¡æ??ä»»ä½?æ??ä¿?ï¼?å?³ä½¿æ?¯å¯¹å??ä¸?åº?ç?¨ä»¥å??å?¶"
 "å®?ç?¹å®?ç?®ç??ã??æ?¥é?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?以è?·å??æ?´å¤?ç»?è??ã??"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1936,11 +2079,11 @@ msgstr ""
 "ç»?è?ªç?±è½¯ä»¶å?ºé??ä¼?å??ä¿¡ã??å?°å??æ?¯ï¼?51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
 msgstr "�个 GNOME ����客�端"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "YangZhang, <zyangmath gmail com>\n"
@@ -1955,75 +2098,74 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
-msgstr "建ç«?å¸?æ?·æ?¶å??ç??é??误ã??"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "导å?¥å¸?æ?·æ?¶å??ç??é??误ã??"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
-msgstr "å?¨è§£æ??è´¦æ?·ä¿¡æ?¯æ?¶å?ºç?°é??误ã??"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "å?¨è§£æ??è´¦æ?·è¯¦æ??æ?¶å?ºç?°é??误ã??"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
-msgstr "å?¨å??建账æ?·æ?¯å?ºç?°é??误ã??"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "å?¨å??建账æ?·æ?¶å?ºç?°é??误ã??"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
 msgstr "å??ç??é??误ã??"
 
-#: ../src/empathy-account-assistant.c:141
+#: ../src/empathy-account-assistant.c:179
 #, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "é??误信æ?¯æ?¯ï¼?<span style=\"italic\">%s</span>"
+msgid "The error message was: %s"
+msgstr "é??误信æ?¯ä¸ºï¼?%s"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:183
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
 "æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??中å? å?¥è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1303
 msgid "An error occurred"
 msgstr "å??ç??é??误"
 
-#. Create account
 #. To translator: %s is the protocol name
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:331
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
 #, c-format
 msgid "New %s account"
 msgstr "�建 %s 账�"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:508
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨å·²ç»?æ?¥æ??å?ªä¸ªç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:514
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨è¿?è¦?设置å?¶å®?è??天账æ?·å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:520
 msgid "Enter your account details"
 msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
 
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:525
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³å??建é?£ç§?ç±»å??ç??å¸?æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:531
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¨æ?³è¦?å??建å?¶å®?ç??è??天账æ?·å??ã??"
 
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:538
 msgid "Enter the details for the new account"
 msgstr "è¾?å?¥æ?°è´¦æ?·ç??详ç»?èµ?æ??"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:653
 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 "
@@ -2034,248 +2176,282 @@ msgstr ""
 "Live å??许å¤?å?¶å®?è??天软件ç??æ??å??å??å??äº?è??天ã??使ç?¨éº¦å??é£?æ??æ??å??头ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
 "å??è§?é¢?é??è¯?ã??"
 
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:670
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ??没æ??å?¶å®?è??天软件ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:693
 msgid "Yes, import my account details from "
 msgstr "æ??ï¼?请导å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:714
 msgid "Yes, I'll enter my account details now"
 msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:736
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?个æ?°ç??è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:746
 msgid "No, I just want to see people online nearby for now"
 msgstr "没æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:767
 msgid "Select the accounts you want to import:"
 msgstr "é??æ?©æ?¨è¦?导å?¥ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:851
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:858
 msgid "No, that's all for now"
 msgstr "没æ??ï¼?å°±è¿?æ ·å?§ã??"
 
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1117
+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 ""
+
+#: ../src/empathy-account-assistant.c:1123
+#: ../src/empathy-account-assistant.c:1179
+msgid "Edit->Accounts"
+msgstr "��->账�"
+
+#: ../src/empathy-account-assistant.c:1139
+msgid "I don't want to enable this feature for now"
+msgstr "æ??ä¸?å?¯ç?¨æ­¤ç?¹æ?§"
+
+#: ../src/empathy-account-assistant.c:1175
+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 ""
+
+#: ../src/empathy-account-assistant.c:1181
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut ���"
+
+#: ../src/empathy-account-assistant.c:1227
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
+
+#: ../src/empathy-account-assistant.c:1261
 msgid "Welcome to Empathy"
 msgstr "欢�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1270
 msgid "Import your existing accounts"
 msgstr "导å?¥ç?°æ??å¸?æ?·"
 
+#: ../src/empathy-account-assistant.c:1288
+msgid "Please enter personal details"
+msgstr ""
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:66
 #, c-format
-msgid "There are unsaved modification regarding your %s account."
+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:67
+#: ../src/empathy-accounts-dialog.c:70
 msgid "Your new account has not been saved yet."
 msgstr "æ?¨ç??æ?°å¸?æ?·è¿?没æ??ä¿?å­?ã??"
 
-#: ../src/empathy-accounts-dialog.c:484
+#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+msgid "Connectingâ?¦"
+msgstr "正���..."
+
+#: ../src/empathy-accounts-dialog.c:290
+#, c-format
+msgid "Disconnected â?? %s"
+msgstr "已�� - %s"
+
+#: ../src/empathy-accounts-dialog.c:295
+#, c-format
+msgid "Offline â?? %s"
+msgstr "离线 - %s"
+
+#: ../src/empathy-accounts-dialog.c:308
+msgid "Offline â?? No Network Connection"
+msgstr "离线 - æ? å?¯ç?¨ç½?ç»?"
+
+#: ../src/empathy-accounts-dialog.c:316
+msgid "Unknown Status"
+msgstr "æ?ªç?¥ç?¶æ??"
+
+#: ../src/empathy-accounts-dialog.c:327
+msgid "Offline â?? Account Disabled"
+msgstr "离线 - ��被��"
+
+#: ../src/empathy-accounts-dialog.c:768
 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:774
+#: ../src/empathy-accounts-dialog.c:1115
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¨è¦?ä»?ç?µè??中移é?¤ %s å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:778
+#: ../src/empathy-accounts-dialog.c:1119
 msgid "This will not remove your account on the server."
 msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
 
-#: ../src/empathy-accounts-dialog.c:960
+#: ../src/empathy-accounts-dialog.c:1356
 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:1425
+#: ../src/empathy-accounts-dialog.c:1933
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "æ?¨å°?è¦?å?³é?­æ­¤çª?å?£ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继续å??ï¼?"
 
-#.  Translators: this is used only when built on a moblin platform 
-#: ../src/empathy-accounts-dialog.c:1596
-msgid "_Next"
-msgstr "��页(_N)"
-
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "账�"
+msgid "No protocol installed"
+msgstr "å°?æ?ªå®?è£?å??è®®"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "æ·»å? "
+msgid "Protocol:"
+msgstr "å??è®®ï¼?"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "å??建(_E)"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "å°?æ?ªå®?è£?å??è®®"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "è¦?æ·»å? ä¸?个æ?°è´¦æ?·ï¼?æ?¨é¦?å??é??è¦?为æ?¨æ?³è¦?使ç?¨ç??æ¯?个å??è®®å®?è£?å??端ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Addâ?¦"
 msgstr "æ·»å? (_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "å??建æ?°ç??å¸?æ?·(_C)"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Import..."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Importâ?¦"
 msgstr "导�(_I)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "_Reuse an existing account"
-msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "account"
-msgstr "账�"
-
-#: ../src/empathy-call-window.c:452
+#: ../src/empathy-call-window.c:453
 msgid "Contrast"
 msgstr "对�度"
 
-#: ../src/empathy-call-window.c:455
+#: ../src/empathy-call-window.c:456
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:458
+#: ../src/empathy-call-window.c:459
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:566
+#: ../src/empathy-call-window.c:567
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:728
-msgid "Connecting..."
-msgstr "正���..."
-
-#: ../src/empathy-call-window.c:1021
+#: ../src/empathy-call-window.c:1022
 msgid "_Sidebar"
 msgstr "侧边æ ?(_S)"
 
-#: ../src/empathy-call-window.c:1040
-msgid "Dialpad"
-msgstr "ç?µè¯?é?®ç??"
-
-#: ../src/empathy-call-window.c:1046
+#: ../src/empathy-call-window.c:1041
 msgid "Audio input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:1050
+#: ../src/empathy-call-window.c:1045
 msgid "Video input"
 msgstr "����"
 
+#: ../src/empathy-call-window.c:1049
+msgid "Dialpad"
+msgstr "ç?µè¯?é?®ç??"
+
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1113
+#: ../src/empathy-call-window.c:1117
 #, 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:1194
+#: ../src/empathy-call-window.c:1198
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1697
+#: ../src/empathy-call-window.c:1695
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1758
+#: ../src/empathy-call-window.c:1756
 msgid "Technical Details"
 msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-call-window.c:1796
+#: ../src/empathy-call-window.c:1794
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1801
+#: ../src/empathy-call-window.c:1799
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1807
+#: ../src/empathy-call-window.c:1805
 #, 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:1813
+#: ../src/empathy-call-window.c:1811
 msgid "There was a failure on the network"
 msgstr "ç½?ç»?å?ºç?°ä¸?个é??误"
 
-#: ../src/empathy-call-window.c:1817
+#: ../src/empathy-call-window.c:1815
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1820
+#: ../src/empathy-call-window.c:1818
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1830
-#, c-format
+#: ../src/empathy-call-window.c:1828
+#, fuzzy, c-format
 msgid ""
-"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
 "Telepathy ç»?件å?ºç?°äº?ä¸?äº?æ??å¤?ã??请<a href=\"%s\">æ±?æ?¥è¿?个é??误</a>ï¼?并é??ä¸?帮å?©è??"
 "å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
 
-#: ../src/empathy-call-window.c:1838
+#: ../src/empathy-call-window.c:1836
 msgid "There was a failure in the call engine"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1877
+#: ../src/empathy-call-window.c:1875
 msgid "Can't establish audio stream"
 msgstr "��建����"
 
-#: ../src/empathy-call-window.c:1887
+#: ../src/empathy-call-window.c:1885
 msgid "Can't establish video stream"
 msgstr "��建����"
 
@@ -2343,39 +2519,35 @@ msgstr "����"
 msgid "Video Preview"
 msgstr "����"
 
-#: ../src/empathy-call-window.ui.h:17
-msgid "_Call"
-msgstr "é??è¯?(_C)"
-
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:408 ../src/empathy-chat-window.c:428
+#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d �读)"
 
-#: ../src/empathy-chat-window.c:420
+#: ../src/empathy-chat-window.c:448
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (å?? %u å?¶å®?)"
 
-#: ../src/empathy-chat-window.c:436
+#: ../src/empathy-chat-window.c:464
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ���读)"
 
-#: ../src/empathy-chat-window.c:445
+#: ../src/empathy-chat-window.c:473
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ���读)"
 
-#: ../src/empathy-chat-window.c:654
+#: ../src/empathy-chat-window.c:676
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2396,46 +2568,54 @@ msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participantâ?¦"
+msgstr ""
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "左移æ ?ç­¾(_L)"
 
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "å?³ç§»æ ?ç­¾(_R)"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "å??容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Conversation"
 msgstr "对�(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Detach Tab"
 msgstr "æ¼?移æ ?ç­¾(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "ç¼?è¾?(_E)"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Favorite Chat Room"
 msgstr "æ?¶è??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "ä¸?ä¸?æ ?ç­¾(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Previous Tab"
 msgstr "ä¸?ä¸?æ ?ç­¾(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "æ?¾ç¤ºè??系人å??表(_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
 msgid "_Tabs"
 msgstr "æ ?ç­¾(_T)"
 
@@ -2455,75 +2635,77 @@ msgstr "����"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??è??天室æ?¶è??"
 
-#: ../src/empathy-event-manager.c:330
+#: ../src/empathy-event-manager.c:339
+#, fuzzy
+msgid "Incoming video call"
+msgstr "å?¼å?¥ç??语é?³é??è¯?"
+
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming call"
 msgstr "��"
 
-#: ../src/empathy-event-manager.c:333
-#, c-format
-msgid "%s is calling you, do you want to answer?"
+#: ../src/empathy-event-manager.c:343
+#, fuzzy, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+
+#: ../src/empathy-event-manager.c:344
+#, fuzzy, c-format
+msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
-#: ../src/empathy-event-manager.c:340
+#: ../src/empathy-event-manager.c:366
 msgid "_Reject"
 msgstr "æ??ç»?(_R)"
 
-#: ../src/empathy-event-manager.c:346
+#: ../src/empathy-event-manager.c:372
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:455
-#, c-format
-msgid "Incoming call from %s"
+#: ../src/empathy-event-manager.c:489
+#, fuzzy, c-format
+msgid "Incoming video call from %s"
 msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:499
+#: ../src/empathy-event-manager.c:489
 #, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s æ­£å??é??é??请ç»?æ?¨"
-
-#: ../src/empathy-event-manager.c:505
-msgid "An external application will be started to handle it."
-msgstr "å°?å?¯å?¨ä¸?个å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
-
-#: ../src/empathy-event-manager.c:510
-msgid "You don't have the needed external application to handle it."
-msgstr "æ?¨æ²¡æ??å¿?é??ç??å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
+msgid "Incoming call from %s"
+msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:579
 msgid "Room invitation"
 msgstr "è??天室é??请"
 
-#: ../src/empathy-event-manager.c:641
+#: ../src/empathy-event-manager.c:582
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:649
+#: ../src/empathy-event-manager.c:590
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:654
+#: ../src/empathy-event-manager.c:595
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:693
+#: ../src/empathy-event-manager.c:634
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:719
+#: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??ä»¶ä¼ è¾?"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:818
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ç??订é??请æ±?"
 
-#: ../src/empathy-event-manager.c:903
+#: ../src/empathy-event-manager.c:822
 #, c-format
 msgid ""
 "\n"
@@ -2533,13 +2715,13 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:862
 #, c-format
 msgid "%s is now offline."
 msgstr "%s å½?å??离线ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:959
+#: ../src/empathy-event-manager.c:878
 #, c-format
 msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
@@ -2683,75 +2865,23 @@ msgstr "�"
 msgid "%s account"
 msgstr "%s 账�"
 
-#: ../src/empathy-main-window.c:410
+#: ../src/empathy-main-window.c:437
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:417
+#: ../src/empathy-main-window.c:443
 msgid "Edit Account"
 msgstr "��账�"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:449
 msgid "Close"
 msgstr "��"
 
-#: ../src/empathy-main-window.c:512
-msgid "No error specified"
-msgstr "没æ??说æ??é??误"
-
-#: ../src/empathy-main-window.c:515
-msgid "Network error"
-msgstr "ç½?ç»?é??误"
-
-#: ../src/empathy-main-window.c:518
-msgid "Authentication failed"
-msgstr "��失败"
-
-#: ../src/empathy-main-window.c:521
-msgid "Encryption error"
-msgstr "å? å¯?é??误"
-
-#: ../src/empathy-main-window.c:524
-msgid "Name in use"
-msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
-
-#: ../src/empathy-main-window.c:527
-msgid "Certificate not provided"
-msgstr "æ?ªæ??ä¾?è¯?书"
-
-#: ../src/empathy-main-window.c:530
-msgid "Certificate untrusted"
-msgstr "�书�被信任"
-
-#: ../src/empathy-main-window.c:533
-msgid "Certificate expired"
-msgstr "è¯?书已è¿?æ??"
-
-#: ../src/empathy-main-window.c:536
-msgid "Certificate not activated"
-msgstr "�书���活"
-
-#: ../src/empathy-main-window.c:539
-msgid "Certificate hostname mismatch"
-msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
-
-#: ../src/empathy-main-window.c:542
-msgid "Certificate fingerprint mismatch"
-msgstr "è¯?书æ??纹ä¸?å?¹é??"
-
-#: ../src/empathy-main-window.c:545
-msgid "Certificate self-signed"
-msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
-
-#: ../src/empathy-main-window.c:548
-msgid "Certificate error"
-msgstr "è¯?书é??误"
-
-#: ../src/empathy-main-window.c:551
-msgid "Unknown error"
-msgstr "æ?ªç?¥ç??é??误"
+#: ../src/empathy-main-window.c:1033
+msgid "Contact"
+msgstr "è??系人"
 
-#: ../src/empathy-main-window.c:1312
+#: ../src/empathy-main-window.c:1414
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -2779,55 +2909,63 @@ msgstr "管ç??æ?¶è??夹"
 msgid "N_ormal Size"
 msgstr "常���(_O)"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+msgid "New _Callâ?¦"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "����(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
 msgid "P_references"
 msgstr "é¦?é??项(_R)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
+msgid "Show P_rotocols"
+msgstr "æ?¾ç¤ºå??è®®(_R)"
+
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "æ??å§?å??æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "æ??ç?¶æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "账�(_A)"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "ç´§å??è§?å?¾(_C)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "æ??ä»¶ä¼ è¾?(_F)"
 
-#: ../src/empathy-main-window.ui.h:20
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversationâ?¦"
 msgstr "�建对�(_N)..."
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "离线è??系人(_O)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "个人信�(_P)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??天室(_R)"
 
@@ -2839,11 +2977,10 @@ msgstr "è??天室"
 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
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
 "<b>%s</b>\n"
 "Invite required: %s\n"
@@ -2852,7 +2989,7 @@ msgid ""
 msgstr ""
 "<b>%s</b>\n"
 "é??è¦?é??请ï¼?%s\n"
-"é??è¦?é??请ï¼?%s\n"
+"é??è¦?å¯?ç ?ï¼?%s\n"
 "æ??å??ï¼?%s"
 
 #: ../src/empathy-new-chatroom-dialog.c:541
@@ -2971,10 +3108,6 @@ msgstr "å??许æ?¼å??æ£?æ?¥ç??语è¨?ï¼?"
 msgid "General"
 msgstr "常�"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "ä½?ç½®"
-
 #: ../src/empathy-preferences.ui.h:13
 msgid "Location sources:"
 msgstr "�置���"
@@ -3047,8 +3180,8 @@ msgid "_GPS"
 msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "ç½?ç»?(_N)(IP, Wifi)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ç½?ç»?(_N)(IPï¼?Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3062,98 +3195,205 @@ msgstr "å??æ??ç??è??系人å?¬å¸?ä½?置信æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?置信æ?¯ç²¾åº¦(_R)"
 
-#: ../src/empathy-status-icon.c:178
+#: ../src/empathy-status-icon.c:176
 msgid "Respond"
 msgstr "å??åº?"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç?¶æ??"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "ä¸?è?½å?¯å?¨åº?ç?¨ç¨?åº?为 %s: %s æ??å?¡"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "ä¸?个ç?± %s æ??å?¡æ??ä¾?é??请ï¼?ä½?æ?¯ä½ ä¸?é??è¦?åº?ç?¨ç¨?åº?å¤?ç??å®?"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1066
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1219
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1299
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1311
 msgid "Level "
 msgstr "级� "
 
-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1331
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1337
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1349
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1355
 msgid "Critical"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1361
 msgid "Error"
 msgstr "é??误"
 
-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1380
 msgid "Time"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1383
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1385
 msgid "Category"
 msgstr "类�"
 
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1387
 msgid "Level"
 msgstr "级�"
 
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1424
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 
-#~ msgid "Send video"
-#~ msgstr "å??é??è§?é¢?"
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr ""
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr ""
+
+#: ../src/empathy-accounts.c:213
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+
+#: ../src/empathy-accounts.c:217
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:221
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+
+#: ../src/empathy-accounts.c:223
+msgid "<account-id>"
+msgstr "<账� ID>"
+
+#: ../src/empathy-accounts.c:231
+msgid "- Empathy Accounts"
+msgstr "- Empathy 账�"
+
+#: ../src/empathy-accounts.c:247
+msgid "Empathy Accounts"
+msgstr "Empathy 账�"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Empathy ���"
+
+#~ msgid "Salut account is created"
+#~ msgstr "å·²å??建 Salut è´¦æ?·"
+
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次è¿?è¡?æ?¶å??建 Salut è´¦æ?·ã??"
+
+#~ msgid "Hidden"
+#~ msgstr "é??身"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>ä½?ç½®</b>"
+
+#~ msgid "Email:"
+#~ msgstr "���件�"
+
+#~ msgid "C_all"
+#~ msgstr "é??è¯?(_A)"
+
+#~ msgid "Custom Message..."
+#~ msgstr "è?ªå®?ä¹?ç?¶æ??..."
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
+
+#~ msgid "Custom messages..."
+#~ msgstr "è?ªå®?ä¹?ç?¶æ??..."
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "�示账�对��"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "é??误信æ?¯æ?¯ï¼?<span style=\"italic\">%s</span>"
+
+#~ msgid "_Next"
+#~ msgstr "��页(_N)"
+
+#~ msgid "Accounts"
+#~ msgstr "账�"
+
+#~ msgid "Add new"
+#~ msgstr "æ·»å? "
+
+#~ msgid "Cr_eate"
+#~ msgstr "å??建(_E)"
+
+#~ msgid "_Add..."
+#~ msgstr "æ·»å? (_A)..."
+
+#~ msgid "_Import..."
+#~ msgstr "导�(_I)..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s æ­£å??é??é??请ç»?æ?¨"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "å°?å?¯å?¨ä¸?个å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "æ?¨æ²¡æ??å¿?é??ç??å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
+
+#~ msgid "No error specified"
+#~ msgstr "没æ??说æ??é??误"
+
+#~ msgid "Unknown error"
+#~ msgstr "æ?ªç?¥ç??é??误"
+
+#~ msgid "_Join..."
+#~ msgstr "å? å?¥(_J)..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "�建对�(_N)..."
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "ä¸?è?½å?¯å?¨åº?ç?¨ç¨?åº?为 %s: %s æ??å?¡"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr "ä¸?个ç?± %s æ??å?¡æ??ä¾?é??请ï¼?ä½?æ?¯ä½ ä¸?é??è¦?åº?ç?¨ç¨?åº?å¤?ç??å®?"
 
 #~ msgid "Can't set an empty display name"
 #~ msgstr "æ? æ³?设置为空æ?¾ç¤ºå??称"
@@ -3316,9 +3556,6 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Contact information"
 #~ msgstr "è??系人信æ?¯"
 
-#~ msgid "Custom message"
-#~ msgstr "�����"
-
 #~ msgid "Message:"
 #~ msgstr "���"
 
@@ -3352,9 +3589,6 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Invitation _message:"
 #~ msgstr "é??请æ¶?æ?¯(_M)ï¼?"
 
-#~ msgid "Invite"
-#~ msgstr "é??请"
-
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "æ?¨è¢«é??请å? å?¥ä¸?个è??天ä¼?è®®ã??"