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

[Chao-Hsiung Liao <chliao src gnome org>]

commit 216990096f7087f7e29c0fdf2c25c34274f83376
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Thu Dec 9 19:54:27 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  905 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  905 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 960 insertions(+), 850 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index f802e5a..c50fb57 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-10-13 15:40+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-09 19:54+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -90,7 +90,7 @@ msgstr "å?¨ç??æ??å??å??顯示æ?¶å?°äº?件ã??å¦?æ??ä¸?å??ç?¨ç??話ï¼?æ?¶å?°äº?件
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
-msgstr "Empathy å?¯ä»¥ç?¼ä½?使ç?¨è??ç??ä½?ç½®"
+msgstr "Empathy å?¯ä»¥ç?¼å¸?使ç?¨è??ç??ä½?ç½®"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
@@ -98,7 +98,7 @@ msgstr "Empathy �以�� GPS ��測�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy å?¯ä»¥å?©ç?¨æµ?å??é?»è©±ç¶²çµ¡å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
+msgstr "Empathy å?¯ä»¥å?©ç?¨æµ?å??é?»è©±ç¶²çµ¡å?ºå?°è?ºä¾?æ?¨æ¸¬ä½?ç½®"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
@@ -262,7 +262,7 @@ msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
+msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼å¸?給ä»?ç??è?¯çµ¡äººã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
@@ -426,19 +426,19 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
 
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "æª?æ¡?å?³è¼¸å®?ç?¢ï¼?ä½?æ?¯æª?æ¡?å·²æ??æ¯?"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
 msgid "File transfer not supported by remote contact"
 msgstr "é? 端è?¯çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
@@ -494,9 +494,9 @@ msgstr "é?±è??"
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -619,7 +619,7 @@ msgstr "Yahoo! ��"
 
 #: ../libempathy/empathy-utils.c:577
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #: ../libempathy/empathy-utils.c:578
 msgid "Facebook Chat"
@@ -665,71 +665,85 @@ msgstr[0] "%d å??æ??以å??"
 msgid "in the future"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
 msgid "Password"
 msgstr "�碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
 #: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳è??å·²é??é??æ??ç??網絡帳è??ä¿®æ?¹ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳è??ç?¡æ³?æ?¼ Empathy å?§ä¿®æ?¹ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "å??å??æ??ç??網絡帳è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
 msgid "A_pply"
 msgstr "��(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
 msgid "L_og in"
 msgstr "��(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
 #: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
 msgid "_Enabled"
 msgstr "å·²å??ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -738,19 +752,19 @@ msgstr "å??æ¶?(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
 #, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
@@ -1034,7 +1048,7 @@ msgstr "�(_L)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "ç?¼ä½?ç??å??稱(_P)ï¼?"
+msgstr "ç?¼å¸?ç??å??稱(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
@@ -1126,30 +1140,30 @@ msgstr "Yahoo I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Room List locale:"
-msgstr "è??天室æ¸?å?®å?°å??(_R)ï¼?"
+msgstr "è??天室æ¸?å?®å?°å??è³?è¨?(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ä½ ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??ä½ ç??å¤§é ­è²¼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -1157,141 +1171,155 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
 msgid "Topic not supported on this conversation"
 msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?被å??許æ?´æ?¹é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主é¡?>ï¼?設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網å??>ï¼?æ?´æ?¹å?¨ç?®å??伺æ??å?¨ä¸?ç??ä½ ç??網å??"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
 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:854
+#: ../libempathy-gtk/empathy-chat.c:856
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
 #, c-format
 msgid "Usage: %s"
 msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
 msgid "Topic:"
 msgstr "主��"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "å? å?¥ã??%sã??è?³è¾­å?¸"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "å? å?¥ã??%sã??è?³ %s è¾­å?¸"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1299,12 +1327,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:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -1312,17 +1340,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:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1332,79 +1360,79 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
 msgid "Conversation"
 msgstr "�話"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1424,101 +1452,101 @@ msgstr "�羣�"
 msgid "Favorite People"
 msgstr "å??好ç??人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
 #, 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:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
 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:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
 #: ../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:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
 #, 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:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
 #: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
 #: ../libempathy-gtk/empathy-individual-menu.c:559
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
 #: ../libempathy-gtk/empathy-individual-menu.c:601
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
 #: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
 #: ../libempathy-gtk/empathy-individual-menu.c:685
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
 #: ../libempathy-gtk/empathy-individual-menu.c:727
 msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
 #: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
 #: ../libempathy-gtk/empathy-individual-menu.c:788
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1526,178 +1554,178 @@ msgstr "é??è«?å?°è??天室(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "é?»è©±è??碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "網��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
 msgid "Latitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
 msgid "Altitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
 #, c-format
 msgid "%s, %s"
 msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1707,7 +1735,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1727,7 +1755,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:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "è­?å?¥èº«å??ï¼?"
 
@@ -1759,14 +1787,12 @@ msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
-msgstr "é?¸æ??"
+msgstr "é?¸å??"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
 msgid "Group"
 msgstr "羣�"
 
@@ -1795,19 +1821,19 @@ msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "���絡人(_L)�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1817,6 +1843,10 @@ msgstr[0] "å¾?設è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "å¾?æ??æ©?æ??æµ?å??é??è¨?å?¨æ??ä¸?ç·?"
+
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
 msgid "New Network"
 msgstr "��網絡"
@@ -1826,11 +1856,9 @@ msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC 網絡"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
-msgstr "é?¸æ??"
+msgstr "é?¸å??"
 
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
@@ -1881,7 +1909,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1919,64 +1947,76 @@ msgid "Contact ID:"
 msgstr "�絡人 ID�"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "è??天(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "���話"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
 msgid "Send _Video"
 msgstr "å?³é??è¦?å??(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
 msgid "C_all"
 msgstr "é??話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
 msgid "New Call"
 msgstr "æ?°å¢?é??話"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
 msgid "Custom Messageâ?¦"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 msgid "Edit Custom Messagesâ?¦"
 msgstr "編輯�����"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
 msgid "Click to remove this status as a favorite"
 msgstr "æ??é??è£?å°?é??å??ç??æ??å¾?å??好中移é?¤"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
 msgid "Click to make this status a favorite"
 msgstr "æ??é??è£?å°?é??å??ç??æ??設ç?ºå??好"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
 msgid "Set status"
 msgstr "設å®?ç??æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
 msgid "Set your presence and current status"
 msgstr "設å®?ä½ ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
 msgid "Custom messagesâ?¦"
 msgstr "�����"
 
@@ -2001,43 +2041,43 @@ msgstr "符å??æ¢?件"
 msgid "Phrase not found"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
@@ -2050,12 +2090,12 @@ msgid "Edit Custom Messages"
 msgstr "編輯����"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+msgid "Save _New Status Message"
+msgstr "å?²å­?æ?°ç??ç??æ??è¨?æ?¯(_N)"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "å·²å?²å­?ç??é ?å??設å®?"
+msgid "Saved Status Messages"
+msgstr "å?²å­?ç??ç??æ??è¨?æ?¯"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -2074,73 +2114,49 @@ msgid "Blue"
 msgstr "è??è?²"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??\n"
+msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "該è­?æ?¸ä¸¦é??ç?±è­?æ?¸æ??æ¬?中å¿?æ??簽署"
+msgstr "該è­?æ?¸ä¸¦é??ç?±è­?æ?¸æ??æ¬?中å¿?æ??簽署ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
 msgid "The certificate has expired."
-msgstr "è­?æ?¸å·²é?¾æ??"
+msgstr "è­?æ?¸å·²é?¾æ??ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "è­?æ?¸å°?æ?ªå??ç?¨"
+msgstr "è­?æ?¸å°?æ?ªå??ç?¨ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
 msgid "The certificate does not have the expected fingerprint."
-msgstr "è­?æ?¸ä¸¦æ?ªæ??æ??é ?æ??ç??æ??ç´?"
+msgstr "è­?æ?¸ä¸¦æ?ªæ??æ??é ?æ??ç??æ??ç´?ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "è­?æ?¸æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符"
+msgstr "è­?æ?¸æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
 msgid "The certificate is self-signed."
-msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
+msgstr "è­?æ?¸ç?ºè?ªæ??簽署ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "è­?æ?¸å·²è¢«å??æ?¬ç?¼å?ºç??è­?æ?¸æ??æ¬?æ©?æ§?æ?¤é?·"
+msgstr "è­?æ?¸å·²è¢«å??æ?¬ç?¼å?ºç??è­?æ?¸æ??æ¬?æ©?æ§?æ?¤é?·ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
 msgid "The certificate is cryptographically weak."
-msgstr "����碼�護��弱"
+msgstr "è­?æ?¸æ?¼å¯?碼é?²è­·ä¸?è¼?å¼±ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
 msgid "The certificate length exceeds verifiable limits."
-msgstr "è­?æ?¸é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??"
+msgstr "è­?æ?¸é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
 msgid "The certificate is malformed."
-msgstr "è­?æ?¸æ ¼å¼?ä¸?è?¯"
+msgstr "è­?æ?¸æ ¼å¼?ä¸?è?¯ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2168,22 +2184,22 @@ msgstr "è«?è¨?ä½?æ­¤é?¸æ??以ä¾?æ?ªä¾?é?£ç·?使ç?¨"
 msgid "Certificate Details"
 msgstr "è­?æ?¸è©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "ç?®å??ç??å?°å??設å®?"
+msgstr "ç?®å??ç??å?°å??è³?è¨?設å®?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2228,7 +2244,7 @@ msgstr "ç¹?é«?中æ??"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:208
 msgid "Croatian"
-msgstr "å??ç¾?å?°äº?èª?"
+msgstr "å??ç¾?å?°äº?æ??"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:211
 #: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -2246,7 +2262,7 @@ msgstr "æ?¯æ??夫èª?ç³»/ä¿?æ??"
 #: ../libempathy-gtk/totem-subtitle-encoding.c:227
 #: ../libempathy-gtk/totem-subtitle-encoding.c:229
 msgid "Cyrillic/Ukrainian"
-msgstr "æ?¯æ??夫/ç??å??è?­èª?ç³»"
+msgstr "æ?¯æ??夫æ??/ç??å??è?­èª?ç³»"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:232
 msgid "Georgian"
@@ -2364,25 +2380,41 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "è?¯çµ¡å¸³è??管ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"å??試é?£æ?¥è?³ Telepathy 帳è??管ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤ã??é?¯èª¤ç?ºï¼?\n"
+"\n"
+"%s"
+
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
-msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
+msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼å¸?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2390,7 +2422,7 @@ msgid ""
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
-msgstr "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
+msgstr "ç?¼å¸? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
@@ -2504,8 +2536,8 @@ msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
 #: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2571,7 +2603,7 @@ msgstr "æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
@@ -2656,11 +2688,11 @@ msgstr "å? å?¥(_A)â?¦"
 msgid "_Importâ?¦"
 msgstr "��(_I)�"
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
 msgid " - Empathy authentication client"
 msgstr "- Empathy ����端"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
 msgid "Empathy authentication client"
 msgstr "Empathy ����端"
 
@@ -2668,129 +2700,129 @@ msgstr "Empathy ����端"
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy é?³è¨?è¦?å??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy é?³è¨?è¦?å??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
 msgid "Video input"
 msgstr "è¦?å??輸å?¥"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
 msgid "Details"
 msgstr "詳細è³?æ??"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??話中"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
 msgid "Call"
 msgstr "é??話"
 
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
 msgid "The IP address as seen by the machine"
 msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
 msgid "The IP address as seen by a server on the Internet"
 msgstr "äº?è?¯ç¶²ä¸?ç??伺æ??å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¶ä»?端ç??è¦?ç??é»?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
 msgid "The IP address of a relay server"
 msgstr "中繼伺æ??å?¨ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
 msgid "The IP address of the multicast group"
 msgstr "å¤?é»?廣æ?­ç¾£çµ?ç?? IP ä½?å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?件ä¸?ç?­è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?件ä¸?ç?­è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?å??æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s 建ç«?é?£ç·?ã??ä½ å??å?¶ä¸­ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??許ç?´æ?¥é?£ç·?ç??網絡ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
 msgid "There was a failure on the network"
 msgstr "é??å??網絡ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?å??æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2798,19 +2830,19 @@ msgid ""
 "the Help menu."
 msgstr "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>並é??ä¸?å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
 msgid "The end of the stream was reached"
 msgstr "å·²é??串æµ?æ?«ç«¯"
 
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?建ç«?è¦?å??串æµ?"
 
@@ -2906,35 +2938,35 @@ msgstr "è¦?å??é ?覽"
 msgid "_Call"
 msgstr "é??話(_C)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2970,7 +3002,7 @@ msgstr "å°?å??é ?å?³ç§»(_R)"
 msgid "Notify for All Messages"
 msgstr "æ??æ??è¨?æ?¯é?½é??ç?¥"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "�容(_C)"
 
@@ -2982,7 +3014,7 @@ msgstr "�話(_C)"
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -2990,7 +3022,7 @@ msgstr "編輯(_E)"
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
@@ -3030,86 +3062,86 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?å??é??話"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?è¦?å??é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?å??é?»è©±"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "Invitation to join %s"
 msgstr "é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ä½ è¢«é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
+msgid "%s would like permission to see when you are available"
+msgstr "%s æ?³è¦?å?¨ä½ æ??空æ??å¾?å?°æ?¥ç??ç??許å?¯"
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -3118,12 +3150,12 @@ msgstr ""
 "\n"
 "���%s"
 
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -3262,31 +3294,31 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
 msgid "Contact List"
 msgstr "�絡人��"
 
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -3299,88 +3331,92 @@ msgid "Context"
 msgstr "é?¸é ?"
 
 #: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "��絡人�����(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "å? å?¥å??好(_F)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管ç??å??好"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "æ?°å¢?é??話(_C)â?¦"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
 msgid "P_references"
 msgstr "å??好設å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
 msgid "Show P_rotocols"
 msgstr "顯示å??å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "æ ¹æ??å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "æ ¹æ??ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)â?¦"
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "���話(_N)�"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "å??人è³?æ??(_P)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
 msgid "Members"
 msgstr "æ??å?¡"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
 #, c-format
 msgid ""
 "%s\n"
@@ -3393,16 +3429,16 @@ msgstr ""
 "é??è¦?å¯?碼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??天室æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ­¢å??å?ºè??天室æ¸?å?®"
 
@@ -3433,39 +3469,39 @@ msgstr "è??天室æ¸?å?®"
 msgid "_Room:"
 msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
 msgid "Message received"
 msgstr "��已��"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
 msgid "New conversation"
 msgstr "���話"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes online"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
 msgid "Contact goes offline"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
 msgid "Account connected"
 msgstr "帳è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
 msgid "Account disconnected"
 msgstr "帳è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "��"
 
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
 msgid "Preferences"
 msgstr "å??好設å®?"
 
@@ -3603,26 +3639,6 @@ msgstr "å°?æ??ç??è?¯çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "å??æ??"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "æ??çµ?"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "��"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "æ??çµ?"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "æ?¥å??"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç??æ??"
@@ -3710,34 +3726,73 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業ï¼?ä¾?ï¼?å?¯å?¥ï¼?並é?¢é??"
+msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業 (ä¾?ï¼?å?¯å?¥) 並é?¢é??"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "å¦?æ??æ??ä»»ä½?é?? Salut ç??帳è??ï¼?å°±ä¸?è¦?顯示任ä½?å°?話çª?"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "å??å§?é?¸å??æ??給äº?ç??帳è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳è??"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy 帳è??"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy è??天ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "å??æ??"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "æ??çµ?"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "��"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "æ??çµ?"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "æ?¥å??"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "å·²å?²å­?ç??é ?å??設å®?"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 41a79de..eda8a0f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-13 15:39+0800\n"
-"PO-Revision-Date: 2010-09-23 20:50+0800\n"
+"POT-Creation-Date: 2010-12-09 19:53+0800\n"
+"PO-Revision-Date: 2010-12-04 18:14+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -90,7 +90,7 @@ msgstr "å?¨ç??æ??å??å??顯示æ?¶å?°äº?件ã??å¦?æ??ä¸?å??ç?¨ç??話ï¼?æ?¶å?°äº?件
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
-msgstr "Empathy å?¯ä»¥ç?¼ä½?使ç?¨è??ç??ä½?ç½®"
+msgstr "Empathy å?¯ä»¥ç?¼å¸?使ç?¨è??ç??ä½?ç½®"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
@@ -98,7 +98,7 @@ msgstr "Empathy �以�� GPS ��測�置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy å?¯ä»¥å?©ç?¨è¡?å??é?»è©±ç¶²è·¯å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
+msgstr "Empathy å?¯ä»¥å?©ç?¨è¡?å??é?»è©±ç¶²è·¯å?ºå?°è?ºä¾?æ?¨æ¸¬ä½?ç½®"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
@@ -262,7 +262,7 @@ msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
+msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼å¸?給ä»?ç??é?£çµ¡äººã??"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
@@ -428,19 +428,19 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
 
-#: ../libempathy/empathy-ft-handler.c:851
-msgid "The hash of the received file and the sent one do not match"
-msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
+#: ../libempathy/empathy-ft-handler.c:830
+msgid "File transfer completed, but the file was corrupted"
+msgstr "æª?æ¡?å?³è¼¸å®?ç?¢ï¼?ä½?æ?¯æª?æ¡?å·²æ??æ¯?"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1121
 msgid "File transfer not supported by remote contact"
 msgstr "é? 端é?£çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1177
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1186
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
@@ -496,9 +496,9 @@ msgstr "é?±è??"
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
+#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
+#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -621,7 +621,7 @@ msgstr "Yahoo! ��"
 
 #: ../libempathy/empathy-utils.c:577
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #: ../libempathy/empathy-utils.c:578
 msgid "Facebook Chat"
@@ -667,71 +667,85 @@ msgstr[0] "%d å??æ??以å??"
 msgid "in the future"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:493
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:514
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:670
+#: ../libempathy-gtk/empathy-log-window.c:650
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:671
 msgid "Password"
 msgstr "�碼"
 
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:672
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:673
 #: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:745
+#: ../libempathy-gtk/empathy-account-widget.c:802
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1127
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 帳è??å·²é??é??æ??ç??網路帳è??ä¿®æ?¹ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1133
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 帳è??ç?¡æ³?æ?¼ Empathy å?§ä¿®æ?¹ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1153
+msgid "Launch My Web Accounts"
+msgstr "å??å??æ??ç??網路帳è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1465
 msgid "Username:"
 msgstr "使ç?¨è??å??稱ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1806
 msgid "A_pply"
 msgstr "��(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1836
 msgid "L_og in"
 msgstr "��(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1902
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
 #: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1913
 msgid "_Enabled"
 msgstr "å·²å??ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1978
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1981
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2095
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -740,19 +754,19 @@ msgstr "å??æ¶?(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2392
 #, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2418
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2422
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
@@ -1037,7 +1051,7 @@ msgstr "�(_L)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "ç?¼ä½?ç??å??稱(_P)ï¼?"
+msgstr "ç?¼å¸?ç??å??稱(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
@@ -1129,30 +1143,30 @@ msgstr "Yahoo I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Room List locale:"
-msgstr "è??天室æ¸?å?®å?°å??(_R)ï¼?"
+msgstr "è??天室æ¸?å?®å?°å??è³?è¨?(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
 msgid "None of the accepted image formats are supported on your system"
 msgstr "æ?¨ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??æ?¨ç??å¤§é ­è²¼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -1160,51 +1174,51 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??裡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
 msgid "Topic not supported on this conversation"
 msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?被å??許è®?æ?´é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主é¡?>ï¼?設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??伺æ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
 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 "
@@ -1213,7 +1227,7 @@ msgstr ""
 "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1221,84 +1235,98 @@ msgstr ""
 "/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
 #, c-format
 msgid "Usage: %s"
 msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1162
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1172
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1176
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
 msgid "Topic:"
 msgstr "主��"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1249
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1251
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1750
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1818
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "å? å?¥ã??%sã??è?³è¾­å?¸"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1855
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "å? å?¥ã??%sã??è?³ %s è¾­å?¸"
+
+#: ../libempathy-gtk/empathy-chat.c:1914
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:1932
+#: ../libempathy-gtk/empathy-ui-utils.c:1809
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:1967
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2056
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2162
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1306,12 +1334,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:2071
+#: ../libempathy-gtk/empathy-chat.c:2169
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2172
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢�"
@@ -1319,17 +1347,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:2082
+#: ../libempathy-gtk/empathy-chat.c:2180
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2183
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2187
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1339,79 +1367,79 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2196
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2221
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2246
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2910
+#: ../libempathy-gtk/empathy-chat.c:3016
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2911
+#: ../libempathy-gtk/empathy-chat.c:3017
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2916
+#: ../libempathy-gtk/empathy-chat.c:3022
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2917
+#: ../libempathy-gtk/empathy-chat.c:3023
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3163
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3110
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3216
+#: ../libempathy-gtk/empathy-log-window.c:657
 msgid "Conversation"
 msgstr "�話"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:111
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1431,101 +1459,101 @@ msgstr "�群�"
 msgid "Favorite People"
 msgstr "å??好ç??人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-contact-list-view.c:2000
+#: ../libempathy-gtk/empathy-individual-view.c:2263
 #, 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:2235
+#: ../libempathy-gtk/empathy-contact-list-view.c:2002
+#: ../libempathy-gtk/empathy-individual-view.c:2266
 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:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-contact-list-view.c:2051
+#: ../libempathy-gtk/empathy-contact-list-view.c:2128
+#: ../libempathy-gtk/empathy-individual-view.c:2321
+#: ../libempathy-gtk/empathy-individual-view.c:2435
 #: ../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:2320
+#: ../libempathy-gtk/empathy-contact-list-view.c:2081
+#: ../libempathy-gtk/empathy-individual-view.c:2352
 #, 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:2322
+#: ../libempathy-gtk/empathy-contact-list-view.c:2083
+#: ../libempathy-gtk/empathy-individual-view.c:2354
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
 #: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-contact-menu.c:261
 #: ../libempathy-gtk/empathy-individual-menu.c:559
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-contact-menu.c:292
 #: ../libempathy-gtk/empathy-individual-menu.c:601
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-contact-menu.c:333
 #: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-contact-menu.c:355
 #: ../libempathy-gtk/empathy-individual-menu.c:685
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-contact-menu.c:378
 #: ../libempathy-gtk/empathy-individual-menu.c:727
 msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:414
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1630
 #: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1290
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-contact-menu.c:447
 #: ../libempathy-gtk/empathy-individual-menu.c:788
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:489
+#: ../libempathy-gtk/empathy-contact-menu.c:493
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:543
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:919
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:574
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1533,178 +1561,178 @@ msgstr "é??è«?å?°è??天室(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:252
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:253
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "é?»è©±è??碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:254
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:255
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "網��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:256
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:670
+#: ../libempathy-gtk/empathy-individual-widget.c:476
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:478
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:674
+#: ../libempathy-gtk/empathy-individual-widget.c:480
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:676
+#: ../libempathy-gtk/empathy-individual-widget.c:482
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:678
+#: ../libempathy-gtk/empathy-individual-widget.c:484
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:680
+#: ../libempathy-gtk/empathy-individual-widget.c:486
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:682
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:684
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:686
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:690
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:692
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:694
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:696
+#: ../libempathy-gtk/empathy-individual-widget.c:502
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:698
+#: ../libempathy-gtk/empathy-individual-widget.c:504
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:700
+#: ../libempathy-gtk/empathy-individual-widget.c:506
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (å?¬å°º)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:702
+#: ../libempathy-gtk/empathy-individual-widget.c:508
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (�尺)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:510
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:706
+#: ../libempathy-gtk/empathy-individual-widget.c:512
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:708
+#: ../libempathy-gtk/empathy-individual-widget.c:514
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:710
+#: ../libempathy-gtk/empathy-individual-widget.c:516
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:712
+#: ../libempathy-gtk/empathy-individual-widget.c:518
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:714
+#: ../libempathy-gtk/empathy-individual-widget.c:520
 msgid "Latitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:716
+#: ../libempathy-gtk/empathy-individual-widget.c:522
 msgid "Altitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:604
+#: ../libempathy-gtk/empathy-individual-widget.c:621
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:623
 #, c-format
 msgid "%s, %s"
 msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:672
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:921
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:989
+#: ../libempathy-gtk/empathy-individual-widget.c:979
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1714,7 +1742,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1734,7 +1762,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:1429
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "è­?å?¥èº«å??ï¼?"
 
@@ -1767,14 +1795,12 @@ msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:398
-#, fuzzy
-#| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
-msgstr "é?¸æ??"
+msgstr "é?¸å??"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1250
+#: ../src/empathy-main-window.c:1276
 msgid "Group"
 msgstr "群�"
 
@@ -1803,19 +1829,19 @@ msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:862
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "���絡人(_L)�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#: ../libempathy-gtk/empathy-individual-widget.c:1649
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1825,6 +1851,10 @@ msgstr[0] "å¾?設è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
 
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "å¾?æ??æ©?æ??è¡?å??è£?ç½®ä¸?ç·?"
+
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
 msgid "New Network"
 msgstr "��網路"
@@ -1834,11 +1864,9 @@ msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC 網路"
 
 #: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
-#, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
-msgstr "é?¸æ??"
+msgstr "é?¸å??"
 
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
@@ -1889,7 +1917,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:667
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1927,64 +1955,76 @@ msgid "Contact ID:"
 msgstr "�絡人 ID�"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "è??天(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "���話"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
 msgid "Send _Video"
 msgstr "å?³é??è¦?è¨?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
 msgid "C_all"
 msgstr "é??話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
 msgid "New Call"
 msgstr "æ?°å¢?é??話"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:230
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-password-dialog.c:265
+msgid "Remember password"
+msgstr ""
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
 msgid "Custom Messageâ?¦"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
 msgid "Edit Custom Messagesâ?¦"
 msgstr "編輯�����"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
 msgid "Click to remove this status as a favorite"
 msgstr "æ??é??裡å°?é??å??ç??æ??å¾?å??好中移é?¤"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
 msgid "Click to make this status a favorite"
 msgstr "æ??é??裡å°?é??å??ç??æ??設ç?ºå??好"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
 msgid "Set status"
 msgstr "設å®?ç??æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
 msgid "Set your presence and current status"
 msgstr "設å®?æ?¨ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
 msgid "Custom messagesâ?¦"
 msgstr "�����"
 
@@ -2009,43 +2049,43 @@ msgstr "符å??æ¢?件"
 msgid "Phrase not found"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
@@ -2058,12 +2098,12 @@ msgid "Edit Custom Messages"
 msgstr "編輯����"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+msgid "Save _New Status Message"
+msgstr "å?²å­?æ?°ç??ç??æ??è¨?æ?¯(_N)"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "å·²å?²å­?ç??é ?å??設å®?"
+msgid "Saved Status Messages"
+msgstr "å?²å­?ç??ç??æ??è¨?æ?¯"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -2082,73 +2122,49 @@ msgid "Blue"
 msgstr "è??è?²"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??\n"
+msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "該æ??è­?並é??ç?±æ??è­?æ??æ¬?中å¿?æ??簽署"
+msgstr "該æ??è­?並é??ç?±æ??è­?æ??æ¬?中å¿?æ??簽署ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
 msgid "The certificate has expired."
-msgstr "æ??è­?å·²é?¾æ??"
+msgstr "æ??è­?å·²é?¾æ??ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "æ??è­?å°?æ?ªå??ç?¨"
+msgstr "æ??è­?å°?æ?ªå??ç?¨ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
 msgid "The certificate does not have the expected fingerprint."
-msgstr "æ??è­?並æ?ªæ??æ??é ?æ??ç??æ??ç´?"
+msgstr "æ??è­?並æ?ªæ??æ??é ?æ??ç??æ??ç´?ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "æ??è­?æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符"
+msgstr "æ??è­?æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
 msgid "The certificate is self-signed."
-msgstr "æ??è­?ç?ºè?ªæ??簽署"
+msgstr "æ??è­?ç?ºè?ªæ??簽署ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "æ??è­?已被å??æ?¬ç?¼å?ºç??æ??è­?æ??æ¬?æ©?æ§?æ?¤é?·"
+msgstr "æ??è­?已被å??æ?¬ç?¼å?ºç??æ??è­?æ??æ¬?æ©?æ§?æ?¤é?·ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
 msgid "The certificate is cryptographically weak."
-msgstr "æ??è­?æ?¼å¯?碼é?²è­·ä¸?è¼?å¼±"
+msgstr "æ??è­?æ?¼å¯?碼é?²è­·ä¸?è¼?å¼±ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
 msgid "The certificate length exceeds verifiable limits."
-msgstr "æ??è­?é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??"
+msgstr "æ??è­?é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
 msgid "The certificate is malformed."
-msgstr "æ??è­?æ ¼å¼?ä¸?è?¯"
+msgstr "æ??è­?æ ¼å¼?ä¸?è?¯ã??"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2176,22 +2192,22 @@ msgstr "è«?è¨?ä½?æ­¤é?¸æ??以ä¾?æ?ªä¾?é?£ç·?使ç?¨"
 msgid "Certificate Details"
 msgstr "æ??è­?詳細è³?æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1706
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1870
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
-msgstr "ç?®å??ç??å?°å??設å®?"
+msgstr "ç?®å??ç??å?°å??è³?è¨?設å®?"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:161
 #: ../libempathy-gtk/totem-subtitle-encoding.c:163
@@ -2236,7 +2252,7 @@ msgstr "æ­£é«?中æ??"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:208
 msgid "Croatian"
-msgstr "å??ç¾?å??西äº?èª?"
+msgstr "å??ç¾?å??西äº?æ??"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:211
 #: ../libempathy-gtk/totem-subtitle-encoding.c:213
@@ -2254,7 +2270,7 @@ msgstr "æ?¯æ??夫èª?ç³»/ä¿?æ??"
 #: ../libempathy-gtk/totem-subtitle-encoding.c:227
 #: ../libempathy-gtk/totem-subtitle-encoding.c:229
 msgid "Cyrillic/Ukrainian"
-msgstr "æ?¯æ??夫/ç??å??è?­èª?ç³»"
+msgstr "æ?¯æ??夫æ??/ç??å??è?­èª?ç³»"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:232
 msgid "Georgian"
@@ -2372,18 +2388,34 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:414
+#: ../src/empathy.c:309
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:418
+#: ../src/empathy.c:313
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:321
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
+#: ../src/empathy.c:500
+msgid "Error contacting the Account Manager"
+msgstr "è?¯çµ¡å¸³è??管ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤"
+
+#: ../src/empathy.c:502
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"å??試é?£æ?¥è?³ Telepathy 帳è??管ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤ã??é?¯èª¤ç?ºï¼?\n"
+"\n"
+"%s"
+
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2392,7 +2424,7 @@ msgid ""
 "version."
 msgstr ""
 "Empathy æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥é?µç?§è?ªç?±è»?é«?å?ºé??æ?? (Free Software Foundation) å?ºç??"
-"ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?"
+"ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼å¸?"
 "é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
 #: ../src/empathy-about-dialog.c:85
@@ -2402,7 +2434,7 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
+"ç?¼å¸? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
 #: ../src/empathy-about-dialog.c:89
@@ -2525,8 +2557,8 @@ msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
 #: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2598,7 +2630,7 @@ msgstr "æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
@@ -2683,11 +2715,11 @@ msgstr "å? å?¥(_A)â?¦"
 msgid "_Importâ?¦"
 msgstr "��(_I)�"
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:237
 msgid " - Empathy authentication client"
 msgstr "- Empathy ����端"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:253
 msgid "Empathy authentication client"
 msgstr "Empathy ����端"
 
@@ -2695,129 +2727,129 @@ msgstr "Empathy ����端"
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:118
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy ������端"
 
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:134
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy ������端"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-call-window.c:481
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-call-window.c:484
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-call-window.c:487
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-call-window.c:592
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-call-window.c:1168
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-call-window.c:1188
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-call-window.c:1192
 msgid "Video input"
 msgstr "��輸�"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-call-window.c:1196
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-call-window.c:1201
 msgid "Details"
 msgstr "詳細è³?æ??"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-call-window.c:1270
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??話中"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-call-window.c:1349
 msgid "Call"
 msgstr "é??話"
 
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-call-window.c:1503
 msgid "The IP address as seen by the machine"
 msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-call-window.c:1505
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網é??網路ä¸?ç??伺æ??å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:1507
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¶ä»?端ç??è¦?ç??é»?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:1509
 msgid "The IP address of a relay server"
 msgstr "中繼伺æ??å?¨ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:1511
 msgid "The IP address of the multicast group"
 msgstr "å¤?é»?廣æ?­ç¾¤çµ?ç?? IP ä½?å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-call-window.c:2261
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-call-window.c:2322
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-call-window.c:2360
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?­è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-call-window.c:2365
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?­è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-call-window.c:2371
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s 建ç«?é?£ç·?ã??æ?¨å??å?¶ä¸­ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??許ç?´æ?¥é?£ç·?ç??網路ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
 msgid "There was a failure on the network"
 msgstr "é??å??網路ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-call-window.c:2381
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:2384
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-call-window.c:2394
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2827,19 +2859,19 @@ msgstr ""
 "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å??å ±é??å??é?¯èª¤</a>並é??ä¸?"
 "å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-call-window.c:2402
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-call-window.c:2405
 msgid "The end of the stream was reached"
 msgstr "å·²é??串æµ?æ?«ç«¯"
 
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-call-window.c:2445
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-call-window.c:2455
 msgid "Can't establish video stream"
 msgstr "��建���串�"
 
@@ -2935,35 +2967,35 @@ msgstr "è¦?è¨?é ?覽"
 msgid "_Call"
 msgstr "é??話(_C)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:484
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:500
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:711
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2999,7 +3031,7 @@ msgstr "å°?å??é ?å?³ç§»(_R)"
 msgid "Notify for All Messages"
 msgstr "æ??æ??è¨?æ?¯é?½é??ç?¥"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "�容(_C)"
 
@@ -3011,7 +3043,7 @@ msgstr "�話(_C)"
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -3019,7 +3051,7 @@ msgstr "編輯(_E)"
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
@@ -3059,86 +3091,86 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?è¨?é??話"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:472
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:476
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?è¦?è¨?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:477
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:505
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:625
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?è¨?é?»è©±"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:702
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "Invitation to join %s"
 msgstr "é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:711
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:719
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:724
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:751
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:757
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æ?¨è¢«é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:807
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:1005
+#: ../src/empathy-event-manager.c:1018
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
+msgid "%s would like permission to see when you are available"
+msgstr "%s æ?³è¦?å?¨æ?¨æ??空æ??å¾?å?°æ?¥ç??ç??許å?¯"
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1022
 #, c-format
 msgid ""
 "\n"
@@ -3147,12 +3179,12 @@ msgstr ""
 "\n"
 "���%s"
 
-#: ../src/empathy-event-manager.c:1052
+#: ../src/empathy-event-manager.c:1066
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#: ../src/empathy-event-manager.c:1072
+#: ../src/empathy-event-manager.c:1087
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -3291,31 +3323,31 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:385
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:540
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:546
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:550
+#: ../src/empathy-main-window.c:552
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1232
+#: ../src/empathy-main-window.c:1258
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1557
+#: ../src/empathy-main-window.c:1585
 msgid "Contact List"
 msgstr "�絡人��"
 
-#: ../src/empathy-main-window.c:1666
+#: ../src/empathy-main-window.c:1695
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -3328,88 +3360,92 @@ msgid "Context"
 msgstr "é?¸é ?"
 
 #: ../src/empathy-main-window.ui.h:3
+msgid "Find in Contact _List"
+msgstr "��絡人�����(_L)"
+
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
 msgstr "å? å?¥å??好(_F)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管ç??å??好"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "æ?°å¢?é??話(_C)â?¦"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
 msgid "P_references"
 msgstr "å??好設å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
 msgid "Show P_rotocols"
 msgstr "顯示å??å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "ä¾?å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "ä¾?ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)â?¦"
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "���話(_N)�"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "å??人è³?è¨?(_P)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:406
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:422
 msgid "Members"
 msgstr "æ??å?¡"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:634
 #, c-format
 msgid ""
 "%s\n"
@@ -3422,16 +3458,16 @@ msgstr ""
 "é??è¦?å¯?碼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:636
+#: ../src/empathy-new-chatroom-dialog.c:637
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:665
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??天室æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:675
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ­¢å??å?ºè??天室æ¸?å?®"
 
@@ -3463,39 +3499,39 @@ msgstr "è??天室æ¸?å?®"
 msgid "_Room:"
 msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
 msgid "Message received"
 msgstr "��已��"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
 msgid "New conversation"
 msgstr "���話"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes online"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
 msgid "Contact goes offline"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
 msgid "Account connected"
 msgstr "帳è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
 msgid "Account disconnected"
 msgstr "帳è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "��"
 
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
 msgid "Preferences"
 msgstr "å??好設å®?"
 
@@ -3635,26 +3671,6 @@ msgstr "å°?æ??ç??é?£çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "å??æ??"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "æ??çµ?"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "��"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "æ??çµ?"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "æ?¥å??"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç??æ??"
@@ -3742,34 +3758,73 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業ï¼?ä¾?ï¼?å?¯å?¥ï¼?並é?¢é??"
+msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業 (ä¾?ï¼?å?¯å?¥) 並é?¢é??"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
-msgstr "å¦?æ??æ??ä»»ä½?é?? Salut ç??帳è??ï¼?å°±ä¸?è¦?顯示任ä½?å°?話çª?"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "å??å§?é?¸å??æ??給äº?ç??帳è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳è??"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy 帳è??"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:66
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy è??天ç?¨æ?¶ç«¯"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "å??æ??"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "æ??çµ?"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "��"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "æ??çµ?"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "æ?¥å??"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "å·²å?²å­?ç??é ?å??設å®?"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"