[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: Sun, 5 Sep 2010 11:52:22 +0000 (UTC)
commit 937fccd2cefd59d7216a4cf931136460f913d2ff
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sun Sep 5 19:52:14 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  711 ++++++++++++++++++++++++++++++++++++-----------------------
 po/zh_TW.po |  711 ++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 870 insertions(+), 552 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2a49cd6..45643cc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.90\n"
+"Project-Id-Version: empathy 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 20:02+0800\n"
-"PO-Revision-Date: 2010-08-23 20:02+0800\n"
+"POT-Creation-Date: 2010-09-05 19:51+0800\n"
+"PO-Revision-Date: 2010-09-05 19:51+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr "ä½¿ç?¨ Google Talkã??Facebookã??MSNï¼?è??å?¶ä»?è??å¤©æ??å??å??ä»?äººå°?è©±"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "ä½¿ç?¨ Google Talkã??Facebookã??MSN è??å?¶ä»?è??å¤©æ??å??å??ä»?äººå°?è©±"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -83,9 +83,9 @@ msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶ã??å¦?æ??ä¸?å??ç?¨ç??è©±ï¼?æ?¶å?°äº?ä»¶æ??ç?´æ?¥é¡¯ç¤ºçµ¦ä½¿ç?¨è??ç??ã??"
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶ã??å¦?æ??ä¸?å??ç?¨ç??è©±ï¼?æ?¶å?°äº?ä»¶æ??ç?´æ?¥å??ç?¾çµ¦ä½¿ç?¨è??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
@@ -292,7 +292,8 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??å¸³è??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??æ¨¡å¼?ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
@@ -428,7 +429,7 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2151
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
@@ -611,18 +612,18 @@ msgstr "è?æ?¸ä½¿ç?¨ä¸?å®?å?¨ç??å¯?ç¢¼æ¼?ç®?æ³?ï¼?æ??æ?¯å¯?ç¢¼è??ç??ä¸?è¼?å¼±"
 #: ../libempathy/empathy-utils.c:376
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
-msgstr "ä¼ºæ??å?¨è?æ?¸ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨è?æ?¸é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??é??å?¶ã??"
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "ä¼ºæ??å?¨è?æ?¸ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨è?æ?¸é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??ç¯?å??"
 
-#: ../libempathy/empathy-utils.c:529
+#: ../libempathy/empathy-utils.c:540
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:545
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:546
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -670,60 +671,92 @@ msgstr "æ?ªä¾?"
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "å¸³è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+#, fuzzy
+#| msgid "Password:"
+msgid "Password"
+msgstr "å¯?ç¢¼ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "ä¼ºæ??å?¨"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "é?£æ?¥å? "
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1137
+#: ../libempathy-gtk/empathy-account-widget.c:1192
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1480
+#: ../libempathy-gtk/empathy-account-widget.c:1522
+msgid "A_pply"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1552
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1548
+#: ../libempathy-gtk/empathy-account-widget.c:1618
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1390
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
 #: ../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:1559
-msgid "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1629
+#, fuzzy
+#| msgid "Enabled"
+msgid "_Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1624
+#: ../libempathy-gtk/empathy-account-widget.c:1694
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1627
+#: ../libempathy-gtk/empathy-account-widget.c:1697
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1790
+msgid "Ca_ncel"
+msgstr ""
+
 #. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * 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:1996
+#: ../libempathy-gtk/empathy-account-widget.c:2078
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ç?? %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2104
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2026
+#: ../libempathy-gtk/empathy-account-widget.c:2108
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
@@ -745,11 +778,11 @@ msgstr "é?²é??"
 
 #: ../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:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W)ï¼?"
 
@@ -790,7 +823,7 @@ msgid "<b>Example:</b> username"
 msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "ç?»å?¥ I_Dï¼?"
@@ -808,26 +841,24 @@ msgid "<b>Example:</b> 123456789"
 msgstr "<b>ç¯?ä¾?ï¼?</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+#| msgid "Character set:"
+msgid "Ch_aracter set:"
+msgstr "å?é??ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ UIN?"
 msgstr "ä½ ç?? ICQ UIN æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 msgid "What is your ICQ password?"
 msgstr "ä½ ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "å?é??(_C)ï¼?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:246
-msgid "New Network"
-msgstr "æ?°å¢?ç¶²çµ¡"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.c:183
 #: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
@@ -893,6 +924,14 @@ msgstr "ç??å¯¦å§?å??ï¼?"
 msgid "Servers"
 msgstr "ä¼ºæ??å?¨"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "ä½ ç?? IRC ç¶²å??æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "å?ªå?? IRC ç¶²çµ¡ï¼?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user gmail com"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
@@ -901,20 +940,34 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
 msgid "<b>Example:</b> user jabber org"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user jabber org"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+#| msgid "_Encryption required (TLS/SSL)"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+#| msgid "_Ignore SSL certificate errors"
+msgid "I_gnore SSL certificate errors"
+msgstr "å¿½ç?¥ SSL è?æ?¸é?¯èª¤(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "è¦?è??ä¼ºæ??å?¨è¨å®?å?¼"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#, fuzzy
+#| msgid "Pri_ority:"
+msgid "Priori_ty:"
 msgstr "å?ªå??æ¬?(_O)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -925,50 +978,42 @@ 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:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Facebook password?"
 msgstr "ä½ ç?? Facebook å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Facebook username?"
 msgstr "ä½ ç?? Facebook ä½¿ç?¨è??å??ç¨±æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Google ID?"
 msgstr "ä½ ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Google password?"
 msgstr "ä½ ç?? Google å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Jabber ID?"
 msgstr "ä½ ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Jabber password?"
 msgstr "ä½ ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your desired Jabber ID?"
 msgstr "ä½ æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your desired Jabber password?"
 msgstr "ä½ æ?³è¦?ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "å¿½ç?¥ SSL è?æ?¸é?¯èª¤(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user hotmail com"
@@ -982,25 +1027,29 @@ msgid "What is your Windows Live password?"
 msgstr "ä½ ç?? Windows Live å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "é?»å?é?µä»¶ä½?å??(_E)ï¼?"
+#, fuzzy
+#| msgid "E-mail address:"
+msgid "E-_mail address:"
+msgstr "é?»å?ä¿¡ç®±ä½?å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nic_kname:"
+msgstr "ç¶²å??ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "å??(_F)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "å§?(_L)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "ç¶²å??(_N)ï¼?"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??ç¨±(_P)ï¼?"
@@ -1078,25 +1127,27 @@ msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#, fuzzy
+#| msgid "_Ignore conference and chat room invitations"
+msgid "I_gnore conference and chat room invitations"
+msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "Use _Yahoo! Japan"
 msgstr "ä½¿ç?¨ Yahoo! æ?¥æ?¬(_Y)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "ä½ ç?? Yahoo! ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../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:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤æ¸?å?®å?°å??(_R)ï¼?"
@@ -1130,141 +1181,141 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?è¢«å??è¨±æ?´æ?¹é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ç¶²å??>ï¼?æ?´æ?¹å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??ä½ ç??ç¶²å??"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
 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 æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??å¤©å®¤ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<å?½ä»¤>]ï¼?é¡¯ç¤ºæ??æ??æ?¯æ?´ç??æ??ä»¤ã??å¦?æ??æ??å®?ç¾©é??å?? <å?½ä»¤> ç??è©±ï¼?ä¾¿é¡¯ç¤ºå®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
 #: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1272,12 +1323,12 @@ msgstr "%s å·²æ?·ç·?"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?ºå?»"
 
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1285,17 +1336,17 @@ msgstr "%s è¢«è¸¢å?º"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1305,46 +1356,46 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
 #: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "è«?è©±"
@@ -1368,7 +1419,7 @@ msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:288
 msgid "Edit Contact Information"
 msgstr "ç·¨è¼¯è?¯çµ¡äººè³?è¨?"
 
@@ -1390,85 +1441,84 @@ msgid "Subscription Request"
 msgstr "è¨?é?±è¦?æ±?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾£çµ?ã??%sã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2086
+#: ../libempathy-gtk/empathy-individual-view.c:2235
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾£çµ?"
 
 #. Remove
 #: ../libempathy-gtk/empathy-contact-list-view.c:2055
 #: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2225
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2171
+#: ../libempathy-gtk/empathy-individual-view.c:2320
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2173
+#: ../libempathy-gtk/empathy-individual-view.c:2322
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤è?¯çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ?°å¢?è?¯çµ¡äºº(_A)â?¦"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:463
+#: ../libempathy-gtk/empathy-individual-menu.c:514
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:504
+#: ../libempathy-gtk/empathy-individual-menu.c:557
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??è©±(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:546
+#: ../libempathy-gtk/empathy-individual-menu.c:599
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??è©±(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:604
+#: ../libempathy-gtk/empathy-individual-menu.c:642
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../libempathy-gtk/empathy-individual-menu.c:683
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:725
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1537
-#: ../libempathy-gtk/empathy-individual-menu.c:721
-#: ../libempathy-gtk/empathy-individual-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
 msgstr "å??å¥½"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:748
+#: ../libempathy-gtk/empathy-individual-menu.c:786
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
@@ -1478,13 +1528,13 @@ msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:970
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:981
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
@@ -1518,148 +1568,152 @@ msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "å??å®¶ ISO ç¢¼ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "å??å®¶ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "å·?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "å¸?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "å»ºç¯?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "æ¨?å±¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "å®¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "æ??å?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URIï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "æº?ç¢ºåº¦ç?ç´?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "é?¯èª¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ç±³)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (ç±³)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "æ?¹ä½?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "ä¸?æ¬¡æ?´æ?°æ?¼ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "ç¶?åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "ç·¯åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "ç·¯åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:594
-msgid "<b>Location</b>, "
-msgstr "<b>ä½?ç½®<b>ï¼?"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:832
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:894
-#: ../libempathy-gtk/empathy-individual-widget.c:890
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1669,7 +1723,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1218
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1689,7 +1743,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:1419
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
@@ -1721,48 +1775,58 @@ msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
 msgid "Select"
 msgstr "é?¸æ??"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1231
+#: ../src/empathy-main-window.c:1247
 msgid "Group"
 msgstr "ç¾£çµ?"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:302
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
 msgid "Linked Contacts"
 msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:252
+#: ../libempathy-gtk/empathy-individual-linker.c:354
 msgid "Select contacts to link"
 msgstr "é?¸å??è¦?é?£çµ?ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:303
+#: ../libempathy-gtk/empathy-individual-linker.c:428
 msgid "New contact preview"
 msgstr "æ?°å¢?è?¯çµ¡äººé ?è¦½"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:108
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo jabber org) and the second is one
+#. * of the user's account IDs (e.g. me hotmail com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:799
+#: ../libempathy-gtk/empathy-individual-menu.c:837
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:829
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
 msgctxt "Link individual (contextual menu)"
 msgid "_Linkâ?¦"
 msgstr "é?£çµ?(_L)â?¦"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1772,36 +1836,39 @@ msgstr[0] "å¾?è¨è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "æ?°å¢?ç¶²çµ¡"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#, fuzzy
+#| msgid "Which IRC network?"
+msgid "Choose an IRC network"
+msgstr "å?ªå?? IRC ç¶²çµ¡ï¼?"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "ä¼ºæ??å?¨"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "é?£æ?¥å? "
-
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:109
 msgid "Link Contacts"
 msgstr "é?£çµ?è?¯çµ¡äºº"
 
 #. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
 msgid "_Link"
 msgstr "é?£çµ?(_L)"
 
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "å¸³è??"
-
 #: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "æ?¥æ??"
@@ -1812,11 +1879,11 @@ msgid "Conversations"
 msgstr "è«?è©±"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Find next"
+msgid "Find Next"
 msgstr "å°?æ?¾ä¸?ä¸?å??"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "Find previous"
+msgid "Find Previous"
 msgstr "å°?æ?¾ä¸?ä¸?å??"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
@@ -1983,6 +2050,76 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "å°?è©±ä¼ºæ??å?¨æ??æ??ä¾?ç??è?å?¥èº«å??ç?¡æ³?é??é??é©?è?ã??\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certrificate is not signed by a Certification Authority"
+msgstr "è?æ?¸ä¸¦é??ç?±è?æ?¸æ??æ¬?ä¸å¿?æ??ç°½ç½²"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "è?æ?¸å·²é?¾æ??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "è?æ?¸å°?æ?ªå??ç?¨"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "è?æ?¸ä¸¦æ?ªæ??æ??é ?æ??ç??æ??ç´?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "è?æ?¸æ??é©?è?ç??ä¸»æ©?å??ç¨±è??ä¼ºæ??å?¨å??ç¨±ä¸?ç¬¦"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "è?æ?¸ç?ºè?ªæ??ç°½ç½²"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "è?æ?¸å·²è¢«å??æ?¬ç?¼å?ºç??è?æ?¸æ??æ¬?æ©?æ§?æ?¤é?·"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "è?æ?¸æ?¼å¯?ç¢¼é?²è·ä¸?è¼?å¼±"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "è?æ?¸é?·åº¦è¶?å?ºå?¯é©?è?ç??ç¯?å??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "è?æ?¸æ ¼å¼?ä¸?è?¯"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "é ?æ??ç??è?æ?¸ä¸»æ©?å??ç¨±ï¼?%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "è?æ?¸ä¸»æ©?å??ç¨±ï¼?%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "ç¹¼çº?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "æ¤é?£ç·?æ?ªå??ä¿¡ä»»ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?ç¹¼çº?å??ï¼?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "è«?è¨?ä½?æ¤é?¸æ??ä»¥ä¾?æ?ªä¾?é?£ç·?ä½¿ç?¨"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "è?æ?¸è©³ç´°è³?æ??"
+
 #: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
@@ -2175,8 +2312,7 @@ msgstr "æ??é?¸ç??è?¯çµ¡äººå·²ç¶?é?¢ç·?ã??"
 msgid "No error message"
 msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
@@ -2259,7 +2395,7 @@ msgid ""
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??æ¬¡è¼¸å?¥å¸³è??ç??è©³ç´°è³?æ??æ??çµ?æ??æ¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??ç·¨è¼¯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1311
+#: ../src/empathy-account-assistant.c:1310
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2268,36 +2404,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:604
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s å¸³è??"
 
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:509
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??å¤©å¸³è??æ?¯å?ªä¸?ç¨®ï¼?"
 
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:515
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?è¨å®?å?¶ä»?ç??è??å¤©å¸³è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:521
 msgid "Enter your account details"
 msgstr "è«?è¼¸å?¥ä½ ç??å¸³è??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?å»ºç«?ä½?ç¨®è??å¤©å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:532
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?å»ºç«?å?¶ä»?è??å¤©å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:539
 msgid "Enter the details for the new account"
 msgstr "è«?è¼¸å?¥æ?°å¸³è??ç??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:654
 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 "
@@ -2305,41 +2441,41 @@ msgid ""
 "calls."
 msgstr "ä½¿ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é??è¿?ç??äººè??å¤©ï¼?æ??æ?¯å??ä½¿ç?¨ Google Talkã??AIMã??Windows Live ç?å?¶ä»?è??å¤©ç¨?å¼?ç??æ??å??å??å??äº?è??å¤©ã??å?©ç?¨éº¥å??é¢¨æ??ç¶²çµ¡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??è©±ã??"
 
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:671
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??ä½¿ç?¨å?¶ä»?è??å¤©ç¨?å¼?ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:694
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??å¸³è??è©³ç´°è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:715
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?è¼¸å?¥å¸³è??ç??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:737
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:747
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??èª°ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:768
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:859
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??æ¨£"
 
-#: ../src/empathy-account-assistant.c:1125
+#: ../src/empathy-account-assistant.c:1124
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2347,16 +2483,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢è??ä½ é?£ç·?å?°ç?¸å??ç¶²çµ¡ä¸?ç??äººå??ï¼?ä¸¦ä¸?å??ä»?å??è??å¤©ã??å¦?æ??ä½ æ?³è¦?ä½¿ç?¨æ¤å??è?½ï¼?è«?æª¢æ?¥ä¸?å??è©³ç´°è³?æ??æ?¯å?¦æ£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯ç?¨ã??å¸³è??ã??å°?è©±çª?ä¾?å??ç?¨æ¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1131
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
 msgid "Edit->Accounts"
 msgstr "ç·¨è¼¯ -> å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1146
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1183
+#: ../src/empathy-account-assistant.c:1182
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2364,23 +2500,23 @@ msgid ""
 "the Accounts dialog"
 msgstr "ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?ç¶²çµ¡ç??äººå??è??å¤©ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??å¦?æ??ä½ æ?³è¦?å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1189
+#: ../src/empathy-account-assistant.c:1188
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut å°?æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1234
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1269
+#: ../src/empathy-account-assistant.c:1268
 msgid "Welcome to Empathy"
 msgstr "æ¡è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1277
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1296
+#: ../src/empathy-account-assistant.c:1295
 msgid "Please enter personal details"
 msgstr "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2397,33 +2533,33 @@ msgstr "æ??è??ä½ ç?? %s å¸³è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
 msgid "Connectingâ?¦"
 msgstr "é?£ç·?ä¸â?¦"
 
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²çµ¡é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? å¸³è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:805
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2431,16 +2567,16 @@ msgstr ""
 "ä½ å?³å°?å»ºç«?æ?°ç??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1152
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?ç§»é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1156
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??ç§»é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1394
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2448,7 +2584,7 @@ msgstr ""
 "ä½ å?³å°?å»ºç«?å?¦ä¸?å??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:1997
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2457,28 +2593,40 @@ msgstr ""
 "ä½ æ??å??ç??æ?´æ?¹ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "æ£å?¨è¼?å?¥å¸³è??è³?è¨?"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "No protocol installed"
 msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Protocol:"
 msgstr "å??å®?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 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:4
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Addâ?¦"
 msgstr "å? å?¥(_A)â?¦"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Importâ?¦"
 msgstr "å?¯å?¥(_I)â?¦"
 
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr "- Empathy èª?è?ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy èª?è?ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "é??è¿?ç??äºº"
 
@@ -3076,32 +3224,31 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
+#: ../src/empathy-main-window.c:383
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:535
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:541
 msgid "Edit Account"
 msgstr "ç·¨è¼¯å¸³è??"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:547
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1213
+#: ../src/empathy-main-window.c:1229
 msgid "Contact"
 msgstr "è?¯çµ¡äºº"
 
-#: ../src/empathy-main-window.c:1538
+#: ../src/empathy-main-window.c:1554
 msgid "Contact List"
 msgstr "è?¯çµ¡äººæ¸?å?®"
 
-#: ../src/empathy-main-window.c:1647
+#: ../src/empathy-main-window.c:1663
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3195,29 +3342,29 @@ msgstr "æ??å?¡"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
+"%s\n"
 "é??è¦?é??è«?ï¼?%s\n"
 "é??è¦?å¯?ç¢¼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??å¤©å®¤æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ¢å??å?ºè??å¤©å®¤æ¸?å?®"
 
@@ -3530,8 +3677,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ï¼?ä¾?ï¼?å?¯å?¥ï¼?ä¸¦é?¢é??"
 
 #: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "å¦?æ??æ??ä»»ä½?é?? salut ç??å¸³è??ï¼?å°±ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "å¦?æ??æ??ä»»ä½?é?? Salut ç??å¸³è??ï¼?å°±ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?"
 
 #: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -3553,6 +3700,18 @@ msgstr "Empathy å¸³è??"
 msgid "Empathy Debugger"
 msgstr "Empathy é?¤é?¯ç¨?å¼?"
 
+#~ msgid "_Character set:"
+#~ msgstr "å?é??(_C)ï¼?"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "é?»å?é?µä»¶ä½?å??(_E)ï¼?"
+
+#~ msgid "_Nickname:"
+#~ msgstr "æ?±ç¨±(_N)ï¼?"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>ä½?ç½®<b>ï¼?"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "å?³é??è??æ?¥æ?¶è¨?æ?¯"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 19b2236..152c3d9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.90\n"
+"Project-Id-Version: empathy 2.31.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 20:02+0800\n"
-"PO-Revision-Date: 2010-08-22 12:43+0800\n"
+"POT-Creation-Date: 2010-09-05 19:51+0800\n"
+"PO-Revision-Date: 2010-08-29 09:54+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr "ä½¿ç?¨ Google Talkã??Facebookã??MSNï¼?è??å?¶ä»?è??å¤©æ??å??å??ä»?äººå°?è©±"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "ä½¿ç?¨ Google Talkã??Facebookã??MSN è??å?¶ä»?è??å¤©æ??å??å??ä»?äººå°?è©±"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
@@ -83,9 +83,9 @@ msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶ã??å¦?æ??ä¸?å??ç?¨ç??è©±ï¼?æ?¶å?°äº?ä»¶æ??ç?´æ?¥é¡¯ç¤ºçµ¦ä½¿ç?¨è??ç??ã??"
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "å?¨ç??æ??å??å??é¡¯ç¤ºæ?¶å?°äº?ä»¶ã??å¦?æ??ä¸?å??ç?¨ç??è©±ï¼?æ?¶å?°äº?ä»¶æ??ç?´æ?¥å??ç?¾çµ¦ä½¿ç?¨è??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
@@ -292,7 +292,8 @@ msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??å¸³è??ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??æ¨¡å¼?ã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
@@ -430,7 +431,7 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2151
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
@@ -613,18 +614,18 @@ msgstr "æ??è?ä½¿ç?¨ä¸?å®?å?¨ç??å¯?ç¢¼æ¼?ç®?æ³?ï¼?æ??æ?¯å¯?ç¢¼è??ç??ä¸?è¼?å¼±"
 #: ../libempathy/empathy-utils.c:376
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
-"chain exceed the limits imposed by the crypto library"
-msgstr "ä¼ºæ??å?¨æ??è?ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨æ??è?é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??é??å?¶ã??"
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "ä¼ºæ??å?¨æ??è?ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨æ??è?é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??ç¯?å??"
 
-#: ../libempathy/empathy-utils.c:529
+#: ../libempathy/empathy-utils.c:540
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:545
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:546
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -672,60 +673,92 @@ msgstr "æ?ªä¾?"
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:606
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "å¸³è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+#, fuzzy
+#| msgid "Password:"
+msgid "Password"
+msgstr "å¯?ç¢¼ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "ä¼ºæ??å?¨"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "é?£æ?¥å? "
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1137
+#: ../libempathy-gtk/empathy-account-widget.c:1192
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1480
+#: ../libempathy-gtk/empathy-account-widget.c:1522
+msgid "A_pply"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:1552
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1548
+#: ../libempathy-gtk/empathy-account-widget.c:1618
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1390
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
 #: ../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:1559
-msgid "Enabled"
+#: ../libempathy-gtk/empathy-account-widget.c:1629
+#, fuzzy
+#| msgid "Enabled"
+msgid "_Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1624
+#: ../libempathy-gtk/empathy-account-widget.c:1694
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1627
+#: ../libempathy-gtk/empathy-account-widget.c:1697
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1790
+msgid "Ca_ncel"
+msgstr ""
+
 #. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * 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:1996
+#: ../libempathy-gtk/empathy-account-widget.c:2078
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ç?? %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2104
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2026
+#: ../libempathy-gtk/empathy-account-widget.c:2108
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
@@ -747,11 +780,11 @@ msgstr "é?²é??"
 
 #: ../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:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "å¯?ç¢¼(_W)ï¼?"
 
@@ -792,7 +825,7 @@ msgid "<b>Example:</b> username"
 msgstr "<b>ç¯?ä¾?ï¼?</b> ä½¿ç?¨è??å??ç¨±"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "ç?»å?¥ I_Dï¼?"
@@ -810,26 +843,24 @@ msgid "<b>Example:</b> 123456789"
 msgstr "<b>ç¯?ä¾?ï¼?</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#, fuzzy
+#| msgid "Character set:"
+msgid "Ch_aracter set:"
+msgstr "å?é??ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ UIN?"
 msgstr "æ?¨ç?? ICQ UIN æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 msgid "What is your ICQ password?"
 msgstr "æ?¨ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "å?é??(_C)ï¼?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:246
-msgid "New Network"
-msgstr "æ?°å¢?ç¶²è·¯"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.c:183
 #: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
@@ -895,6 +926,14 @@ msgstr "ç??å¯¦å§?å??ï¼?"
 msgid "Servers"
 msgstr "ä¼ºæ??å?¨"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "æ?¨ç?? IRC æ?±ç¨±æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "å?ªå?? IRC ç¶²è·¯ï¼?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
 msgid "<b>Example:</b> user gmail com"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
@@ -903,20 +942,34 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> user gmail com"
 msgid "<b>Example:</b> user jabber org"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user jabber org"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#, fuzzy
+#| msgid "_Encryption required (TLS/SSL)"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#, fuzzy
+#| msgid "_Ignore SSL certificate errors"
+msgid "I_gnore SSL certificate errors"
+msgstr "å¿½ç?¥ SSL æ??è?é?¯èª¤(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "è¦?è??ä¼ºæ??å?¨è¨å®?å?¼"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#, fuzzy
+#| msgid "Pri_ority:"
+msgid "Priori_ty:"
 msgstr "å?ªå??æ¬?(_O)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -928,50 +981,42 @@ msgstr ""
 "å¦?æ??æ?¨é??æ²?æ?? Facebook ä½¿ç?¨è??å??ç¨±ï¼?è«?ä½¿ç?¨ <a href=\"http://www.facebook.com/";
 "username/\">æ¤ç¶²é ?</a> ä¾?é?¸ç?¨ä¸?å??ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Facebook password?"
 msgstr "æ?¨ç?? Facebook å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Facebook username?"
 msgstr "æ?¨ç?? Facebook ä½¿ç?¨è??å??ç¨±æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Google ID?"
 msgstr "æ?¨ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Google password?"
 msgstr "æ?¨ç?? Google å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Jabber ID?"
 msgstr "æ?¨ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Jabber password?"
 msgstr "æ?¨ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your desired Jabber ID?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your desired Jabber password?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç¢¼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "å¿½ç?¥ SSL æ??è?é?¯èª¤(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>ç¯?ä¾?ï¼?</b> user hotmail com"
@@ -985,25 +1030,29 @@ msgid "What is your Windows Live password?"
 msgstr "æ?¨ç?? Windows Live å¯?ç¢¼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "é?»å?é?µä»¶ä½?å??(_E)ï¼?"
+#, fuzzy
+#| msgid "E-mail address:"
+msgid "E-_mail address:"
+msgstr "é?»å?ä¿¡ç®±ä½?å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nic_kname:"
+msgstr "æ?±ç¨±ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "å??(_F)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "å§?(_L)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "æ?±ç¨±(_N)ï¼?"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??ç¨±(_P)ï¼?"
@@ -1081,25 +1130,27 @@ msgid "_Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±(_U)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#, fuzzy
+#| msgid "_Ignore conference and chat room invitations"
+msgid "I_gnore conference and chat room invitations"
+msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_I)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "Use _Yahoo! Japan"
 msgstr "ä½¿ç?¨ Yahoo! æ?¥æ?¬(_Y)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "æ?¨ç?? Yahoo! ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../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:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "å¿½ç?¥æ??è°è??è??å¤©å®¤é??è«?(_I)"
-
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤æ¸?å?®å?°å??(_R)ï¼?"
@@ -1133,51 +1184,51 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£¡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:642
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:682
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:688
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?è¢«å??è¨±è®?æ?´é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:819
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:831
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:840
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:846
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:849
 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 "
@@ -1186,7 +1237,7 @@ msgstr ""
 "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??å¤©å®¤ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:854
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1194,84 +1245,84 @@ msgstr ""
 "/help [<å?½ä»¤>]ï¼?é¡¯ç¤ºæ??æ??æ?¯æ?´ç??æ??ä»¤ã??å¦?æ??æ??å®?ç¾©é??å?? <å?½ä»¤> ç??è©±ï¼?ä¾¿é¡¯ç¤ºå®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:864
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:893
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1011
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1169
+#: ../libempathy-gtk/empathy-chat.c:1172
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1291
+#: ../libempathy-gtk/empathy-chat.c:1294
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1296
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1772
+#: ../libempathy-gtk/empathy-chat.c:1775
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
-#: ../libempathy-gtk/empathy-chat.c:1826
+#: ../libempathy-gtk/empathy-chat.c:1829
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-chat.c:1847
 #: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1878
+#: ../libempathy-gtk/empathy-chat.c:1881
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1955
+#: ../libempathy-gtk/empathy-chat.c:1958
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2061
+#: ../libempathy-gtk/empathy-chat.c:2064
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1279,12 +1330,12 @@ msgstr "%s å·²æ?·ç·?"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?ºå?»"
 
-#: ../libempathy-gtk/empathy-chat.c:2071
+#: ../libempathy-gtk/empathy-chat.c:2074
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1292,17 +1343,17 @@ msgstr "%s è¢«è¸¢å?º"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2079
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2085
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2086
+#: ../libempathy-gtk/empathy-chat.c:2089
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1312,46 +1363,46 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2095
+#: ../libempathy-gtk/empathy-chat.c:2098
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2120
+#: ../libempathy-gtk/empathy-chat.c:2123
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2145
+#: ../libempathy-gtk/empathy-chat.c:2148
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2922
+#: ../libempathy-gtk/empathy-chat.c:2934
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2923
+#: ../libempathy-gtk/empathy-chat.c:2935
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2940
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2929
+#: ../libempathy-gtk/empathy-chat.c:2941
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3069
+#: ../libempathy-gtk/empathy-chat.c:3081
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3134
 #: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "è«?è©±"
@@ -1375,7 +1426,7 @@ msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:288
 msgid "Edit Contact Information"
 msgstr "ç·¨è¼¯é?£çµ¡äººè³?è¨?"
 
@@ -1397,85 +1448,84 @@ msgid "Subscription Request"
 msgstr "è¨?é?±è¦?æ±?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2086
+#: ../libempathy-gtk/empathy-individual-view.c:2235
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾¤çµ?"
 
 #. Remove
 #: ../libempathy-gtk/empathy-contact-list-view.c:2055
 #: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2140
-#: ../libempathy-gtk/empathy-individual-view.c:2225
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2171
+#: ../libempathy-gtk/empathy-individual-view.c:2320
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤é?£çµ¡äººã??%sã??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2173
+#: ../libempathy-gtk/empathy-individual-view.c:2322
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤é?£çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ?°å¢?è?¯çµ¡äºº(_A)â?¦"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:463
+#: ../libempathy-gtk/empathy-individual-menu.c:514
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:504
+#: ../libempathy-gtk/empathy-individual-menu.c:557
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??è©±(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:546
+#: ../libempathy-gtk/empathy-individual-menu.c:599
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??è©±(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:604
+#: ../libempathy-gtk/empathy-individual-menu.c:642
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../libempathy-gtk/empathy-individual-menu.c:683
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:687
+#: ../libempathy-gtk/empathy-individual-menu.c:725
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1537
-#: ../libempathy-gtk/empathy-individual-menu.c:721
-#: ../libempathy-gtk/empathy-individual-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Favorite"
 msgstr "å??å¥½"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:748
+#: ../libempathy-gtk/empathy-individual-menu.c:786
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
@@ -1485,13 +1535,13 @@ msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:934
+#: ../libempathy-gtk/empathy-individual-menu.c:970
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??å¤©å®¤"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:981
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
@@ -1525,148 +1575,152 @@ msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:579
-#: ../libempathy-gtk/empathy-individual-widget.c:451
+#: ../libempathy-gtk/empathy-individual-widget.c:454
 msgid "Country ISO Code:"
 msgstr "å??å®¶ ISO ç¢¼ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-individual-widget.c:456
 msgid "Country:"
 msgstr "å??å®¶ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:583
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:458
 msgid "State:"
 msgstr "å·?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:585
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:460
 msgid "City:"
 msgstr "å¸?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:462
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:589
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:464
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:591
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:466
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:468
 msgid "Building:"
 msgstr "å»ºç¯?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:595
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:470
 msgid "Floor:"
 msgstr "æ¨?å±¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:597
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:472
 msgid "Room:"
 msgstr "å®¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:599
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:474
 msgid "Text:"
 msgstr "æ??å?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:601
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:603
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "URI:"
 msgstr "URIï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:605
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "Accuracy Level:"
 msgstr "æº?ç¢ºåº¦ç?ç´?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "Error:"
 msgstr "é?¯èª¤ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:609
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (å?¬å°º)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:611
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (å?¬å°º)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:613
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:615
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Bearing:"
 msgstr "æ?¹ä½?ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:617
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:619
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Last Updated on:"
 msgstr "ä¸?æ¬¡æ?´æ?°æ?¼ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:621
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Longitude:"
 msgstr "ç¶?åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Latitude:"
 msgstr "ç·¯åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:625
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Altitude:"
 msgstr "ç·¯åº¦ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:578
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:594
-msgid "<b>Location</b>, "
-msgstr "<b>ä½?ç½®<b>ï¼?"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:642
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:838
-#: ../libempathy-gtk/empathy-individual-widget.c:832
+#: ../libempathy-gtk/empathy-contact-widget.c:842
+#: ../libempathy-gtk/empathy-individual-widget.c:841
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:894
-#: ../libempathy-gtk/empathy-individual-widget.c:890
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:899
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1676,7 +1730,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1218
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1696,7 +1750,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:1419
+#: ../libempathy-gtk/empathy-individual-widget.c:1431
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
@@ -1729,48 +1783,58 @@ msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
 msgid "Select"
 msgstr "é?¸æ??"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1231
+#: ../src/empathy-main-window.c:1247
 msgid "Group"
 msgstr "ç¾¤çµ?"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:302
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
 msgid "Linked Contacts"
 msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:252
+#: ../libempathy-gtk/empathy-individual-linker.c:354
 msgid "Select contacts to link"
 msgstr "é?¸å??è¦?é?£çµ?ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:303
+#: ../libempathy-gtk/empathy-individual-linker.c:428
 msgid "New contact preview"
 msgstr "æ?°å¢?é?£çµ¡äººé ?è¦½"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:108
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo jabber org) and the second is one
+#. * of the user's account IDs (e.g. me hotmail com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:799
+#: ../libempathy-gtk/empathy-individual-menu.c:837
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:829
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
 msgctxt "Link individual (contextual menu)"
 msgid "_Linkâ?¦"
 msgstr "é?£çµ?(_L)â?¦"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1780,36 +1844,39 @@ msgstr[0] "å¾?è¨è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "æ?°å¢?ç¶²è·¯"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#, fuzzy
+#| msgid "Which IRC network?"
+msgid "Choose an IRC network"
+msgstr "å?ªå?? IRC ç¶²è·¯ï¼?"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "ä¼ºæ??å?¨"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "é?£æ?¥å? "
-
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:92
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:109
 msgid "Link Contacts"
 msgstr "é?£çµ?è?¯çµ¡äºº"
 
 #. Add button
-#: ../libempathy-gtk/empathy-linking-dialog.c:102
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
 msgid "_Link"
 msgstr "é?£çµ?(_L)"
 
-#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "å¸³è??"
-
 #: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "æ?¥æ??"
@@ -1820,11 +1887,11 @@ msgid "Conversations"
 msgstr "è«?è©±"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Find next"
+msgid "Find Next"
 msgstr "å°?æ?¾ä¸?ä¸?å??"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "Find previous"
+msgid "Find Previous"
 msgstr "å°?æ?¾ä¸?ä¸?å??"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
@@ -1991,6 +2058,76 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "å°?è©±ä¼ºæ??å?¨æ??æ??ä¾?ç??è?å?¥èº«å??ç?¡æ³?é??é??é©?è?ã??\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+msgid "The certrificate is not signed by a Certification Authority"
+msgstr "æ??è?ä¸¦é??ç?±æ??è?æ??æ¬?ä¸å¿?æ??ç°½ç½²"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "æ??è?å·²é?¾æ??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "æ??è?å°?æ?ªå??ç?¨"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "æ??è?ä¸¦æ?ªæ??æ??é ?æ??ç??æ??ç´?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "æ??è?æ??é©?è?ç??ä¸»æ©?å??ç¨±è??ä¼ºæ??å?¨å??ç¨±ä¸?ç¬¦"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "æ??è?ç?ºè?ªæ??ç°½ç½²"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "æ??è?å·²è¢«å??æ?¬ç?¼å?ºç??æ??è?æ??æ¬?æ©?æ§?æ?¤é?·"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr "æ??è?æ?¼å¯?ç¢¼é?²è·ä¸?è¼?å¼±"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "æ??è?é?·åº¦è¶?å?ºå?¯é©?è?ç??ç¯?å??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "æ??è?æ ¼å¼?ä¸?è?¯"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "é ?æ??ç??æ??è?ä¸»æ©?å??ç¨±ï¼?%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "æ??è?ä¸»æ©?å??ç¨±ï¼?%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "ç¹¼çº?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "æ¤é?£ç·?æ?ªå??ä¿¡ä»»ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?ç¹¼çº?å??ï¼?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "è«?è¨?ä½?æ¤é?¸æ??ä»¥ä¾?æ?ªä¾?é?£ç·?ä½¿ç?¨"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "æ??è?è©³ç´°è³?æ??"
+
 #: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
@@ -2183,8 +2320,7 @@ msgstr "æ??é?¸ç??è?¯çµ¡äººå·²ç¶?é?¢ç·?ã??"
 msgid "No error message"
 msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
@@ -2277,7 +2413,7 @@ msgstr ""
 "è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1311
+#: ../src/empathy-account-assistant.c:1310
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2286,36 +2422,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:604
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s å¸³è??"
 
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:509
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??å¤©å¸³è??æ?¯å?ªä¸?ç¨®ï¼?"
 
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:515
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?è¨å®?å?¶ä»?ç??è??å¤©å¸³è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:521
 msgid "Enter your account details"
 msgstr "è«?è¼¸å?¥æ?¨ç??å¸³è??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:526
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?å»ºç«?ä½?ç¨®è??å¤©å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:532
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?å»ºç«?å?¶ä»?è??å¤©å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:539
 msgid "Enter the details for the new account"
 msgstr "è«?è¼¸å?¥æ?°å¸³è??ç??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:654
 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 "
@@ -2326,41 +2462,41 @@ msgstr ""
 "Live ç?å?¶ä»?è??å¤©ç¨?å¼?ç??æ??å??å??å??äº?è??å¤©ã??å?©ç?¨éº¥å??é¢¨æ??ç¶²è·¯æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?"
 "è¨?é??è©±ã??"
 
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:671
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??ä½¿ç?¨å?¶ä»?è??å¤©ç¨?å¼?ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:694
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??å¸³è??è©³ç´°è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:715
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?è¼¸å?¥å¸³è??ç??è©³ç´°è³?æ??"
 
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:737
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:747
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??èª°ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:768
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:852
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:859
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??æ¨£"
 
-#: ../src/empathy-account-assistant.c:1125
+#: ../src/empathy-account-assistant.c:1124
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2371,16 +2507,16 @@ msgstr ""
 "ç?¨æ¤å??è?½ï¼?è«?æª¢æ?¥ä¸?å??è©³ç´°è³?æ??æ?¯å?¦æ£ç¢ºã??æ?¨ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°è®?æ?´é??äº?ç´°ç¯?ï¼?æ??æ?¯"
 "ç?¨ã??å¸³è??ã??å°?è©±çª?ä¾?å??ç?¨æ¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1131
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1186
 msgid "Edit->Accounts"
 msgstr "ç·¨è¼¯ -> å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1146
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1183
+#: ../src/empathy-account-assistant.c:1182
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2391,23 +2527,23 @@ msgstr ""
 "å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³"
 "è??"
 
-#: ../src/empathy-account-assistant.c:1189
+#: ../src/empathy-account-assistant.c:1188
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut å°?æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1234
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1269
+#: ../src/empathy-account-assistant.c:1268
 msgid "Welcome to Empathy"
 msgstr "æ¡è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1278
+#: ../src/empathy-account-assistant.c:1277
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1296
+#: ../src/empathy-account-assistant.c:1295
 msgid "Please enter personal details"
 msgstr "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2424,33 +2560,33 @@ msgstr "æ??è??æ?¨ç?? %s å¸³è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
+#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:808
 msgid "Connectingâ?¦"
 msgstr "é?£ç·?ä¸â?¦"
 
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²è·¯é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? å¸³è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:805
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2458,16 +2594,16 @@ msgstr ""
 "æ?¨å?³å°?å»ºç«?æ?°ç??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1152
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?ç§»é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1156
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??ç§»é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1394
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2475,7 +2611,7 @@ msgstr ""
 "æ?¨å?³å°?å»ºç«?å?¦ä¸?å??å¸³è??ï¼?é??æ¨£æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:1997
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2484,28 +2620,40 @@ msgstr ""
 "æ?¨æ??å??ç??è®?æ?´ã??ç¢ºå®?è¦?ç¹¼çº?ï¼?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "æ£å?¨è¼?å?¥å¸³è??è³?è¨?"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "No protocol installed"
 msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Protocol:"
 msgstr "å??å®?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
 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:4
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Addâ?¦"
 msgstr "å? å?¥(_A)â?¦"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Importâ?¦"
 msgstr "å?¯å?¥(_I)â?¦"
 
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr "- Empathy èª?è?ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy èª?è?ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "é??è¿?ç??äºº"
 
@@ -3105,32 +3253,31 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#. Labels for empty contact list
-#: ../src/empathy-main-window.c:95
+#: ../src/empathy-main-window.c:383
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:519
+#: ../src/empathy-main-window.c:535
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:525
+#: ../src/empathy-main-window.c:541
 msgid "Edit Account"
 msgstr "ç·¨è¼¯å¸³è??"
 
-#: ../src/empathy-main-window.c:531
+#: ../src/empathy-main-window.c:547
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1213
+#: ../src/empathy-main-window.c:1229
 msgid "Contact"
 msgstr "é?£çµ¡äºº"
 
-#: ../src/empathy-main-window.c:1538
+#: ../src/empathy-main-window.c:1554
 msgid "Contact List"
 msgstr "é?£çµ¡äººæ¸?å?®"
 
-#: ../src/empathy-main-window.c:1647
+#: ../src/empathy-main-window.c:1663
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3224,29 +3371,29 @@ msgstr "æ??å?¡"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
+"%s\n"
 "é??è¦?é??è«?ï¼?%s\n"
 "é??è¦?å¯?ç¢¼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??å¤©å®¤æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ¢å??å?ºè??å¤©å®¤æ¸?å?®"
 
@@ -3562,8 +3709,8 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ï¼?ä¾?ï¼?å?¯å?¥ï¼?ä¸¦é?¢é??"
 
 #: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "å¦?æ??æ??ä»»ä½?é?? salut ç??å¸³è??ï¼?å°±ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "å¦?æ??æ??ä»»ä½?é?? Salut ç??å¸³è??ï¼?å°±ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?"
 
 #: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -3585,6 +3732,18 @@ msgstr "Empathy å¸³è??"
 msgid "Empathy Debugger"
 msgstr "Empathy é?¤é?¯ç¨?å¼?"
 
+#~ msgid "_Character set:"
+#~ msgstr "å?é??(_C)ï¼?"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "é?»å?é?µä»¶ä½?å??(_E)ï¼?"
+
+#~ msgid "_Nickname:"
+#~ msgstr "æ?±ç¨±(_N)ï¼?"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>ä½?ç½®<b>ï¼?"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "å?³é??è??æ?¥æ?¶è¨?æ?¯"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]