[empathy] Updated Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit 84f127d075d2f2de415e777064680b58014ac3ff
Author: Aron Xu <aronxu gnome org>
Date:   Tue Aug 25 19:32:22 2009 +0800

    Updated Simplified Chinese translation.

 po/zh_CN.po | 1166 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 703 insertions(+), 463 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 66efcb6..70d8f33 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,12 +14,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-07-30 18:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-25 19:26+0800\n"
 "PO-Revision-Date: 2009-07-25 21:28+0000\n"
-"Last-Translator: Aron Xu <aronxu gnome org>\n"
-"Language-Team: Simplified Chinese <i18n-translation lists linux net cn>\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Language-Team: Simplified Chinese <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,345 +56,355 @@ msgid "Compact contact list"
 msgstr "ç´§å??æ?¾ç¤ºè??系人å??表"
 
 #: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
-msgstr "è??系人å??表æ??åº?å??å??"
+#, fuzzy
+msgid "Connection managers should be used"
+msgstr "��使� NetworkManager"
 
 #: ../data/empathy.schemas.in.h:7
+msgid "Contact list sort criterium"
+msgstr "è??系人å??表æ??åº?è§?å??"
+
+#: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "é»?认ç??é??å??头å??å?¾ç??ç??ç?®å½?"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "离å¼?æ?¶ç¦?ç?¨å¼¹å?ºæ??示"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
 msgid "Disable sounds when away"
 msgstr "离����声�"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
 msgid "Empathy can publish the user's location"
 msgstr "Empathy è?½å¤?å??å¸?ç?¨æ?·ç??ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy è?½å¤?é??è¿? GPS æ?¥ä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy è?½å¤?é??è¿?æ??æ?ºæ?¥ä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy è?½å¤?é??è¿?ç½?ç»?æ?¥ä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy default download folder"
 msgstr "Empathy é»?认ä¸?è½½æ??件夹"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已�询�导�账�"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ���������"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should reduce the location's accuracy"
 msgstr "é??ä½? Emapthy ä½?置信æ?¯ç??å??确度"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è??系人头å??ä½?为è??天çª?å?£å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable WebKit Developer Tools"
 msgstr "å?¯ç?¨ WebKit å¼?å??å·¥å?·"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable popup notifications for new messages"
 msgstr "å?¯ç?¨æ?°æ¶?æ?¯å¼¹å?ºæ??示"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable spell checker"
 msgstr "å?¯ç?¨æ?¼å??æ£?æ?¥å?¨"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide main window"
 msgstr "é??è??主çª?å?£"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
 msgid "Hide the main window."
 msgstr "é??è??主çª?å?£ã??"
 
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "��使� NetworkManager"
-
 #: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:27
 msgid "Nick completed character"
 msgstr "�称补��符"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??ç?¬çª?å?£ä¸­æ??å¼?æ?°è??天"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
 msgid "Path of the adium theme to use"
 msgstr "Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
 msgid "Path of the adium theme to use if the theme used for chat is adium."
 msgstr "å¦?æ??è??天使ç?¨ Adium 主é¢?ï¼?使ç?¨ Adium 主é¢?ç??è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for incoming messages"
 msgstr "�������声�"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound for new conversations"
 msgstr "�对����声�"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound for outgoing messages"
 msgstr "å??å?ºæ¶?æ?¯æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when a contact logs in"
 msgstr "è??系人ç?»å½?æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when a contact logs out"
 msgstr "è??系人注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
 msgid "Play a sound when we log in"
 msgstr "�����声�"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
 msgid "Play a sound when we log out"
 msgstr "注é??æ?¶æ?­æ?¾å£°é?³"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
 msgid "Popup notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天çª?å?£ä¸?æ?¯ç?¦ç?¹å??å¼¹å?ºæ¶?æ?¯é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
 msgid "Popup notifications when a contact sign in"
 msgstr "å½?è??系人ç?»å½?æ?¶å¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
 msgid "Popup notifications when a contact sign out"
 msgstr "å½?è??系人注é??æ?¶å¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
 msgid "Salut account is created"
 msgstr "å·²å??建 Salut è´¦æ?·"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
 msgid "Show avatars"
 msgstr "æ?¾ç¤ºå¤´å??"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室æ?¾ç¤ºè??系人å??表"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "å?³é?­ä¸»çª?å?£æ?¶æ?¾ç¤ºæ??示"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
 msgid "Show offline contacts"
 msgstr "æ?¾ç¤ºç¦»çº¿è??系人"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
 msgid "Spell checking languages"
 msgstr "æ?¼å??æ£?æ?¥å?¨è¯­è¨?"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
 msgid "The default folder to save file transfers in."
 msgstr "ä¿?å­?ä¼ é??æ??件ç??é»?认æ??件夹ã??"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é??å??头å??å?¾ç??ç??ç?®å½?ã??"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨äº?å?¨è??天çª?å?£ä¸­æ?¾ç¤ºä¼?è¯?ç??主é¢?ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
 msgid "Use graphical smileys"
 msgstr "使ç?¨è¡¨æ??å?¾æ ?"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥å£°é?³"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
 msgid "Use theme for chat rooms"
 msgstr "为è??天室使ç?¨ä¸»é¢?"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../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:52
+#: ../data/empathy.schemas.in.h:54
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "æ?¯å?¦å??许 Empathy å°?ç?¨æ?·ç??ä½?ç½®å?±äº«ç»?è??系人"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿? GPS ä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿?æ??æ?ºä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "æ?¯å?¦å??许 Empathy é??è¿?ç½?ç»?ä¼°ç®?ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?中导å?¥è´¦æ?·ã??"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr "æ?¯å?¦å?ºäº?é??ç§?å??å? é??ä½? Empathy ä½?置信æ?¯ç??å??确度ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
 
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次è¿?è¡?æ?¶å??建 Salut è´¦æ?·ã??"
-
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
+#, fuzzy
 msgid ""
-"Whether or not the network manager should be used to automatically "
+"Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨ NetworkManager(ç½?ç»?管ç??å?¨) è?ªå?¨æ?­å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次è¿?è¡?æ?¶å??建 Salut è´¦æ?·ã??"
+
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "æ?¯å?¦å¯¹æ?¨æ?³è¦?ä½?æ?¼å??æ£?æ?¥ç??å??è¯?ä½?æ?¼å??æ£?æ?¥ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "对è¯?æ?¶æ?¯å?¦å°?表æ??符å?·è½¬æ?¢ä¸ºç??æ­£ç??å?¾æ ?ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for events."
 msgstr "æ?¯å?¦é??è¦?äº?件æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "æ?¯å?¦é??è¦?æ¶?æ?¯å?°è¾¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "æ?¯å?¦é??è¦?æ?°ä¼?è¯?æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "æ?¯å?¦ä¸ºå¤?å?ºæ¶?æ?¯ä½¿ç?¨è¯­é?³æ??示ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "å½?è??ç½?ç?»å½?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "å½?ç½?ç»?æ?­å¼?æ?¶æ?¯å?¦æ?­æ?¾æ??示é?³ã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦ä½¿ç?¨è¯­é?³é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr "å½?è??系人离线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../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 "å½?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºæ??示å?³è??天çª?å?£å·²å¼?å?¯ï¼?ä½?æ?ªé?²ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "å½?æ?¶å?°æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸­æ?¾ç¤ºå¤´å??ã??"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦æ?¾ç¤ºè??系人æ¸?å??中离线ç??è??系人ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "å½?离å¼?æ´»å¿?ç¢?æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室æ?¾ç¤ºè??系人å??表ã??"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../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â??æ??é?®å?³é?­ä¸»çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "æ?¯å?¦ä»¥ç´§å??æ ¼å¼?æ?¾ç¤ºè??系人å??表ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -404,78 +413,86 @@ msgstr ""
 "使ç?¨ä½?ç§?å??å??æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼\"name\"以æ??è??系人å§?å??\n"
 "æ??åº?ã??å??å?¼ä¸º\"state\"æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1086
+msgid "Can't set an empty display name"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
 msgstr "æ?¥æ?¶å?°ç??æ??件å??å??é??ç??é?£ä¸ªæ??件å??å¸?å?¼ä¸?å?¹é??"
 
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
 msgid "File transfer not supported by remote contact"
 msgstr "æ??ä»¶ä¼ è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
 
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
 msgid "The selected file is not a regular file"
 msgstr "æ??é??æ??件æ?¯é??正常ç??æ??件"
 
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
 msgid "The selected file is empty"
 msgstr "æ??é??æ??件æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
 msgid "Socket type not supported"
 msgstr "ä¸?æ?¯æ??Socketç±»å??"
 
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
 msgid "No reason was specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The change in state was requested"
 msgstr "é??è¦?ç?¶æ??æ?¹å??ä¿¡æ?¯"
 
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
 msgid "You canceled the file transfer"
 msgstr "æ?¨å??æ¶?äº?æ??ä»¶ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
 msgid "The other participant canceled the file transfer"
 msgstr "å?¦å¤?ç??å??ä¸?è??å??æ¶?äº?æ??件ç??ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
 msgid "Error while trying to transfer the file"
 msgstr "å½?ä¼ è¾?è¿?个æ??件ç??æ?¶å??å??ç??é??误"
 
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¦å¤?ç??å??ä¸?è??æ? æ³?ä¼ è¾?è¿?个æ??件"
 
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
 msgid "Available"
 msgstr "�线"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
 msgid "Busy"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
 msgid "Away"
 msgstr "离�"
 
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
 msgid "Hidden"
 msgstr "é??身"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
 msgid "Offline"
 msgstr "离线"
 
+#: ../libempathy/empathy-utils.c:378 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "é??è¿?ç??人"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -516,77 +533,118 @@ msgstr[0] "%d æ??å??"
 msgid "in the future"
 msgstr "å°?æ?¥"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:448
+#: ../libempathy-gtk/empathy-account-widget.c:504
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1224
+msgid "Enabled"
+msgstr "��"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "�级"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "端�(_P)�"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../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 ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "�� I_D�"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Charset:"
 msgstr "å­?符é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
 msgid "New Network"
 msgstr "�建��"
 
@@ -622,84 +680,136 @@ msgstr "å?¨å??ï¼?"
 msgid "Servers"
 msgstr "æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 msgid "Override server settings"
 msgstr "è¦?ç??æ??å?¡å?¨è®¾ç½®"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Pri_ority:"
 msgstr "ä¼?å??级(_O)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Reso_urce:"
 msgstr "��(_U)�"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Use old SS_L"
 msgstr "使ç?¨æ?§ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "_Encryption required (TLS/SSL)"
 msgstr "é??è¦?å? å¯?(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "_Ignore SSL certificate errors"
 msgstr "忽ç?¥ SSL è¯?书é??误(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_Email:"
 msgstr "���件(_E)�"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "å??(_F)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber IDï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
 msgstr "�(_L)�"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
 msgstr "�称(_N)�"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "å?¬å¼?ç??å??å­?(_P)ï¼?"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
+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:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover STUN"
 msgstr "æ??ç´¢ STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN Server:"
 msgstr "STUN æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "STUN port:"
 msgstr "STUN 端��"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Use _Yahoo Japan"
 msgstr "使� _Yahoo ��"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "_Ignore conference and chatroom invitations"
 msgstr "忽ç?¥ä¼?è®®å??è??天室é??请(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??天室å??表 locale(_R)ï¼?"
 
@@ -736,92 +846,98 @@ msgstr "å??å?»ä»¥æ?¾å¤§"
 msgid "Failed to reconnect this chat"
 msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?失败"
 
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:413
 msgid "Unsupported command"
 msgstr "ä¸?æ?¯æ??ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:549
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:552
 msgid "invalid contact"
 msgstr "æ? æ??è??系人"
 
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:555
 msgid "permission denied"
 msgstr "æ??é??ä¸?足"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:558
 msgid "too long message"
 msgstr "��太�"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:561
 msgid "not implemented"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:564
 msgid "unknown"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:568
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:598
 #, c-format
 msgid "Topic set to: %s"
 msgstr "��被设置为�%s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:600
 msgid "No topic defined"
 msgstr "�设置��"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:970
 msgid "(No Suggestions)"
 msgstr "(没æ??建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1024
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-ui-utils.c:1471
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1191
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已����"
 
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1198
 #, c-format
-msgid "%s was kicked by %s"
-msgstr "%s 被 %s 踢�"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s 被 %2$s 踢�"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1201
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
 #, c-format
-msgid "%s was banned by %s"
-msgstr "%s 被 %s �止"
+msgid "%1$s was banned by %2$s"
+msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1212
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1216
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离å¼?äº?è??天室"
@@ -831,42 +947,42 @@ msgstr "%s 离å¼?äº?è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1225
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1248
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
 msgid "Disconnected"
 msgstr "已����"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1817
 msgid "Connected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1867
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "对�"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
 msgid "Topic:"
 msgstr "���"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:266
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:274
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -876,16 +992,16 @@ msgstr "æ??å¼?é?¾æ?¥(_O)"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
 msgid "Edit Contact Information"
 msgstr "ç¼?è¾?è??系人信æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
 msgid "Personal Information"
 msgstr "个人信�"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
 msgid "New Contact"
 msgstr "æ?°å»ºè??系人"
 
@@ -897,27 +1013,27 @@ msgstr "以å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "订é??请æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 msgid "Removing group"
 msgstr "å? é?¤ç¾¤ç»?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 msgid "Removing contact"
 msgstr "å? é?¤è??系人"
 
@@ -958,7 +1074,7 @@ msgid "Infor_mation"
 msgstr "ä¿¡æ?¯(_M)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
@@ -982,120 +1098,120 @@ msgstr "ä¿?å­?头å??"
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å­?头å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
 msgid "Select"
 msgstr "é??æ?©"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
 msgid "Country ISO Code:"
 msgstr "å??æ?¬ ISO ç¼?ç ?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
 msgid "Country:"
 msgstr "�家"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
 msgid "State:"
 msgstr "ç??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
 msgid "City:"
 msgstr "�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
 msgid "Area:"
 msgstr "å?°å?º"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
 msgid "Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
 msgid "Street:"
 msgstr "è¡?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
 msgid "Floor:"
 msgstr "楼��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
 msgid "Error:"
 msgstr "é??误ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´è¯¯å·®(ç±³):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
 msgid "Speed:"
 msgstr "é??度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
 msgid "Bearing:"
 msgstr "æ?¹ä½?æ??å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
 msgid "Last Updated on:"
 msgstr "æ??è¿?æ?´æ?°äº?:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
 msgid "Latitude:"
 msgstr "纬度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
 msgid "<b>Location</b>"
 msgstr "<b>ä½?ç½®</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®</b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y � %R UTC ��"
 
@@ -1127,7 +1243,7 @@ msgid "Client:"
 msgstr "客�端�"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
 msgid "Contact"
 msgstr "è??系人"
 
@@ -1178,24 +1294,24 @@ msgstr "ç½?ç«?ï¼?"
 msgid "_Add Group"
 msgstr "æ·»å? 群ç»?(_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
 msgid "new server"
 msgstr "æ?°å»ºæ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
 msgid "Server"
 msgstr "æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
 msgid "Port"
 msgstr "端�"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
 msgid "SSL"
 msgstr "SSL"
 
 #: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "账�"
 
@@ -1241,34 +1357,34 @@ msgstr "�建对�"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Custom Message..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
 msgid "Edit Custom Messages..."
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
 msgid "Click to remove this status as a favorite"
 msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
 msgid "Click to make this status a favorite"
 msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
 msgid "Set status"
 msgstr "设置ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
 msgid "Set your presence and current status"
 msgstr "è®¾ç½®ä½ ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
 msgid "Custom messages..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
@@ -1328,14 +1444,6 @@ msgstr "æ·»å? æ?°è?ªå®?ä¹?ç?¶æ??(_N)"
 msgid "Saved Presets"
 msgstr "å·²ä¿?å­?ç??è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "ç»?å?¸"
@@ -1352,15 +1460,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1373
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1463
 msgid "Select a file"
 msgstr "é??æ?©æ??件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1523
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
@@ -1548,7 +1656,7 @@ msgid "Megaphone"
 msgstr "��"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
 msgid "Talk!"
 msgstr "说��"
 
@@ -1566,11 +1674,11 @@ msgstr "ä¿¡æ?¯(_I)"
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
 msgid "Please configure a contact."
 msgstr "请é??ç½®ä¸?个è??系人ã??"
 
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
 msgid "Select contact..."
 msgstr "é??æ?©è??系人..."
 
@@ -1579,23 +1687,23 @@ msgid "Presence"
 msgstr "ç?¶æ??"
 
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
 msgid "Set your own presence"
 msgstr "设置æ?¨ç??ç?¶æ??"
 
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
 msgid "Don't connect on startup"
 msgstr "��������"
 
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
 msgid "Don't show the contact list on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
 
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
 msgid "Show the accounts dialog"
 msgstr "�示账�对��"
 
-#: ../src/empathy.c:587
+#: ../src/empathy.c:608
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客�端"
 
@@ -1647,21 +1755,131 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "��"
+#. translators: this is followed by the "while ..." strings some lines
+#. * down this file.
+#.
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error "
+msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "账�"
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:125
+msgid "while importing the accounts."
+msgstr ""
+
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:129
+msgid "while parsing the account details."
+msgstr ""
+
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:133
+msgid "while creating the account."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:151
+#, c-format
+msgid "The error message was: <span style=\"italic\">%s</span>"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:159
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this wizard and add accounts later from the Edit menu."
+msgstr ""
 
+#: ../src/empathy-account-assistant.c:194
+msgid "An error occurred"
+msgstr ""
+
+#. Create account
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-account-assistant.c:330
+#: ../src/empathy-accounts-dialog.c:1094
 #, c-format
 msgid "New %s account"
 msgstr "�建 %s 账�"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:397
+msgid "What kind of chat account do you have?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:403
+#, fuzzy
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "æ??å·²ç»?æ?¥æ??è´¦æ?·ï¼?æ??æ?³ä½¿ç?¨å®?"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Enter your account details"
+msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
+
+#: ../src/empathy-account-assistant.c:414
+#, fuzzy
+msgid "What kind of chat account do you want to create?"
+msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+
+#: ../src/empathy-account-assistant.c:420
+#, fuzzy
+msgid "Do you want to create other chat accounts?"
+msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
+
+#: ../src/empathy-account-assistant.c:427
+msgid "Enter the details for the new account"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:513
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:530
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:553
+msgid "Yes, import my account details from "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:574
+msgid "Yes, I'll enter my account details now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:596
+#, fuzzy
+msgid "No, I want a new account"
+msgstr "å??建æ?°ç??å¸?æ?·(_C)"
+
+#: ../src/empathy-account-assistant.c:606
+msgid "No, I just want to see people online nearby for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:627
+#, fuzzy
+msgid "Select the accounts you want to import:"
+msgstr "é??æ?©æ?¨è¦?é??请ç??人ï¼?"
+
+#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "æ?¯"
+
+#: ../src/empathy-account-assistant.c:721
+msgid "No, that's all for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:914
+msgid "Welcome to Empathy"
+msgstr "欢�使� Empathy"
+
+#: ../src/empathy-account-assistant.c:923
+msgid "Import your existing accounts"
+msgstr "导å?¥ç?°æ??å¸?æ?·"
+
+#: ../src/empathy-accounts-dialog.c:616
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1670,7 +1888,7 @@ msgstr ""
 "æ?¨å°?è¦?å? é?¤æ?¨ç?? %s è´¦æ?·ï¼?\n"
 "æ?¨ç¡®å®?è¦?继续å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:622
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1682,99 +1900,94 @@ msgstr ""
 "\n"
 "å¦?æ??å°?æ?¥æ?¨é??æ?°æ·»å? 此账æ?·ï¼?å®?们å°?ä»?ç?¶å­?å?¨ã??"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "账�"
+
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "æ·»å? å¸?æ?·"
+msgid "Add new"
+msgstr ""
 
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
 msgstr "å??建(_E)"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "导�账�..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol installed"
 msgstr "å°?æ?ªå®?è£?å??è®®"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "设置"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../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:9
-msgid "Type:"
-msgstr "ç±»å??ï¼?"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Add..."
 msgstr "æ·»å? (_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Create a new account"
 msgstr "å??建æ?°ç??å¸?æ?·(_C)"
 
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid "_Reuse an existing account"
 msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
 
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "账�"
+
+#: ../src/empathy-call-window.c:426
 msgid "Contrast"
 msgstr "对�度"
 
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
 msgid "Connecting..."
 msgstr "正���..."
 
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
 msgid "_Sidebar"
 msgstr "侧边æ ?(_S)"
 
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
 msgid "Audio input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
 msgid "Video input"
 msgstr "����"
 
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
 #, c-format
 msgid "Call with %s"
 msgstr "ä¸? %s é??è¯?"
 
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
@@ -1807,15 +2020,75 @@ msgstr "é??è¯?(_C)"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
 #, c-format
 msgid "Conversations (%d)"
 msgstr "对� (%d)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "��(_L)"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "è??天"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "æ??å?¥è¡¨æ??(_M)"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "左移æ ?ç­¾(_L)"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "å?³ç§»æ ?ç­¾(_R)"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "è??系人(_C)"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "å??容(_C)"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "对�(_C)"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "æ¼?移æ ?ç­¾(_D)"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "æ?¶è??è??天室(_F)"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "帮�(_H)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "ä¸?ä¸?æ ?ç­¾(_N)"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "ä¸?ä¸?æ ?ç­¾(_P)"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "æ?¾ç¤ºè??系人å??表(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "æ ?ç­¾(_T)"
+
 #: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "å??称"
@@ -1832,75 +2105,75 @@ msgstr "����"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??è??天室æ?¶è??"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
 msgid "Incoming call"
 msgstr "��"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
 msgid "_Reject"
 msgstr "æ??ç»?(_R)"
 
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å??é??é??请ç»?æ?¨"
 
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
 msgid "An external application will be started to handle it."
 msgstr "å°?å?¯å?¨ä¸?个å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
 msgid "You don't have the needed external application to handle it."
 msgstr "æ?¨æ²¡æ??å¿?é??ç??å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
 msgid "Room invitation"
 msgstr "è??天室é??请"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??请æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??ä»¶ä¼ è¾?"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ç??订é??请æ±?"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
 #, c-format
 msgid ""
 "\n"
@@ -1910,13 +2183,13 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
 #, c-format
 msgid "%s is now offline."
 msgstr "%s å½?å??离线ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
 #, c-format
 msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
@@ -2032,90 +2305,95 @@ msgstr "æ??ä»¶ä¼ è¾?"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "ä»?å??表移é?¤å·²å®?æ??ã??å·²å??æ¶?å??已失败ç??æ??ä»¶ä¼ è¾?"
 
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "æ?ªæ?¾å?°å?¯å¯¼å?¥ç??è´¦æ?·ã??Empathy ç?®å??å?ªè?½æ?¯æ??ä»? Pidgin 导å?¥è´¦æ?·ã??"
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "导�账�"
+
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "导�"
 
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "å??è®®"
 
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "�"
 
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "æ?ªæ?¾å?°å?¯å¯¼å?¥ç??è´¦æ?·ã??Empathy ç?®å??å?ªè?½æ?¯æ??ä»? Pidgin 导å?¥è´¦æ?·ã??"
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "导�账�"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s 账�"
 
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
 msgid "_Edit account"
 msgstr "��账�(_E)"
 
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
 msgid "No error specified"
 msgstr "没æ??说æ??é??误"
 
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
 msgid "Network error"
 msgstr "ç½?ç»?é??误"
 
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
 msgid "Authentication failed"
 msgstr "��失败"
 
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
 msgid "Encryption error"
 msgstr "å? å¯?é??误"
 
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
 
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?书"
 
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
 msgid "Certificate expired"
 msgstr "è¯?书已è¿?æ??"
 
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
 msgid "Certificate not activated"
 msgstr "�书���活"
 
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
 msgid "Certificate hostname mismatch"
 msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?书æ??纹ä¸?å?¹é??"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
 msgid "Certificate self-signed"
 msgstr "è¯?书æ?¯è?ªç­¾å±?ç??"
 
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
 msgid "Certificate error"
 msgstr "è¯?书é??误"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
 msgid "Unknown error"
 msgstr "æ?ªç?¥ç??é??误"
 
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -2163,10 +2441,6 @@ msgstr "账�(_A)"
 msgid "_Compact Size"
 msgstr "ç´§å??è§?å?¾(_C)"
 
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "å??容(_C)"
-
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Debug"
 msgstr "��(_D)"
@@ -2175,10 +2449,6 @@ msgstr "��(_D)"
 msgid "_File Transfers"
 msgstr "æ??ä»¶ä¼ è¾?(_F)"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "帮�(_H)"
-
 #: ../src/empathy-main-window.ui.h:19
 msgid "_Join..."
 msgstr "å? å?¥(_J)..."
@@ -2203,15 +2473,15 @@ msgstr "æ??è¿?ä¼?è¯?(_P)"
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
 msgid "Members"
 msgstr "æ??å??"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2227,21 +2497,16 @@ msgstr ""
 "é??è¦?é??请ï¼?%s\n"
 "æ??å??ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "æ?¯"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
 msgid "Could not start room listing"
 msgstr "æ? æ³?å¼?å§?è??天室å??表"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
 msgid "Could not stop room listing"
 msgstr "æ? æ³?å??æ­¢è??天室å??表"
 
@@ -2272,35 +2537,35 @@ msgstr "è??天室å??表"
 msgid "_Room:"
 msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
 msgid "Message received"
 msgstr "�����"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
 msgid "Message sent"
 msgstr "å??å?ºäº?æ¶?æ?¯"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
 msgid "New conversation"
 msgstr "�对�"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes online"
 msgstr "离线人�线"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
 msgid "Contact goes offline"
 msgstr "è??系人离线"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
 msgid "Account connected"
 msgstr "账�已��"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
 msgid "Account disconnected"
 msgstr "账�已��"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
 msgid "Language"
 msgstr "语�"
 
@@ -2385,10 +2650,11 @@ msgid "Privacy"
 msgstr "é??ç§?"
 
 #: ../src/empathy-preferences.ui.h:21
+#, fuzzy
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 "é??ä½?ä½?置精度æ??å?³ç??ä½ å?¬å¼?ç??å??å¸?ã??å·?å??å?½å®¶ä¿¡æ?¯ä¸?å?¨ç²¾ç¡®ã?? GPS 座æ ?ä¼?æ??ä¸?个é??æ?ºæ?°"
 "å? å?¥ (&#xB1;0.25&#xB0;) ã??"
@@ -2447,93 +2713,109 @@ msgstr "ç?¶æ??"
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "æ?¾ç¤ºè??系人å??表(_S)"
-
-#: ../src/empathy-tube-dispatch.c:375
+#: ../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:446
+#: ../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-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
 msgid "Error"
 msgstr "é??误"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
 msgid "Critical"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
+#: ../src/empathy-debug-dialog.c:1109
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-dialog.c:841
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-dialog.c:944
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-dialog.c:1017
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-dialog.c:1029
 msgid "Level "
 msgstr "级� "
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-dialog.c:1098
 msgid "Time"
 msgstr "��"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-dialog.c:1100
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-dialog.c:1102
 msgid "Category"
 msgstr "类�"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-dialog.c:1104
 msgid "Level"
 msgstr "级�"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-dialog.c:1136
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "æ·»å? å¸?æ?·"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "导�账�..."
+
+#~ msgid "Settings"
+#~ msgstr "设置"
+
+#~ msgid "Type:"
+#~ msgstr "ç±»å??ï¼?"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
 #~ msgid "Empathy Instant Messenger"
 #~ msgstr "Empathy å?³æ?¶é??讯ç¨?åº?"
 
@@ -2630,57 +2912,15 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "<b>Settings</b>"
 #~ msgstr "<b>设置</b>"
 
-#~ msgid "I already have an account I want to use"
-#~ msgstr "æ??å·²ç»?æ?¥æ??è´¦æ?·ï¼?æ??æ?³ä½¿ç?¨å®?"
-
-#~ msgid "C_lear"
-#~ msgstr "��(_L)"
-
-#~ msgid "Chat"
-#~ msgstr "è??天"
-
-#~ msgid "Insert _Smiley"
-#~ msgstr "æ??å?¥è¡¨æ??(_M)"
-
 #~ msgid "Invitation _message:"
 #~ msgstr "é??请æ¶?æ?¯(_M)ï¼?"
 
 #~ msgid "Invite"
 #~ msgstr "é??请"
 
-#~ msgid "Move Tab _Left"
-#~ msgstr "左移æ ?ç­¾(_L)"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "å?³ç§»æ ?ç­¾(_R)"
-
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "é??æ?©æ?¨è¦?é??请ç??人ï¼?"
-
 #~ msgid "You have been invited to join a chat conference."
 #~ msgstr "æ?¨è¢«é??请å? å?¥ä¸?个è??天ä¼?è®®ã??"
 
-#~ msgid "_Contact"
-#~ msgstr "è??系人(_C)"
-
-#~ msgid "_Conversation"
-#~ msgstr "对�(_C)"
-
-#~ msgid "_Detach Tab"
-#~ msgstr "æ¼?移æ ?ç­¾(_D)"
-
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "æ?¶è??è??天室(_F)"
-
-#~ msgid "_Next Tab"
-#~ msgstr "ä¸?ä¸?æ ?ç­¾(_N)"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "ä¸?ä¸?æ ?ç­¾(_P)"
-
-#~ msgid "_Tabs"
-#~ msgstr "æ ?ç­¾(_T)"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ç¼?è¾?è??天室æ?¶è??"