[empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Wed, 23 Feb 2011 11:28:57 +0000 (UTC)
commit 5ac753af160f7184594b74aa0b61e73e8fb3d5a7
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Wed Feb 23 19:28:48 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  349 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po |  349 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 358 insertions(+), 340 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4c74a8d..0eaf097 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.91.6\n"
+"Project-Id-Version: empathy 2.91.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 19:38+0800\n"
-"PO-Revision-Date: 2011-02-14 19:38+0800\n"
+"POT-Creation-Date: 2011-02-23 19:27+0800\n"
+"PO-Revision-Date: 2011-02-23 19:28+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -368,7 +368,7 @@ msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
-msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??å¤©è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
+msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ (å?³ä½¿å·²é??å??è??å¤©è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?)ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
@@ -422,7 +422,7 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2215
+#: ../src/empathy-accounts-dialog.c:2229
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
@@ -673,7 +673,7 @@ msgid "All"
 msgstr "å?¨é?¨"
 
 #: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-log-window.c:653
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "å¸³è??"
@@ -698,56 +698,56 @@ msgstr "é?£æ?¥å? "
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1152
+#: ../libempathy-gtk/empathy-account-widget.c:1163
 #, c-format
 msgid "The account %s is edited via My Web Accounts."
 msgstr "%s å¸³è??å·²é??é??æ??ç??ç¶²çµ¡å¸³è??ä¿®æ?¹ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1158
+#: ../libempathy-gtk/empathy-account-widget.c:1169
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s å¸³è??ç?¡æ³?æ?¼ Empathy å?§ä¿®æ?¹ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1178
+#: ../libempathy-gtk/empathy-account-widget.c:1189
 msgid "Launch My Web Accounts"
 msgstr "å??å??æ??ç??ç¶²çµ¡å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1516
+#: ../libempathy-gtk/empathy-account-widget.c:1527
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1883
+#: ../libempathy-gtk/empathy-account-widget.c:1894
 msgid "A_pply"
 msgstr "å¥?ç?¨(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1913
+#: ../libempathy-gtk/empathy-account-widget.c:1924
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1979
+#: ../libempathy-gtk/empathy-account-widget.c:1990
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:451
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-individual-widget.c:1479
 #: ../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:1990
+#: ../libempathy-gtk/empathy-account-widget.c:2001
 msgid "_Enabled"
 msgstr "å·²å??ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2055
+#: ../libempathy-gtk/empathy-account-widget.c:2066
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2058
+#: ../libempathy-gtk/empathy-account-widget.c:2069
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2250
+#: ../libempathy-gtk/empathy-account-widget.c:2261
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -756,25 +756,25 @@ msgstr "å??æ¶?(_N)"
 #. * like: "MyUserName on freenode".
 #. * 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:2547
+#: ../libempathy-gtk/empathy-account-widget.c:2558
 #, c-format
 msgid "%1$s on %2$s"
-msgstr "%2$s ç?? %1$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:2573
+#: ../libempathy-gtk/empathy-account-widget.c:2584
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2577
+#: ../libempathy-gtk/empathy-account-widget.c:2588
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??ç¨±"
+msgstr "<b>ç¯?ä¾?ï¼?</b>MyScreenName"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -804,36 +804,47 @@ msgstr "å¯?ç¢¼(_W)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "Remember Password"
 msgstr "è¨?ä½?å¯?ç¢¼"
 
+#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "è¨?ä½?å¯?ç¢¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "è?¢å¹?å??ç¨±(_N)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "ä½ ç?? AIM å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ä½ ç?? AIM è?¢å¹?å??ç¨±æ?¯ï¼?"
 
-#: ../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:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P)ï¼?"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P)ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S)ï¼?"
@@ -841,7 +852,7 @@ msgstr "ä¼ºæ??å?¨(_S)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "<b>Example:</b> username"
-msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
+msgstr "<b>ç¯?ä¾?ï¼?</b>username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
@@ -849,17 +860,17 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
 msgid "Login I_D:"
 msgstr "ç?»å?¥ I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "ä½ ç?? GroupWise ä½¿ç?¨è?? ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "ä½ ç?? GroupWise å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
-msgstr "<b>ç¯?ä¾?ï¼?</b> 123456789"
+msgstr "<b>ç¯?ä¾?ï¼?</b>123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -870,11 +881,11 @@ msgstr "å?é??(_A)ï¼?"
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "ä½ ç?? ICQ UIN æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "ä½ ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 
@@ -953,11 +964,11 @@ msgstr "å?ªå?? IRC ç¶²çµ¡ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user gmail com"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user gmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<b>Example:</b> user jabber org"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user jabber org"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 msgid "Encr_yption required (TLS/SSL)"
@@ -975,12 +986,12 @@ msgstr "è¦?è??ä¼ºæ??å?¨è¨å®?å?¼"
 msgid "Priori_ty:"
 msgstr "å?ªå??æ¬?(_T)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "è³?æº?(_U)ï¼?"
 
 #. 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:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -991,51 +1002,51 @@ msgstr ""
 "å¦?æ??ä½ æ?¯ facebook.com/<b>badger</b> ç??è©±ï¼?è«?è¼¸å?¥ <b>badger</b>ã??\n"
 "å¦?æ??ä½ é??æ²?æ?? Facebook ä½¿ç?¨è??å??ç¨±ï¼?è«?ä½¿ç?¨ <a href=\"http://www.facebook.com/username/\";>æ¤ç¶²é ?</a> ä¾?é?¸ç?¨ä¸?å??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "ä½ ç?? Facebook å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "ä½ ç?? Facebook ä½¿ç?¨è??å??ç¨±æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "ä½ ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "ä½ ç?? Google å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "ä½ ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "ä½ ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "ä½ æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "ä½ æ?³è¦?ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user hotmail com"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user hotmail com"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "ä½ ç?? Windows Live ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "ä½ ç?? Windows Live å¯?ç¢¼æ?¯ï¼?"
 
@@ -1053,7 +1064,7 @@ msgstr "å??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgstr "_Jabber IDï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1065,7 +1076,7 @@ msgstr "ç?¼å¸?ç??å??ç¨±(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user my sip server"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Authentication username:"
@@ -1111,27 +1122,27 @@ msgstr "é?£æ?¥å? ï¼?"
 msgid "Proxy Options"
 msgstr "Proxy é?¸é ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "STUN ä¼ºæ??å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Server:"
 msgstr "ä¼ºæ??å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Transport:"
 msgstr "å?³é??é??è¨?å? ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "What is your SIP account password?"
 msgstr "ä½ ç?? SIP å¸³è??å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP login ID?"
 msgstr "ä½ æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 
@@ -1139,25 +1150,19 @@ msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 msgid "I_gnore conference and chat room invitations"
 msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_G)"
 
-#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#: ../libempathy-gtk/empathy-password-dialog.c:302
-msgid "Remember password"
-msgstr "è¨?ä½?å¯?ç¢¼"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! ID?"
 msgstr "ä½ ç?? Yahoo! ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "ä½ ç?? Yahoo! å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D:"
+msgstr "Yahoo I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤æ¸?å?®å?°å??è³?è¨?(_R)ï¼?"
 
@@ -1204,7 +1209,7 @@ msgstr "ä½ ä¸?è¢«å??è¨±æ?´æ?¹é??å??ä¸»é¡?"
 
 #: ../libempathy-gtk/empathy-chat.c:842
 msgid "/clear: clear all messages from the current conversation"
-msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
+msgstr "/clearï¼?æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
 #: ../libempathy-gtk/empathy-chat.c:845
 msgid "/topic <topic>: set the topic of the current conversation"
@@ -1212,11 +1217,11 @@ msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
 #: ../libempathy-gtk/empathy-chat.c:848
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
+msgstr "/join <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:851
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
+msgstr "/j <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:856
 msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1239,7 +1244,7 @@ msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
-msgstr "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??å¤©å®¤ã??"
+msgstr "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å??å? æ?°ç??è??å¤©å®¤ã??"
 
 #: ../libempathy-gtk/empathy-chat.c:874
 msgid ""
@@ -1289,7 +1294,7 @@ msgstr "ä¸?æ??"
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:711
+#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:704
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
@@ -1310,14 +1315,14 @@ msgstr "(æ²?æ??å»ºè°)"
 #: ../libempathy-gtk/empathy-chat.c:1854
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr "å? å?¥ã??%sã??è?³è¾å?¸"
+msgstr "å? å?¥ã??%sã??è?³å?å?¸"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
 #: ../libempathy-gtk/empathy-chat.c:1891
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr "å? å?¥ã??%sã??è?³ %s è¾å?¸"
+msgstr "å? å?¥ã??%sã??è?³ %s å?å?¸"
 
 #: ../libempathy-gtk/empathy-chat.c:1950
 msgid "Insert Smiley"
@@ -1387,7 +1392,7 @@ msgstr " (%s)"
 #: ../libempathy-gtk/empathy-chat.c:2257
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
+msgstr "%s å·²ç¶?å??å? æ¤è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:2282
 #, c-format
@@ -1401,41 +1406,41 @@ msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3048
+#: ../libempathy-gtk/empathy-chat.c:3051
 msgid "Would you like to store this password?"
 msgstr "ä½ æ?³è¦?å?²å?æ¤å¯?ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3054
+#: ../libempathy-gtk/empathy-chat.c:3057
 msgid "Remember"
 msgstr "è¨?ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:3064
+#: ../libempathy-gtk/empathy-chat.c:3067
 msgid "Not now"
 msgstr "ç?¾å?¨ä¸?è¦?"
 
-#: ../libempathy-gtk/empathy-chat.c:3108
+#: ../libempathy-gtk/empathy-chat.c:3111
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:3112
+#: ../libempathy-gtk/empathy-chat.c:3115
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3229
+#: ../libempathy-gtk/empathy-chat.c:3232
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3256
+#: ../libempathy-gtk/empathy-chat.c:3259
 msgid "Join"
-msgstr "å? å?¥"
+msgstr "å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:3426 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3429 ../src/empathy-event-manager.c:1144
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
-#: ../libempathy-gtk/empathy-log-window.c:657
+#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Conversation"
 msgstr "è«?è©±"
 
@@ -1473,7 +1478,7 @@ msgstr "æ?°å¢?è?¯çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
-msgstr "ç¨?å¾?å??æ±ºå®?"
+msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
@@ -1487,34 +1492,34 @@ msgstr "æ?ªç¾£çµ?"
 msgid "Favorite People"
 msgstr "å??å¥½ç??äºº"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2296
+#: ../libempathy-gtk/empathy-contact-list-view.c:2012
+#: ../libempathy-gtk/empathy-individual-view.c:2309
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2299
+#: ../libempathy-gtk/empathy-contact-list-view.c:2014
+#: ../libempathy-gtk/empathy-individual-view.c:2312
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾£çµ?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-contact-list-view.c:2144
-#: ../libempathy-gtk/empathy-individual-view.c:2354
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2063
+#: ../libempathy-gtk/empathy-contact-list-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2367
+#: ../libempathy-gtk/empathy-individual-view.c:2514
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2097
-#: ../libempathy-gtk/empathy-individual-view.c:2404
+#: ../libempathy-gtk/empathy-contact-list-view.c:2093
+#: ../libempathy-gtk/empathy-individual-view.c:2417
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2099
-#: ../libempathy-gtk/empathy-individual-view.c:2420
+#: ../libempathy-gtk/empathy-contact-list-view.c:2095
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤è?¯çµ¡äºº"
 
@@ -1558,9 +1563,9 @@ msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1684
+#: ../libempathy-gtk/empathy-contact-widget.c:1681
 #: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1380
+#: ../libempathy-gtk/empathy-individual-widget.c:1370
 msgid "Favorite"
 msgstr "å??å¥½"
 
@@ -1576,7 +1581,7 @@ msgstr "ç·¨è¼¯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:548
 #: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:923
+#: ../src/empathy-chat-window.c:916
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??å¤©å®¤"
 
@@ -1760,20 +1765,20 @@ msgstr "ä½?ç½®"
 #: ../libempathy-gtk/empathy-individual-widget.c:634
 #, c-format
 msgid "%s, %s"
-msgstr "%sã??%s"
+msgstr "%sï¼?%s"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:904
 #: ../libempathy-gtk/empathy-individual-widget.c:683
 msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e, %Y æ?¼ %R UTC"
+msgstr "%Y %B %e æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:987
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:986
+#: ../libempathy-gtk/empathy-individual-widget.c:918
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1043
-#: ../libempathy-gtk/empathy-individual-widget.c:983
+#: ../libempathy-gtk/empathy-contact-widget.c:1042
+#: ../libempathy-gtk/empathy-individual-widget.c:976
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1783,7 +1788,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1315
+#: ../libempathy-gtk/empathy-individual-widget.c:1305
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1803,7 +1808,7 @@ msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1519
+#: ../libempathy-gtk/empathy-individual-widget.c:1509
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
@@ -1814,7 +1819,7 @@ msgstr "è³?è¨?å·²è«?æ±?â?¦"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
-msgstr "OS:"
+msgstr "OSï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "Version:"
@@ -1881,14 +1886,14 @@ msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "é?£çµ?è?¯çµ¡äºº(_L)â?¦"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2412
+#: ../libempathy-gtk/empathy-individual-view.c:2425
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr "ä½ ç??ç??æ?³è¦?ç§»é?¤é?£çµ?è?¯çµ¡äººã??%sã??å??ï¼?è«?æ³¨æ??é??æ??ç§»é?¤æ??æ??æ§?æ??æ¤é?£çµ?è?¯çµ¡ç¾£ç??è?¯çµ¡äººã??"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1660
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -1902,15 +1907,19 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 msgid "Online from a phone or mobile device"
 msgstr "å¾?æ??æ©?æ??æµ?å??é??è¨?å?¨æ??ä¸?ç·?"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "æ?°å¢?ç¶²çµ¡"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC ç¶²çµ¡"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "é??è¨ç¶²çµ¡æ¸?å?®(_N)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "é?¸å??"
@@ -1964,7 +1973,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:667
+#: ../libempathy-gtk/empathy-log-window.c:670
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -2026,7 +2035,7 @@ msgstr "é??è©±(_A)"
 msgid "New Call"
 msgstr "æ?°å¢?é??è©±"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:267
+#: ../libempathy-gtk/empathy-password-dialog.c:274
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2251,7 +2260,7 @@ msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "ç?®å??ç??å?°å??è³?è¨?è¨å®?"
+msgstr "ç?®å??ç??å?°å??è³?è¨?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2690,16 +2699,16 @@ msgstr ""
 "ä½ å?³å°?å»ºç«?æ?°ç??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1133
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?ç§»é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1123
+#: ../src/empathy-accounts-dialog.c:1137
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??ç§»é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1361
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2708,15 +2717,15 @@ msgstr ""
 "ä½ æ??å??ç??æ?´æ?¹ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1557
+#: ../src/empathy-accounts-dialog.c:1571
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1558
+#: ../src/empathy-accounts-dialog.c:1572
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2059
+#: ../src/empathy-accounts-dialog.c:2073
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3004,31 +3013,31 @@ msgstr "é??è©±(_C)"
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../src/empathy-chat-window.c:476 ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:481
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:504
+#: ../src/empathy-chat-window.c:497
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?äººç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:513
+#: ../src/empathy-chat-window.c:506
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??äººç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:715
+#: ../src/empathy-chat-window.c:708
 msgid "Typing a message."
 msgstr "æ£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3167,12 +3176,12 @@ msgstr "è??å¤©é??è«?"
 #: ../src/empathy-event-manager.c:739
 #, c-format
 msgid "Invitation to join %s"
-msgstr "é??è«?å? å?¥ %s"
+msgstr "é??è«?å??å?  %s"
 
 #: ../src/empathy-event-manager.c:746
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s æ£å?¨é??è«?ä½ å? å?¥ %s"
+msgstr "%s æ£å?¨é??è«?ä½ å??å?  %s"
 
 #: ../src/empathy-event-manager.c:754
 msgid "_Decline"
@@ -3181,17 +3190,17 @@ msgstr "æ??çµ?(_D)"
 #: ../src/empathy-event-manager.c:759
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
-msgstr "å? å?¥(_J)"
+msgstr "å??å? (_J)"
 
 #: ../src/empathy-event-manager.c:786
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
+msgstr "%s æ?¾é??è«?ä½ å??å?  %s"
 
 #: ../src/empathy-event-manager.c:792
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "ä½ è¢«é??è«?å? å?¥ %s"
+msgstr "ä½ è¢«é??è«?å??å?  %s"
 
 #: ../src/empathy-event-manager.c:843
 #, c-format
@@ -3396,7 +3405,7 @@ msgstr "æ?¼è?¯çµ¡äººæ¸?å?®å?§å°?æ?¾(_L)"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
-msgstr "å? å?¥å??å¥½(_F)"
+msgstr "å??å? å??å¥½(_F)"
 
 #: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
@@ -3448,7 +3457,7 @@ msgstr "æª?æ¡?å?³è¼¸(_F)"
 
 #: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
-msgstr "å? å?¥(_J)â?¦"
+msgstr "å??å? (_J)â?¦"
 
 #: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
@@ -3513,7 +3522,7 @@ msgstr "ç?¡æ³?è¼?å?¥è??å¤©å®¤æ¸?å?®"
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "å?¨é??è£?è¼¸å?¥è¦?å? å?¥ç??è??å¤©å®¤å??ç¨±æ??å¾?æ¸?å?®ä¸é»?é?¸ä¸?æ??å¤?å??è??å¤©å®¤ã??"
+msgstr "å?¨é??è£?è¼¸å?¥è¦?å??å? ç??è??å¤©å®¤å??ç¨±æ??å¾?æ¸?å?®ä¸é»?é?¸ä¸?æ??å¤?å??è??å¤©å®¤ã??"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
@@ -3523,7 +3532,7 @@ msgstr "è¼¸å?¥æ¤è??å¤©å®¤æ??å?¨ç??ä¼ºæ??å?¨ï¼?æ??è??ç?¶è©²è??å¤©å®¤ä½?æ?¼ç?®å??
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
-msgstr "å? å?¥è??å¤©å®¤"
+msgstr "å??å? è??å¤©å®¤"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
@@ -3711,67 +3720,67 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-map-view.c:453
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??æª¢è¦?"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "å?²å?"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "å?µé?¯è¦?çª?"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1474
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1486
 msgid "Level "
 msgstr "ç?ç´?"
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1506
 msgid "Debug"
 msgstr "å?µé?¯"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1512
 msgid "Info"
 msgstr "è³?è¨?"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1524
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1530
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1536
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1555
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1558
 msgid "Domain"
 msgstr "ç¶²å??"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1560
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1562
 msgid "Level"
 msgstr "ç?ç´?"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1599
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3790,28 +3799,28 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?è©±ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:178
+#: ../src/empathy-accounts.c:179
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ (ä¾?ï¼?å?¯å?¥) ä¸¦é?¢é??"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:187
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "å??å§?é?¸å??æ??çµ¦äº?ç??å¸³è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:189
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "- Empathy Accounts"
 msgstr "- Empathy å¸³è??"
 
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:233
 msgid "Empathy Accounts"
 msgstr "Empathy å¸³è??"
 
@@ -3819,7 +3828,7 @@ msgstr "Empathy å¸³è??"
 msgid "Empathy Debugger"
 msgstr "Empathy é?¤é?¯ç¨?å¼?"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
 msgstr "- Empathy è??å¤©ç?¨æ?¶ç«¯"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 02e33f9..a059880 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.91.6\n"
+"Project-Id-Version: empathy 2.91.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-14 19:38+0800\n"
-"PO-Revision-Date: 2011-02-12 15:21+0800\n"
+"POT-Creation-Date: 2011-02-23 19:27+0800\n"
+"PO-Revision-Date: 2011-02-18 16:24+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -368,7 +368,7 @@ msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
-msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??å¤©è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
+msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ (å?³ä½¿å·²é??å??è??å¤©è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?)ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
@@ -424,7 +424,7 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2215
+#: ../src/empathy-accounts-dialog.c:2229
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
@@ -675,7 +675,7 @@ msgid "All"
 msgstr "å?¨é?¨"
 
 #: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-log-window.c:653
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "å¸³è??"
@@ -700,56 +700,56 @@ msgstr "é?£æ?¥å? "
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1152
+#: ../libempathy-gtk/empathy-account-widget.c:1163
 #, c-format
 msgid "The account %s is edited via My Web Accounts."
 msgstr "%s å¸³è??å·²é??é??æ??ç??ç¶²è·¯å¸³è??ä¿®æ?¹ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1158
+#: ../libempathy-gtk/empathy-account-widget.c:1169
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s å¸³è??ç?¡æ³?æ?¼ Empathy å?§ä¿®æ?¹ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1178
+#: ../libempathy-gtk/empathy-account-widget.c:1189
 msgid "Launch My Web Accounts"
 msgstr "å??å??æ??ç??ç¶²è·¯å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1516
+#: ../libempathy-gtk/empathy-account-widget.c:1527
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1883
+#: ../libempathy-gtk/empathy-account-widget.c:1894
 msgid "A_pply"
 msgstr "å¥?ç?¨(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1913
+#: ../libempathy-gtk/empathy-account-widget.c:1924
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1979
+#: ../libempathy-gtk/empathy-account-widget.c:1990
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:451
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
+#: ../libempathy-gtk/empathy-individual-widget.c:1479
 #: ../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:1990
+#: ../libempathy-gtk/empathy-account-widget.c:2001
 msgid "_Enabled"
 msgstr "å·²å??ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2055
+#: ../libempathy-gtk/empathy-account-widget.c:2066
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2058
+#: ../libempathy-gtk/empathy-account-widget.c:2069
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2250
+#: ../libempathy-gtk/empathy-account-widget.c:2261
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -758,25 +758,25 @@ msgstr "å??æ¶?(_N)"
 #. * like: "MyUserName on freenode".
 #. * 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:2547
+#: ../libempathy-gtk/empathy-account-widget.c:2558
 #, c-format
 msgid "%1$s on %2$s"
-msgstr "%2$s ç?? %1$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:2573
+#: ../libempathy-gtk/empathy-account-widget.c:2584
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2577
+#: ../libempathy-gtk/empathy-account-widget.c:2588
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??ç¨±"
+msgstr "<b>ç¯?ä¾?ï¼?</b>MyScreenName"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -806,36 +806,47 @@ msgstr "å¯?ç¢¼(_W)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "Remember Password"
 msgstr "è¨?ä½?å¯?ç¢¼"
 
+#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "è¨?ä½?å¯?ç¢¼"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "è?¢å¹?å??ç¨±(_N)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "æ?¨ç?? AIM å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "æ?¨ç?? AIM è?¢å¹?å??ç¨±æ?¯ï¼?"
 
-#: ../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:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Port:"
-msgstr "é?£æ?¥å? (_P)ï¼?"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "_Port:"
+msgstr "é?£æ?¥å? (_P)ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "ä¼ºæ??å?¨(_S)ï¼?"
@@ -843,7 +854,7 @@ msgstr "ä¼ºæ??å?¨(_S)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "<b>Example:</b> username"
-msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
+msgstr "<b>ç¯?ä¾?ï¼?</b>username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
@@ -851,17 +862,17 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
 msgid "Login I_D:"
 msgstr "ç?»å?¥ I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "æ?¨ç?? GroupWise ä½¿ç?¨è?? ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "æ?¨ç?? GroupWise å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<b>Example:</b> 123456789"
-msgstr "<b>ç¯?ä¾?ï¼?</b> 123456789"
+msgstr "<b>ç¯?ä¾?ï¼?</b>123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -872,11 +883,11 @@ msgstr "å?é??(_A)ï¼?"
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "æ?¨ç?? ICQ UIN æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "æ?¨ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 
@@ -955,11 +966,11 @@ msgstr "å?ªå?? IRC ç¶²è·¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user gmail com"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user gmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<b>Example:</b> user jabber org"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user jabber org"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 msgid "Encr_yption required (TLS/SSL)"
@@ -977,12 +988,12 @@ msgstr "è¦?è??ä¼ºæ??å?¨è¨å®?å?¼"
 msgid "Priori_ty:"
 msgstr "å?ªå??æ¬?(_T)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "è³?æº?(_U)ï¼?"
 
 #. 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:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -994,51 +1005,51 @@ msgstr ""
 "å¦?æ??æ?¨é??æ²?æ?? Facebook ä½¿ç?¨è??å??ç¨±ï¼?è«?ä½¿ç?¨ <a href=\"http://www.facebook.com/";
 "username/\">æ¤ç¶²é ?</a> ä¾?é?¸ç?¨ä¸?å??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "æ?¨ç?? Facebook å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "æ?¨ç?? Facebook ä½¿ç?¨è??å??ç¨±æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "æ?¨ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "æ?¨ç?? Google å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "æ?¨ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "æ?¨ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user hotmail com"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user hotmail com"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "æ?¨ç?? Windows Live ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "æ?¨ç?? Windows Live å¯?ç¢¼æ?¯ï¼?"
 
@@ -1056,7 +1067,7 @@ msgstr "å??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgstr "_Jabber IDï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1068,7 +1079,7 @@ msgstr "ç?¼å¸?ç??å??ç¨±(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
-msgstr "<b>ç¯?ä¾?ï¼?</b> user my sip server"
+msgstr "<b>ç¯?ä¾?ï¼?</b>user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Authentication username:"
@@ -1114,27 +1125,27 @@ msgstr "é?£æ?¥å? ï¼?"
 msgid "Proxy Options"
 msgstr "Proxy é?¸é ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "STUN ä¼ºæ??å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Server:"
 msgstr "ä¼ºæ??å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Transport:"
 msgstr "å?³é??é??è¨?å? ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP å¸³è??å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP login ID?"
 msgstr "æ?¨æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 
@@ -1142,25 +1153,19 @@ msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 msgid "I_gnore conference and chat room invitations"
 msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_G)"
 
-#. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#: ../libempathy-gtk/empathy-password-dialog.c:302
-msgid "Remember password"
-msgstr "è¨?ä½?å¯?ç¢¼"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! ID?"
 msgstr "æ?¨ç?? Yahoo! ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "æ?¨ç?? Yahoo! å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D:"
+msgstr "Yahoo I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤æ¸?å?®å?°å??è³?è¨?(_R)ï¼?"
 
@@ -1207,7 +1212,7 @@ msgstr "æ?¨ä¸?è¢«å??è¨±è®?æ?´é??å??ä¸»é¡?"
 
 #: ../libempathy-gtk/empathy-chat.c:842
 msgid "/clear: clear all messages from the current conversation"
-msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
+msgstr "/clearï¼?æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
 #: ../libempathy-gtk/empathy-chat.c:845
 msgid "/topic <topic>: set the topic of the current conversation"
@@ -1215,11 +1220,11 @@ msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
 #: ../libempathy-gtk/empathy-chat.c:848
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
+msgstr "/join <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:851
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
+msgstr "/j <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:856
 msgid "/query <contact ID> [<message>]: open a private chat"
@@ -1244,7 +1249,7 @@ msgid ""
 "join a new chat room\""
 msgstr ""
 "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?"
-"èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??å¤©å®¤ã??"
+"èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å??å? æ?°ç??è??å¤©å®¤ã??"
 
 #: ../libempathy-gtk/empathy-chat.c:874
 msgid ""
@@ -1296,7 +1301,7 @@ msgstr "ä¸?æ??"
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:711
+#: ../libempathy-gtk/empathy-chat.c:1273 ../src/empathy-chat-window.c:704
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
@@ -1317,14 +1322,14 @@ msgstr "(æ²?æ??å»ºè°)"
 #: ../libempathy-gtk/empathy-chat.c:1854
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr "å? å?¥ã??%sã??è?³è¾å?¸"
+msgstr "å? å?¥ã??%sã??è?³å?å?¸"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
 #: ../libempathy-gtk/empathy-chat.c:1891
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr "å? å?¥ã??%sã??è?³ %s è¾å?¸"
+msgstr "å? å?¥ã??%sã??è?³ %s å?å?¸"
 
 #: ../libempathy-gtk/empathy-chat.c:1950
 msgid "Insert Smiley"
@@ -1394,7 +1399,7 @@ msgstr " (%s)"
 #: ../libempathy-gtk/empathy-chat.c:2257
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
+msgstr "%s å·²ç¶?å??å? æ¤è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-chat.c:2282
 #, c-format
@@ -1408,41 +1413,41 @@ msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3048
+#: ../libempathy-gtk/empathy-chat.c:3051
 msgid "Would you like to store this password?"
 msgstr "æ?¨æ?³è¦?å?²å?æ¤å¯?ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3054
+#: ../libempathy-gtk/empathy-chat.c:3057
 msgid "Remember"
 msgstr "è¨?ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:3064
+#: ../libempathy-gtk/empathy-chat.c:3067
 msgid "Not now"
 msgstr "ç?¾å?¨ä¸?è¦?"
 
-#: ../libempathy-gtk/empathy-chat.c:3108
+#: ../libempathy-gtk/empathy-chat.c:3111
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:3112
+#: ../libempathy-gtk/empathy-chat.c:3115
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3229
+#: ../libempathy-gtk/empathy-chat.c:3232
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3256
+#: ../libempathy-gtk/empathy-chat.c:3259
 msgid "Join"
-msgstr "å? å?¥"
+msgstr "å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:3426 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3429 ../src/empathy-event-manager.c:1144
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
-#: ../libempathy-gtk/empathy-log-window.c:657
+#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Conversation"
 msgstr "è«?è©±"
 
@@ -1480,7 +1485,7 @@ msgstr "æ?°å¢?é?£çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
-msgstr "ç¨?å¾?å??æ±ºå®?"
+msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
@@ -1494,34 +1499,34 @@ msgstr "æ?ªç¾¤çµ?"
 msgid "Favorite People"
 msgstr "å??å¥½ç??äºº"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2296
+#: ../libempathy-gtk/empathy-contact-list-view.c:2012
+#: ../libempathy-gtk/empathy-individual-view.c:2309
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2299
+#: ../libempathy-gtk/empathy-contact-list-view.c:2014
+#: ../libempathy-gtk/empathy-individual-view.c:2312
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾¤çµ?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-contact-list-view.c:2144
-#: ../libempathy-gtk/empathy-individual-view.c:2354
-#: ../libempathy-gtk/empathy-individual-view.c:2501
+#: ../libempathy-gtk/empathy-contact-list-view.c:2063
+#: ../libempathy-gtk/empathy-contact-list-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2367
+#: ../libempathy-gtk/empathy-individual-view.c:2514
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2097
-#: ../libempathy-gtk/empathy-individual-view.c:2404
+#: ../libempathy-gtk/empathy-contact-list-view.c:2093
+#: ../libempathy-gtk/empathy-individual-view.c:2417
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2099
-#: ../libempathy-gtk/empathy-individual-view.c:2420
+#: ../libempathy-gtk/empathy-contact-list-view.c:2095
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤é?£çµ¡äºº"
 
@@ -1565,9 +1570,9 @@ msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../libempathy-gtk/empathy-contact-widget.c:1684
+#: ../libempathy-gtk/empathy-contact-widget.c:1681
 #: ../libempathy-gtk/empathy-individual-menu.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:1380
+#: ../libempathy-gtk/empathy-individual-widget.c:1370
 msgid "Favorite"
 msgstr "å??å¥½"
 
@@ -1583,7 +1588,7 @@ msgstr "ç·¨è¼¯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:548
 #: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:923
+#: ../src/empathy-chat-window.c:916
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??å¤©å®¤"
 
@@ -1767,20 +1772,20 @@ msgstr "ä½?ç½®"
 #: ../libempathy-gtk/empathy-individual-widget.c:634
 #, c-format
 msgid "%s, %s"
-msgstr "%sã??%s"
+msgstr "%sï¼?%s"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:904
 #: ../libempathy-gtk/empathy-individual-widget.c:683
 msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e, %Y æ?¼ %R UTC"
+msgstr "%Y %B %e æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:987
-#: ../libempathy-gtk/empathy-individual-widget.c:925
+#: ../libempathy-gtk/empathy-contact-widget.c:986
+#: ../libempathy-gtk/empathy-individual-widget.c:918
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1043
-#: ../libempathy-gtk/empathy-individual-widget.c:983
+#: ../libempathy-gtk/empathy-contact-widget.c:1042
+#: ../libempathy-gtk/empathy-individual-widget.c:976
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1790,7 +1795,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1315
+#: ../libempathy-gtk/empathy-individual-widget.c:1305
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1810,7 +1815,7 @@ msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1519
+#: ../libempathy-gtk/empathy-individual-widget.c:1509
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
@@ -1821,7 +1826,7 @@ msgstr "è³?è¨?å·²è«?æ±?â?¦"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
-msgstr "OS:"
+msgstr "OSï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "Version:"
@@ -1889,7 +1894,7 @@ msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "é?£çµ?è?¯çµ¡äºº(_L)â?¦"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2412
+#: ../libempathy-gtk/empathy-individual-view.c:2425
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1898,7 +1903,7 @@ msgstr ""
 "æ?¨ç??ç??æ?³è¦?ç§»é?¤é?£çµ?è?¯çµ¡äººã??%sã??å??ï¼?è«?æ³¨æ??é??æ??ç§»é?¤æ??æ??æ§?æ??æ¤é?£çµ?è?¯çµ¡ç¾¤ç??è?¯çµ¡"
 "äººã??"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1660
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -1912,15 +1917,19 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 msgid "Online from a phone or mobile device"
 msgstr "å¾?æ??æ©?æ??è¡?å??è£?ç½®ä¸?ç·?"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "æ?°å¢?ç¶²è·¯"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC ç¶²è·¯"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "é??è¨ç¶²è·¯æ¸?å?®(_N)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "é?¸å??"
@@ -1975,7 +1984,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:667
+#: ../libempathy-gtk/empathy-log-window.c:670
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -2037,7 +2046,7 @@ msgstr "é??è©±(_A)"
 msgid "New Call"
 msgstr "æ?°å¢?é??è©±"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:267
+#: ../libempathy-gtk/empathy-password-dialog.c:274
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2262,7 +2271,7 @@ msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "ç?®å??ç??å?°å??è³?è¨?è¨å®?"
+msgstr "ç?®å??ç??å?°å??è³?è¨?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2720,16 +2729,16 @@ msgstr ""
 "æ?¨å?³å°?å»ºç«?æ?°ç??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1133
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?ç§»é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1123
+#: ../src/empathy-accounts-dialog.c:1137
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??ç§»é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1361
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2738,15 +2747,15 @@ msgstr ""
 "æ?¨æ??å??ç??è®?æ?´ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1557
+#: ../src/empathy-accounts-dialog.c:1571
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1558
+#: ../src/empathy-accounts-dialog.c:1572
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2059
+#: ../src/empathy-accounts-dialog.c:2073
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3036,31 +3045,31 @@ msgstr "é??è©±(_C)"
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
-#: ../src/empathy-chat-window.c:476 ../src/empathy-chat-window.c:496
+#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:481
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:504
+#: ../src/empathy-chat-window.c:497
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?äººç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:513
+#: ../src/empathy-chat-window.c:506
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??äººç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:715
+#: ../src/empathy-chat-window.c:708
 msgid "Typing a message."
 msgstr "æ£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3199,12 +3208,12 @@ msgstr "è??å¤©é??è«?"
 #: ../src/empathy-event-manager.c:739
 #, c-format
 msgid "Invitation to join %s"
-msgstr "é??è«?å? å?¥ %s"
+msgstr "é??è«?å??å?  %s"
 
 #: ../src/empathy-event-manager.c:746
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s æ£å?¨é??è«?æ?¨å? å?¥ %s"
+msgstr "%s æ£å?¨é??è«?æ?¨å??å?  %s"
 
 #: ../src/empathy-event-manager.c:754
 msgid "_Decline"
@@ -3213,17 +3222,17 @@ msgstr "æ??çµ?(_D)"
 #: ../src/empathy-event-manager.c:759
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
-msgstr "å? å?¥(_J)"
+msgstr "å??å? (_J)"
 
 #: ../src/empathy-event-manager.c:786
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
+msgstr "%s æ?¾é??è«?æ?¨å??å?  %s"
 
 #: ../src/empathy-event-manager.c:792
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "æ?¨è¢«é??è«?å? å?¥ %s"
+msgstr "æ?¨è¢«é??è«?å??å?  %s"
 
 #: ../src/empathy-event-manager.c:843
 #, c-format
@@ -3428,7 +3437,7 @@ msgstr "æ?¼é?£çµ¡äººæ¸?å?®å?§å°?æ?¾(_L)"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
-msgstr "å? å?¥å??å¥½(_F)"
+msgstr "å??å? å??å¥½(_F)"
 
 #: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
@@ -3480,7 +3489,7 @@ msgstr "æª?æ¡?å?³è¼¸(_F)"
 
 #: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
-msgstr "å? å?¥(_J)â?¦"
+msgstr "å??å? (_J)â?¦"
 
 #: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
@@ -3545,7 +3554,7 @@ msgstr "ç?¡æ³?è¼?å?¥è??å¤©å®¤æ¸?å?®"
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "å?¨é??è£¡è¼¸å?¥è¦?å? å?¥ç??è??å¤©å®¤å??ç¨±æ??å¾?æ¸?å?®ä¸é»?é?¸ä¸?æ??å¤?å??è??å¤©å®¤ã??"
+msgstr "å?¨é??è£¡è¼¸å?¥è¦?å??å? ç??è??å¤©å®¤å??ç¨±æ??å¾?æ¸?å?®ä¸é»?é?¸ä¸?æ??å¤?å??è??å¤©å®¤ã??"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
@@ -3556,7 +3565,7 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
-msgstr "å? å?¥è??å¤©å®¤"
+msgstr "å??å? è??å¤©å®¤"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Room List"
@@ -3746,67 +3755,67 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-map-view.c:453
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??æª¢è¦?"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "å?²å?"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "å?µé?¯è¦?çª?"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1474
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1486
 msgid "Level "
 msgstr "ç?ç´?"
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1506
 msgid "Debug"
 msgstr "å?µé?¯"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1512
 msgid "Info"
 msgstr "è³?è¨?"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1524
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1530
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1536
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1555
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1558
 msgid "Domain"
 msgstr "ç¶²å??"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1560
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1562
 msgid "Level"
 msgstr "ç?ç´?"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1599
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3825,28 +3834,28 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?è©±ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:178
+#: ../src/empathy-accounts.c:179
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ (ä¾?ï¼?å?¯å?¥) ä¸¦é?¢é??"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:187
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "å??å§?é?¸å??æ??çµ¦äº?ç??å¸³è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:189
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:194
 msgid "- Empathy Accounts"
 msgstr "- Empathy å¸³è??"
 
-#: ../src/empathy-accounts.c:232
+#: ../src/empathy-accounts.c:233
 msgid "Empathy Accounts"
 msgstr "Empathy å¸³è??"
 
@@ -3854,7 +3863,7 @@ msgstr "Empathy å¸³è??"
 msgid "Empathy Debugger"
 msgstr "Empathy é?¤é?¯ç¨?å¼?"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:107
 msgid "- Empathy Chat Client"
 msgstr "- Empathy è??å¤©ç?¨æ?¶ç«¯"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]