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



commit 8e342c724ef0eed52fc08e04dd4589bb02b41f89
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Dec 26 19:01:50 2009 +0800

    Updated Traditional Chinese(Hong Kong and Taiwan)

 po/zh_HK.po | 1759 +++++++++++++++++++++++++++++++++++++++--------------------
 po/zh_TW.po | 1759 +++++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 2316 insertions(+), 1202 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9c89aef..48b72b4 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -3,14 +3,15 @@
 # Abel Cheung <abel oaka org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
 # Tryneeds translation team, 2009.
+# Cheng-Chia Tseng <pswo10680 gmail com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 19:38+0800\n"
-"PO-Revision-Date: 2009-09-13 19:39+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2009-12-26 18:57+0800\n"
+"PO-Revision-Date: 2009-12-26 18:58+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,8 @@ msgid "Connection managers should be used"
 msgstr "使ç?¨é?£ç·?管ç??ç¨?å¼?"
 
 #: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+#, fuzzy
+msgid "Contact list sort criterion"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??åº?æ¢?件"
 
 #: ../data/empathy.schemas.in.h:8
@@ -217,203 +219,214 @@ msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
 #: ../data/empathy.schemas.in.h:46
+#, fuzzy
+#| msgid "Protocol"
+msgid "Show protocols"
+msgstr "å®?å?¨å¼?é??è¨?å??å®?"
+
+#: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??大頭貼å??ç??ç??ç?®é??ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±æ¬?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次å?·è¡?æ??建ç«? Salut 帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "æ?¯å?¦ä»¥ä½ è¨­å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?¥ç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:68
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?ºç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ç?¶ç?»å?¥ç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ç?¶ç?»å?ºç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:75
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:78
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:80
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示è?¯çµ¡äººå¤§é ­è²¼ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:83
+#, fuzzy
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid "Whether or not to show protocols for contacts in the contact list."
+msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
+
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "使ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??æ?¯å?¦é¡¯ç¤ºè¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
+#, fuzzy
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
+"Which criterion to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æ¢?件ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
-
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
@@ -430,7 +443,7 @@ msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
 msgid "People nearby"
 msgstr "��人�"
 
@@ -462,39 +475,99 @@ msgstr "å??試å?³è¼¸æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
 msgid "Available"
 msgstr "æ??空"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
 msgid "Busy"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:245
 msgid "Hidden"
 msgstr "é?±è??"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+#, fuzzy
+#| msgid "No reason was specified"
+msgid "No reason specified"
+msgstr "æ²?æ??æ??å®?å??å? "
+
+#: ../libempathy/empathy-utils.c:288
+#, fuzzy
+#| msgid "%s has disconnected"
+msgid "User requested disconnect"
+msgstr "中æ?·é?¸å??ç??è£?ç½®"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "網絡�誤"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "é©?è­?失æ??"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "å? å¯?ç?¼ç??é?¯èª¤"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "使ç?¨ä¸­ç??å??稱"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "æ²?æ??æ??ä¾?è­?æ?¸"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "���被信任"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "è­?æ?¸å·²é?¾æ??"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "����使�"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "è­?æ?¸ä¸»æ©?å??稱ä¸?符"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "è­?æ?¸æ??ç´?æª?ä¸?符"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "���誤"
+
+#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "��人�"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:429
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:430
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -538,20 +611,65 @@ msgstr[0] "%d å??æ??以å??"
 msgid "in the future"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:450
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:527
+#: ../libempathy-gtk/empathy-account-widget.c:583
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1320
+msgid "L_og in"
+msgstr "��(_O)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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:1398
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1460
+#, fuzzy
+#| msgid "This will not remove your account on the server."
+msgid "This account already exists on the server"
+msgstr "é??ä¸?æ??移é?¤ä½ å?¨ä¼ºæ??å?¨ä¸?æ??æ??æ??ç??帳æ?¶ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1463
+#, fuzzy
+#| msgid "_Create a new account"
+msgid "Create a new account on the server"
+msgstr "å?¨é?¸å??ç??è£?ç½®ä¸?建ç«?æ?°ç??æª?æ¡?系統"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:1846
+#, 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:1864
+#, c-format
+msgid "%s Account"
+msgstr "%s 帳è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1868
+msgid "New account"
+msgstr "æ?°å¢?帳è??"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
 msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
@@ -563,7 +681,7 @@ msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "é?²é??"
@@ -573,7 +691,7 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "�碼(_W):"
@@ -653,6 +771,46 @@ msgstr "編碼(_C):"
 msgid "New Network"
 msgstr "�網絡"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#, fuzzy
+#| msgid "_About"
+msgid "Auto"
+msgstr "è?ªå??"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#, fuzzy
+#| msgid "Western"
+msgid "Register"
+msgstr "æ?«å­?å?¨"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#, fuzzy
+msgid "Options"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#, fuzzy
+#| msgid "No"
+msgid "None"
+msgstr "ï¼?ç?¡ï¼?"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "編碼:"
@@ -778,31 +936,125 @@ msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??稱(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#, fuzzy
+msgid "<b>Keep-Alive Options</b>"
+msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#, fuzzy
+#| msgid "<b>Location</b>"
+msgid "<b>Miscellaneous Options</b>"
+msgstr "����"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#, fuzzy
+msgid "<b>NAT Traversal Options</b>"
+msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#, fuzzy
+#| msgid "<b>Location</b>"
+msgid "<b>Proxy Options</b>"
+msgstr "����"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
 msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "�索 STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authentication username:"
+msgstr "伺æ??å?¨ä½¿ç?¨è??å??稱"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#, fuzzy
+#| msgid "Discover STUN"
+msgid "Discover Binding"
+msgstr "æ??é?µçµ?å??"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Discover the STUN server automatically"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Hostname of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#, fuzzy
+msgid "Interval (seconds)"
+msgstr "æ?´æ?°é??é??(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#, fuzzy
+msgid "Loose Routing"
+msgstr "路�表��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#, fuzzy
+msgid "Mechanism:"
+msgstr "SASL æ©?å?¶"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#, fuzzy
+#| msgid "_Port:"
+msgid "Port:"
+msgstr "���(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺æ??å?¨:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN é??è¨?å? :"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#, fuzzy
+#| msgid "_Server:"
+msgid "Server:"
+msgstr "<b>伺æ??å?¨</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#, fuzzy
+#| msgid "STUN port:"
+msgid "Transport:"
+msgstr "å?³é??(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "What is your SIP account password?"
 msgstr "ä½ ç?? SIP 帳è??å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
 msgid "What is your SIP login ID?"
 msgstr "ä½ æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -839,91 +1091,171 @@ msgstr "ç?¡æ³?è½?æ??å??ç??"
 msgid "None of the accepted image formats is supported on your system"
 msgstr "ä½ ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??ä½ ç??大頭貼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:199
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+#: ../libempathy-gtk/empathy-chat.c:621
+#, fuzzy
+msgid "Failed to join chatroom"
+msgstr ""
+"ç?¡æ³?å? å?¥é??æ?²æ¡?ã??\n"
+"中止å? å?¥ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:639
+#, fuzzy
+msgid "Failed to open private chat"
+msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
+
+#: ../libempathy-gtk/empathy-chat.c:678
+#, fuzzy
+msgid "Topic not supported on this conversation"
+msgstr "é??å?°æ??å?°æ©?ä¸?æ?¯æ?´æ??å?°ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:684
+#, fuzzy
+msgid "You are not allowed to change the topic"
+msgstr "ä½ ä¸?å??許å­?å??系統設å®?ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:802
+msgid "/clear, clear all messages from the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:805
+#, fuzzy
+msgid "/topic <topic>, set the topic of the current conversation"
+msgstr "設å®?ç?ºç?®å??é ?é?¢(_P)"
+
+#: ../libempathy-gtk/empathy-chat.c:808
+#, fuzzy
+msgid "/join <chatroom id>, join a new chatroom"
+msgstr "建ç«?æ?°ç??使ç?¨è?? ID"
+
+#: ../libempathy-gtk/empathy-chat.c:811
+#, fuzzy
+msgid "/j <chatroom id>, join a new chatroom"
+msgstr "建ç«?æ?°ç??使ç?¨è?? ID"
+
+#: ../libempathy-gtk/empathy-chat.c:814
+msgid "/query <contact id> [<message>], open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:817
+msgid "/msg <contact id> <message>, open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:820
+msgid "/nick <nickname>, change your nickname on current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:823
+msgid "/me <message>, send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:826
+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 chatroom\""
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid ""
+"/help [<command>], show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:841
+#, fuzzy, c-format
+msgid "Usage: %s"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+#, fuzzy
+msgid "Unknown command"
+msgstr "ä¸?æ??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:991
+msgid "Unknown command, see /help for the available commands"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1133
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1136
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1139
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1142
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1145
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1149
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1554
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1657
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1660
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1775
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -931,12 +1263,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1782
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1785
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -944,17 +1276,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1793
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1796
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1800
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -964,61 +1296,85 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1809
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:1834
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1859
+#, fuzzy, c-format
+#| msgid "%s is now online."
+msgid "%s is now known as %s"
+msgstr "����(_U)"
+
+#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2521
+#, fuzzy
+msgid "Wrong password; please try again:"
+msgstr "è«?使ç?¨ä¸?å??ç??å¯?碼å??試ä¸?次ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:2522
+#, fuzzy
+msgid "Retry"
+msgstr "é??試(_R)"
+
+#: ../libempathy-gtk/empathy-chat.c:2527
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2528
+#, fuzzy
+msgid "Join"
+msgstr "å? å?¥"
+
+#: ../libempathy-gtk/empathy-chat.c:2668
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2721
+#: ../libempathy-gtk/empathy-log-window.c:546
 msgid "Conversation"
 msgstr "�話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
 msgid "Topic:"
 msgstr "主�:"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:317
+#: ../libempathy-gtk/empathy-theme-adium.c:817
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:824
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:422
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1030,37 +1386,37 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1557
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1559
 msgid "Removing group"
 msgstr "正�移�羣�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1606
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1636
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contact..."
 msgstr "���絡人(_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??天(_C)"
 
@@ -1075,8 +1431,9 @@ msgid "_Video Call"
 msgstr "è¦?å??é??話(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "檢è¦?å??ä¸?次è«?話(_V)"
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "��次�話(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
@@ -1091,15 +1448,18 @@ msgid "Infor_mation"
 msgstr "��(_M)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "é??è«?å?°é??å??è??天室"
+#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../src/empathy-chat-window.c:864
+#, fuzzy
+#| msgid "Inviting to this room"
+msgid "Inviting you to this room"
+msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
+#: ../libempathy-gtk/empathy-contact-menu.c:527
 msgid "_Invite to chatroom"
 msgstr "é??è«?å?°é??å??è??天室(_I)"
 
@@ -1115,120 +1475,120 @@ msgstr "��大頭貼"
 msgid "Unable to save avatar"
 msgstr "����大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:1010
+#: ../src/empathy-main-window.c:1038
 msgid "Group"
 msgstr "羣�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1287
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1289
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1291
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·®ï¼?ç±³ï¼?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1293
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差�米��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1295
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1297
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1299
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1301
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1303
 msgid "Longitude:"
 msgstr "�度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:1305
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:1307
 msgid "Altitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#: ../libempathy-gtk/empathy-contact-widget.c:1368
 msgid "<b>Location</b>"
 msgstr "<b>ä½?ç½®</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:1381
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1431
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
@@ -1236,13 +1596,6 @@ msgstr "%B %e, %Y æ?¼ %R UTC"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-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-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "å?¥å??:"
@@ -1260,7 +1613,7 @@ msgid "Client:"
 msgstr "客�端:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
+#: ../src/empathy-main-window.c:1021
 msgid "Contact"
 msgstr "�絡人"
 
@@ -1311,28 +1664,28 @@ msgstr "網�:"
 msgid "_Add Group"
 msgstr "��羣�(_G)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:556
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1352,56 +1705,74 @@ msgstr "æ??å°?"
 msgid "_For:"
 msgstr "æ??å°?(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "é??話(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "�絡人 ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
 msgid "C_hat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "�絡人 ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
 msgid "New Conversation"
 msgstr "���話"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#, fuzzy
+#| msgid "Send video"
+msgid "Send _Video"
+msgstr "å?³é??è¦?å??"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "é??話(_C)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#, fuzzy
+#| msgid "Call"
+msgid "New Call"
+msgstr "æ??å?ºæ?°é?»è©±"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message..."
 msgstr "����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages..."
 msgstr "編輯����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to remove this status as a favorite"
 msgstr "æ??é??è£?å°?é??å??ç??æ??å¾?å??好中移é?¤"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:353
 msgid "Click to make this status a favorite"
 msgstr "æ??é??è£?å°?é??å??ç??æ??設ç?ºå??好"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "設å®?ç??æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:896
 msgid "Set your presence and current status"
 msgstr "設å®?ä½ ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1083
 msgid "Custom messages..."
 msgstr "����..."
 
@@ -1445,11 +1816,11 @@ msgstr "æ?­å?ºèª?é?³é??話"
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "輸�����"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "編輯����"
 
@@ -1477,15 +1848,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1519
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1649
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1709
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -1656,75 +2027,44 @@ msgstr "西��系"
 msgid "Vietnamese"
 msgstr "è¶?å??æ??"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??è?¯çµ¡äººã??ç??空代表ä¸?顯示è?¯çµ¡äººã??"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "æ­¤è?¯çµ¡äººç??大頭貼è¨?è??ã??ç??空代表è?¯çµ¡äººæ²?æ??大頭貼ã??"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "話�"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "�話�"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "��(_I)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "å??好設å®?(_P)"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "è«?設å®?è?¯çµ¡äººã??"
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "é?¸æ??è?¯çµ¡äºº..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "ä¸?ç·?ç??æ??"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "設å®?ä½ è?ªå·±ç??ä¸?ç·?ç??æ??"
-
-#: ../src/empathy.c:742
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+#, fuzzy
+msgid "The contact selected cannot receive files."
+msgstr "æ??é?¸ç??æª?æ¡?ç?¡æ³?移è?³å??æ?¶ç­?ã??"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+#, fuzzy
+msgid "The contact selected is offline."
+msgstr "�端主���網�"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#, fuzzy
+msgid "No error message"
+msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#, fuzzy
+msgid "Instant Message (Empathy)"
+msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
+
+#: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:897
+#, fuzzy
+msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®"
 
-#: ../src/empathy.c:750
+#: ../src/empathy.c:901
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:913
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM 客�端��"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:84
 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 "
@@ -1732,7 +2072,7 @@ msgid ""
 "version."
 msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:88
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1740,18 +2080,18 @@ msgid ""
 "details."
 msgstr "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:92
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "ä½ æ??該已ç¶?å?? Empathy ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ï¼?å¦?æ??é??æ²?æ??ï¼?寫信給ï¼? Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1799,37 +2139,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:506
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:403
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:409
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:415
 msgid "Enter your account details"
 msgstr "è«?輸å?¥ä½ ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:420
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:426
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:433
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:519
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1837,77 +2176,94 @@ msgid ""
 "calls."
 msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é?°è¿?ç??人å?¡è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:536
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:559
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:580
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:612
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:633
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:727
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:920
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:929
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modification regarding your %s account."
 msgstr "é??æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s ç?? %1$s"
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr ""
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
-#, c-format
-msgid "%s Account"
-msgstr "%s 帳è??"
+#: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
+msgid "Connecting..."
+msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "æ?°å¢?帳è??"
+#: ../src/empathy-accounts-dialog.c:259
+#, fuzzy, c-format
+#| msgid "Disconnected"
+msgid "Disconnected - %s"
+msgstr "ã??%sã??å·²æ?·ç·?"
+
+#: ../src/empathy-accounts-dialog.c:264
+#, fuzzy, c-format
+#| msgid "Offline"
+msgid "Offline - %s"
+msgstr "��"
+
+#: ../src/empathy-accounts-dialog.c:277
+#, fuzzy
+msgid "Offline - No Network Connection"
+msgstr "æ?¾ä¸?å?°ç¶²çµ¡è¨­å??"
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:285
+#, fuzzy
+#| msgid "Unknown reason"
+msgid "Unknown Status"
+msgstr "é?»æ± ç??æ??ä¸?詳"
+
+#: ../src/empathy-accounts-dialog.c:296
+#, fuzzy
+msgid "Offline - Account disabled"
+msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
+
+#: ../src/empathy-accounts-dialog.c:645
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1915,28 +2271,16 @@ msgstr ""
 "ä½ å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:934
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"ä½ å?³å°?移é?¤ä½ ç?? %s 帳è??ï¼?\n"
-"確��繼��"
+msgid "Do you want to remove %s from your computer?"
+msgstr "ä½ æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸­ç§»é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"å¦?æ??你決å®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
-"\n"
-"ç?¶ä½ å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
+#: ../src/empathy-accounts-dialog.c:938
+msgid "This will not remove your account on the server."
+msgstr "é??ä¸?æ??移é?¤ä½ å?¨ä¼ºæ??å?¨ä¸?æ??æ??æ??ç??帳æ?¶ã??"
 
-#: ../src/empathy-accounts-dialog.c:980
+#: ../src/empathy-accounts-dialog.c:1120
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1944,7 +2288,7 @@ msgstr ""
 "ä½ å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1537
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1957,127 +2301,247 @@ msgid "Accounts"
 msgstr "帳è??"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "å? å?¥æ?°ç??"
+msgid "No protocol installed"
+msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "建�(_E)"
+#, fuzzy
+#| msgid "Protocol"
+msgid "Protocol:"
+msgstr "é??è¨?å??å®?(_P):"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?ä½ å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Add..."
 msgstr "å? å?¥(_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "建ç«?æ?°ç??使ç?¨è??帳è??(_C)"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "帳è??"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "_Import..."
+msgstr "��(_I)..."
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "��中..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
 msgid "_Sidebar"
 msgstr "å?´é??å??(_S)"
 
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
 msgid "Video input"
 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:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
 #, 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:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
 msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1700
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
+#: ../src/empathy-call-window.c:1761
+#, fuzzy
+msgid "Technical Details"
+msgstr "<b>æ??è¡?è³?æ??ï¼?</b>"
+
+#: ../src/empathy-call-window.c:1799
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1810
+#, 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 ""
+
+#: ../src/empathy-call-window.c:1816
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1820
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1823
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1833
+#, c-format
+msgid ""
+"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+
+#: ../src/empathy-call-window.c:1841
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1880
+msgid "Can't establish audio stream"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1890
+msgid "Can't establish video stream"
+msgstr ""
+
 #: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
-msgstr "æ??æ?·"
+#, fuzzy
+#| msgid "Compact contact list"
+msgid "Call the contact again"
+msgstr "Bourne Again Shell"
 
 #: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "é??æ?¥"
+#, fuzzy
+msgid "Camera Off"
+msgstr "Eight Off"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "å?³é??é?³è¨?"
+#, fuzzy
+msgid "Camera On"
+msgstr "%s (已��)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "å?³é??è¦?å??"
+msgid "Disable camera and stop sending video"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "è¦?å??é ?覽"
+msgid "Enable camera and send video"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "é??話(_C)"
+msgid "Enable camera but don't send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "æ??æ?·"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+#, fuzzy
+#| msgid "Video preview"
+msgid "Preview"
+msgstr "�覽"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Redial"
+msgstr "é??æ?¥"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Send Audio"
+msgstr "å?³é??é?³è¨?"
+
+#: ../src/empathy-call-window.ui.h:12
+#, fuzzy
+msgid "Toggle audio transmission"
+msgstr "å??æ??å¾? %s é??é?³"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+#| msgid "Video input"
+msgid "Video Off"
+msgstr "Eight Off"
+
+#: ../src/empathy-call-window.ui.h:15
+#, fuzzy
+#| msgid "Video input"
+msgid "Video On"
+msgstr "%s (已��)"
+
+#: ../src/empathy-call-window.ui.h:16
+#, fuzzy
+#| msgid "Video preview"
+msgid "Video Preview"
+msgstr "å½±ç??é ?覽ç??é«?度"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:343
-#, c-format
-msgid "Conversations (%d)"
-msgstr "�話 (%d)"
-
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#, fuzzy, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "��"
+
+#: ../src/empathy-chat-window.c:447
+#, fuzzy, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "å?¶å®?é??æ?²å??"
+
+#: ../src/empathy-chat-window.c:463
+#, fuzzy, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "é??æ??å¾?å¤?人..."
+
+#: ../src/empathy-chat-window.c:472
+#, fuzzy, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "顯示æ??æ??å·¥ä½?å??中ç??è¦?çª?"
+
+#: ../src/empathy-chat-window.c:683
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2086,70 +2550,76 @@ msgid "C_lear"
 msgstr "��(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+msgid "C_ontact"
+msgstr "�絡人"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "è??天"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+#, fuzzy
+msgid "Invite _Participant..."
+msgstr "å?ºå¸­è??"
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "å°?å??é ?左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "å°?å??é ?å?³ç§»(_R)"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "�絡人(_C)"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Conversation"
 msgstr "�話(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chatroom"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "ä¸?å??å??é ?(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Previous Tab"
 msgstr "ä¸?å??å??é ?(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "顯示�絡人��(_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
 msgid "_Tabs"
 msgstr "å??é ?(_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
 msgid "Name"
 msgstr "å??稱"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
 msgid "Auto-Connect"
 msgstr "è?ªå??é?£ç·?"
 
@@ -2157,75 +2627,93 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:345
+#, fuzzy
+#| msgid "Incoming voice call"
+msgid "Incoming video call"
+msgstr "ä¾?é?»ç??è?²é?³"
+
+#: ../src/empathy-event-manager.c:345
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:349
+#, fuzzy, c-format
+#| msgid "%s is calling you, do you want to answer?"
+msgid "%s is video calling you, do you want to answer?"
+msgstr "你確å®?è¦?å? å?¥å½±ç??æª?æ¡?ã??%sã??ï¼?"
+
+#: ../src/empathy-event-manager.c:350
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s è¦?è??ä½ é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:372
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:378
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:495
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Incoming video call from %s"
+msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
+
+#: ../src/empathy-event-manager.c:495
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:541
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å?¨é??è«?ä½ "
 
-#: ../src/empathy-event-manager.c:503
+#: ../src/empathy-event-manager.c:547
 msgid "An external application will be started to handle it."
 msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:552
 msgid "You don't have the needed external application to handle it."
 msgstr "ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:680
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:691
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:696
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:735
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:761
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:941
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid ""
 "\n"
@@ -2235,117 +2723,117 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:985
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:1001
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æ­£å?¨æ?¥æ?¶ %2$s é??å?ºç??ã??%1$sã??"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å¾? %2$s æ?¥æ?¶ã??%1$sã??æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "å?³é??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã??%sã??æ?¥æ?¶è?ª %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??è??è??ç??å??æ??"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
 msgid "Remaining"
 msgstr "��"
 
@@ -2368,15 +2856,15 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:290
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
 msgid "Source"
 msgstr "��"
 
@@ -2385,67 +2873,22 @@ msgstr "��"
 msgid "%s account"
 msgstr "%s 帳è??"
 
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "編輯帳è??(_E)"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "網絡�誤"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "é©?è­?失æ??"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "å? å¯?ç?¼ç??é?¯èª¤"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "使ç?¨ä¸­ç??å??稱"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "æ²?æ??æ??ä¾?è­?æ?¸"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "���被信任"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "è­?æ?¸å·²é?¾æ??"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "����使�"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "è­?æ?¸ä¸»æ©?å??稱ä¸?符"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "è­?æ?¸æ??ç´?æª?ä¸?符"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
+#: ../src/empathy-main-window.c:431
+#, fuzzy
+msgid "Reconnect"
+msgstr "已��"
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "���誤"
+#: ../src/empathy-main-window.c:438
+#, fuzzy
+msgid "Edit Account"
+msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
+#: ../src/empathy-main-window.c:445
+#, fuzzy
+msgid "Close"
+msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1331
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -2473,67 +2916,79 @@ msgstr "管ç??å??好"
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#, fuzzy
+msgid "New _Call..."
+msgstr "æ??å?ºæ?°é?»è©±"
+
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大��大頭貼(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "P_references"
+msgstr "å??好設å®?(_R)"
+
+#: ../src/empathy-main-window.ui.h:10
+#, fuzzy
+#| msgid "Protocol"
+msgid "Show P_rotocols"
+msgstr "顯示æ??示"
+
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "æ ¹æ??å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "æ ¹æ??ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Join..."
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
+#: ../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:21
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "å??人è³?æ??(_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "��次�話(_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
 msgid "Members"
 msgstr "æ??å?¡"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
 msgctxt ""
 msgid ""
@@ -2548,16 +3003,16 @@ msgstr ""
 "é??è¦?å¯?碼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??天室æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ­¢å??å?ºè??天室æ¸?å?®"
 
@@ -2621,126 +3076,128 @@ msgid "Language"
 msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "å??許使ç?¨ _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "å??許使ç?¨æµ?å??é?»è©±(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "å??許使ç?¨ç¶²çµ¡(_N)"
-
-#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
 msgid "Automatically _connect on startup "
 msgstr "å??å??æ??è?ªå??é?£ç·?(_C)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "è¡?ç?º"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
 msgid "Chat Th_eme:"
 msgstr "è??天ä½?æ?¯ä¸»é¡?(_E):"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?èª?è¨?ï¼?"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue 設��"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:13
+#, fuzzy
+msgid "Location sources:"
+msgstr "�設��"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Play sound for events"
 msgstr "æ?­æ?¾äº?件é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??GPS ç??座æ¨?æº?確度å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "å°?表æ??符è??以å??ç??顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??天室顯示è?¯çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "��檢���"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºä½ å·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "��主�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "æµ?å??é?»è©±(_C)"
+
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+#, fuzzy
+msgid "_Network (IP, Wifi)"
+msgstr "Metricom Starmode IP"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天(_O)"
@@ -2753,11 +3210,15 @@ msgstr "å°?æ??ç??è?¯çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:179
+msgid "Respond"
+msgstr "å??æ??"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
@@ -2777,65 +3238,161 @@ msgstr "æ??æ??å?ºæ??å?? %s ç??é??è«?ï¼?ä½?æ?¯ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "�誤"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "å?´é??"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "è­¦å??"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1063
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1185
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1265
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1277
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1297
+msgid "Debug"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1303
+msgid "Info"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+msgid "Message"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1315
+msgid "Warning"
+msgstr "è­¦å??"
+
+#: ../src/empathy-debug-window.c:1321
+msgid "Critical"
+msgstr "å?´é??"
+
+#: ../src/empathy-debug-window.c:1327
+msgid "Error"
+msgstr "�誤"
+
+#: ../src/empathy-debug-window.c:1346
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1349
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1351
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1353
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1385
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? ç«¯å?µé?¯æ?´å??å??è?½ã??"
+
+#~ msgid "C_all"
+#~ msgstr "é??話(_A)"
+
+#~ msgid "_Next"
+#~ msgstr "ä¸?ä¸?å??(_N)"
+
+#~ msgid "Add new"
+#~ msgstr "å? å?¥æ?°ç??"
+
+#~ msgid "Cr_eate"
+#~ msgstr "建�(_E)"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
+
+#~ msgid "account"
+#~ msgstr "帳è??"
+
+#~ msgid "No error specified"
+#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
+
+#~ msgid "Unknown error"
+#~ msgstr "ä¸?æ??ç??é?¯èª¤"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
+
+#~ msgid "Unsupported command"
+#~ msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "檢è¦?å??ä¸?次è«?話(_V)"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??é?£çµ¡äººã??ç??空代表ä¸?顯示é?£çµ¡äººã??"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "æ­¤é?£çµ¡äººç??大頭貼è¨?è??ã??ç??空代表é?£çµ¡äººæ²?æ??大頭貼ã??"
+
+#~ msgid "Talk!"
+#~ msgstr "�話�"
+
+#~ msgid "_Information"
+#~ msgstr "��(_I)"
+
+#~ msgid "_Preferences"
+#~ msgstr "å??好設å®?(_P)"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "è«?設å®?é?£çµ¡äººã??"
+
+#~ msgid "Select contact..."
+#~ msgstr "é?¸æ??é?£çµ¡äºº..."
+
+#~ msgid "Presence"
+#~ msgstr "ä¸?ç·?ç??æ??"
+
+#~ msgid "Set your own presence"
+#~ msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "æ?¨å?³å°?移é?¤æ?¨ç?? %s 帳è??ï¼?\n"
+#~ "確��繼��"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "å¦?æ??æ?¨æ±ºå®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
+#~ "\n"
+#~ "ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "�話 (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "�絡人(_C)"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "å??許使ç?¨ _GPS"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "å??許使ç?¨è¡?å??é?»è©±(_C)"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "å??許使ç?¨ç¶²è·¯(_N)"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue 設��"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f252304..d8c49af 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,14 +3,15 @@
 # Abel Cheung <abel oaka org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
 # Tryneeds translation team, 2009.
+# Cheng-Chia Tseng <pswo10680 gmail com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 19:38+0800\n"
-"PO-Revision-Date: 2009-09-13 07:50+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2009-12-26 18:57+0800\n"
+"PO-Revision-Date: 2009-12-26 08:08+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,7 +62,8 @@ msgid "Connection managers should be used"
 msgstr "使ç?¨é?£ç·?管ç??ç¨?å¼?"
 
 #: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
+#, fuzzy
+msgid "Contact list sort criterion"
 msgstr "é?£çµ¡äººæ¸?å?®æ??åº?æ¢?件"
 
 #: ../data/empathy.schemas.in.h:8
@@ -217,205 +219,216 @@ msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
 #: ../data/empathy.schemas.in.h:46
+#, fuzzy
+#| msgid "Protocol"
+msgid "Show protocols"
+msgstr "å®?å?¨å¼?é??è¨?å??å®?"
+
+#: ../data/empathy.schemas.in.h:47
 msgid "Spell checking languages"
 msgstr "��檢���"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??大頭貼å??ç??ç??ç?®é??ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:50
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:51
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:52
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:53
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:54
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether or not Empathy can publish the user's location to his contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether or not Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether or not Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not Empathy should reduce the location's accuracy for privacy "
 "reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?æ¬?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次å?·è¡?æ??建ç«? Salut 帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "æ?¯å?¦ä»¥æ?¨è¨­å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?¥ç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:68
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?ºç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ç?¶ç?»å?¥ç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ç?¶ç?»å?ºç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:75
 msgid "Whether or not to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when a contact goes offline."
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether or not to show a popup notification when a contact goes online."
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:78
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:79
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:80
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示é?£çµ¡äººå¤§é ­è²¼ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether or not to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:83
+#, fuzzy
+#| msgid ""
+#| "Whether or not to show avatars for contacts in the contact list and chat "
+#| "windows."
+msgid "Whether or not to show protocols for contacts in the contact list."
+msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
+
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether or not to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "使ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??æ?¯å?¦é¡¯ç¤ºè¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:87
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:88
+#, fuzzy
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
+"Which criterion to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
 "æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æ¢?件ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??"
 "è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-account.c:1158
-msgid "Can't set an empty display name"
-msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
-
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
@@ -432,7 +445,7 @@ msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
 msgid "People nearby"
 msgstr "��人�"
 
@@ -464,39 +477,99 @@ msgstr "å??試å?³è¼¸æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
 msgid "Unknown reason"
 msgstr "ä¸?æ??ç??å??å? "
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:238
 msgid "Available"
 msgstr "æ??空"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:240
 msgid "Busy"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:243
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:245
 msgid "Hidden"
 msgstr "é?±è??"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:247
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:286
+#, fuzzy
+#| msgid "No reason was specified"
+msgid "No reason specified"
+msgstr "æ²?æ??æ??å®?å??å? "
+
+#: ../libempathy/empathy-utils.c:288
+#, fuzzy
+#| msgid "%s has disconnected"
+msgid "User requested disconnect"
+msgstr "中æ?·é?¸å??ç??è£?ç½®"
+
+#: ../libempathy/empathy-utils.c:290
+msgid "Network error"
+msgstr "網路�誤"
+
+#: ../libempathy/empathy-utils.c:292
+msgid "Authentication failed"
+msgstr "é©?è­?失æ??"
+
+#: ../libempathy/empathy-utils.c:294
+msgid "Encryption error"
+msgstr "å? å¯?ç?¼ç??é?¯èª¤"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "Name in use"
+msgstr "使ç?¨ä¸­ç??å??稱"
+
+#: ../libempathy/empathy-utils.c:298
+msgid "Certificate not provided"
+msgstr "æ²?æ??æ??ä¾?æ??è­?"
+
+#: ../libempathy/empathy-utils.c:300
+msgid "Certificate untrusted"
+msgstr "æ??è­?ä¸?被信任"
+
+#: ../libempathy/empathy-utils.c:302
+msgid "Certificate expired"
+msgstr "æ??è­?å·²é?¾æ??"
+
+#: ../libempathy/empathy-utils.c:304
+msgid "Certificate not activated"
+msgstr "æ??è­?å°?æ?ªä½¿ç?¨"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Certificate hostname mismatch"
+msgstr "æ??è­?主æ©?å??稱ä¸?符"
+
+#: ../libempathy/empathy-utils.c:308
+msgid "Certificate fingerprint mismatch"
+msgstr "æ??è­?æ??ç´?æª?ä¸?符"
+
+#: ../libempathy/empathy-utils.c:310
+msgid "Certificate self-signed"
+msgstr "æ??è­?ç?ºè?ªæ??簽署"
+
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate error"
+msgstr "æ??è­?é?¯èª¤"
+
+#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "��人�"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:429
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:386
+#: ../libempathy/empathy-utils.c:430
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -540,20 +613,65 @@ msgstr[0] "%d å??æ??以å??"
 msgid "in the future"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:450
 msgid "All"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:430
-#: ../libempathy-gtk/empathy-account-widget.c:486
+#: ../libempathy-gtk/empathy-account-widget.c:527
+#: ../libempathy-gtk/empathy-account-widget.c:583
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1264
+#: ../libempathy-gtk/empathy-account-widget.c:1320
+msgid "L_og in"
+msgstr "��(_O)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../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:1398
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1460
+#, fuzzy
+#| msgid "This will not remove your account on the server."
+msgid "This account already exists on the server"
+msgstr "é??ä¸?æ??移é?¤æ?¨å?¨ä¼ºæ??å?¨ä¸?æ??æ??æ??ç??帳æ?¶ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1463
+#, fuzzy
+#| msgid "_Create a new account"
+msgid "Create a new account on the server"
+msgstr "å?¨é?¸å??ç??è£?ç½®ä¸?建ç«?æ?°ç??æª?æ¡?系統"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:1846
+#, 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:1864
+#, c-format
+msgid "%s Account"
+msgstr "%s 帳è??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1868
+msgid "New account"
+msgstr "æ?°å¢?帳è??"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
 msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
@@ -565,7 +683,7 @@ msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "é?²é??"
@@ -575,7 +693,7 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "�碼(_W):"
@@ -655,6 +773,46 @@ msgstr "編碼(_C):"
 msgid "New Network"
 msgstr "�網路"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#, fuzzy
+#| msgid "_About"
+msgid "Auto"
+msgstr "è?ªå??"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#, fuzzy
+#| msgid "Western"
+msgid "Register"
+msgstr "æ?«å­?å?¨"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#, fuzzy
+msgid "Options"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#, fuzzy
+#| msgid "No"
+msgid "None"
+msgstr "ï¼?ç?¡ï¼?"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "編碼:"
@@ -780,31 +938,125 @@ msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??稱(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#, fuzzy
+msgid "<b>Keep-Alive Options</b>"
+msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#, fuzzy
+#| msgid "<b>Location</b>"
+msgid "<b>Miscellaneous Options</b>"
+msgstr "����"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#, fuzzy
+msgid "<b>NAT Traversal Options</b>"
+msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#, fuzzy
+#| msgid "<b>Location</b>"
+msgid "<b>Proxy Options</b>"
+msgstr "����"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
 msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "�索 STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#, fuzzy
+#| msgid "Authentication failed"
+msgid "Authentication username:"
+msgstr "伺æ??å?¨ä½¿ç?¨è??å??稱"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#, fuzzy
+#| msgid "Discover STUN"
+msgid "Discover Binding"
+msgstr "æ??é?µçµ?å??"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Discover the STUN server automatically"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Hostname of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#, fuzzy
+msgid "Interval (seconds)"
+msgstr "æ?´æ?°é??é??(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid ""
+"Look up the DNS SRV record at the service's domain for the host name of a "
+"STUN server."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#, fuzzy
+msgid "Loose Routing"
+msgstr "路�表��"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#, fuzzy
+msgid "Mechanism:"
+msgstr "SASL æ©?å?¶"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Port of the proxy for outbound requests."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#, fuzzy
+#| msgid "_Port:"
+msgid "Port:"
+msgstr "���(_P):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺æ??å?¨:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN é??è¨?å? :"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#, fuzzy
+#| msgid "_Server:"
+msgid "Server:"
+msgstr "<b>伺æ??å?¨</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid ""
+"The username for SIP authentication, if different from the SIP URI\n"
+"username."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#, fuzzy
+#| msgid "STUN port:"
+msgid "Transport:"
+msgstr "å?³é??(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid ""
+"Update the registration binding if the external address for the client is "
+"discovered to be different from the local binding."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid ""
+"Use the loose routing behavior and the Route header as recommended in RFC "
+"3261."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP 帳è??å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
 msgid "What is your SIP login ID?"
 msgstr "æ?¨æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
 msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
@@ -841,91 +1093,171 @@ msgstr "ç?¡æ³?è½?æ??å??ç??"
 msgid "None of the accepted image formats is supported on your system"
 msgstr "æ?¨ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:915
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??æ?¨ç??大頭貼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:918
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:980
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:984
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:327
 msgid "Click to enlarge"
 msgstr "è«?æ??é??裡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:186
+#: ../libempathy-gtk/empathy-chat.c:199
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:403
-msgid "Unsupported command"
-msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+#: ../libempathy-gtk/empathy-chat.c:621
+#, fuzzy
+msgid "Failed to join chatroom"
+msgstr ""
+"ç?¡æ³?å? å?¥é??æ?²æ¡?ã??\n"
+"中止å? å?¥ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:639
+#, fuzzy
+msgid "Failed to open private chat"
+msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
+
+#: ../libempathy-gtk/empathy-chat.c:678
+#, fuzzy
+msgid "Topic not supported on this conversation"
+msgstr "é??å?°å?°è¡¨æ©?ä¸?æ?¯æ?´å??å?°ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:684
+#, fuzzy
+msgid "You are not allowed to change the topic"
+msgstr "æ?¨ä¸?å??許å­?å??系統設å®?ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:802
+msgid "/clear, clear all messages from the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:805
+#, fuzzy
+msgid "/topic <topic>, set the topic of the current conversation"
+msgstr "設å®?ç?ºç?®å??é ?é?¢(_P)"
+
+#: ../libempathy-gtk/empathy-chat.c:808
+#, fuzzy
+msgid "/join <chatroom id>, join a new chatroom"
+msgstr "建ç«?æ?°ç??使ç?¨è?? ID"
+
+#: ../libempathy-gtk/empathy-chat.c:811
+#, fuzzy
+msgid "/j <chatroom id>, join a new chatroom"
+msgstr "建ç«?æ?°ç??使ç?¨è?? ID"
+
+#: ../libempathy-gtk/empathy-chat.c:814
+msgid "/query <contact id> [<message>], open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:817
+msgid "/msg <contact id> <message>, open a private chat"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:820
+msgid "/nick <nickname>, change your nickname on current server"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:823
+msgid "/me <message>, send an ACTION message to the current conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:826
+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 chatroom\""
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid ""
+"/help [<command>], show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:841
+#, fuzzy, c-format
+msgid "Usage: %s"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-chat.c:870
+#, fuzzy
+msgid "Unknown command"
+msgstr "ä¸?æ??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:535
+#: ../libempathy-gtk/empathy-chat.c:991
+msgid "Unknown command, see /help for the available commands"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1130
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:538
+#: ../libempathy-gtk/empathy-chat.c:1133
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:541
+#: ../libempathy-gtk/empathy-chat.c:1136
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:544
+#: ../libempathy-gtk/empathy-chat.c:1139
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:547
+#: ../libempathy-gtk/empathy-chat.c:1142
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:550
+#: ../libempathy-gtk/empathy-chat.c:1145
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1149
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:584
+#: ../libempathy-gtk/empathy-chat.c:1179
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:1181
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:956
+#: ../libempathy-gtk/empathy-chat.c:1554
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1010
+#: ../libempathy-gtk/empathy-chat.c:1608
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1494
+#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1657
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1660
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1775
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -933,12 +1265,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:1184
+#: ../libempathy-gtk/empathy-chat.c:1782
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1785
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -946,17 +1278,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:1195
+#: ../libempathy-gtk/empathy-chat.c:1793
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1796
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1202
+#: ../libempathy-gtk/empathy-chat.c:1800
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -966,61 +1298,85 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:1809
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1234
+#: ../libempathy-gtk/empathy-chat.c:1834
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1859
+#, fuzzy, c-format
+#| msgid "%s is now online."
+msgid "%s is now known as %s"
+msgstr "����(_U)"
+
+#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1803
+#: ../libempathy-gtk/empathy-chat.c:2521
+#, fuzzy
+msgid "Wrong password; please try again:"
+msgstr "è«?使ç?¨ä¸?å??ç??å¯?碼å??試ä¸?次ã??"
+
+#: ../libempathy-gtk/empathy-chat.c:2522
+#, fuzzy
+msgid "Retry"
+msgstr "é??試(_R)"
+
+#: ../libempathy-gtk/empathy-chat.c:2527
+msgid "This room is protected by a password:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:2528
+#, fuzzy
+msgid "Join"
+msgstr "å? å?¥"
+
+#: ../libempathy-gtk/empathy-chat.c:2668
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1853
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:2721
+#: ../libempathy-gtk/empathy-log-window.c:546
 msgid "Conversation"
 msgstr "�話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
 msgid "Topic:"
 msgstr "主�:"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:276
+#: ../libempathy-gtk/empathy-chat-text-view.c:317
+#: ../libempathy-gtk/empathy-theme-adium.c:817
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:284
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:824
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:422
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1032,37 +1388,37 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1557
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1559
 msgid "Removing group"
 msgstr "正�移�群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1606
+#: ../libempathy-gtk/empathy-contact-list-view.c:1683
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1636
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contact..."
 msgstr "���絡人(_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??天(_C)"
 
@@ -1077,8 +1433,9 @@ msgid "_Video Call"
 msgstr "è¦?è¨?é??話(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "檢è¦?å??ä¸?次è«?話(_V)"
+#: ../src/empathy-main-window.ui.h:26
+msgid "_Previous Conversations"
+msgstr "��次�話(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
@@ -1093,15 +1450,18 @@ msgid "Infor_mation"
 msgstr "��(_M)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "é??è«?å?°é??å??è??天室"
+#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../src/empathy-chat-window.c:864
+#, fuzzy
+#| msgid "Inviting to this room"
+msgid "Inviting you to this room"
+msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
+#: ../libempathy-gtk/empathy-contact-menu.c:527
 msgid "_Invite to chatroom"
 msgstr "é??è«?å?°é??å??è??天室(_I)"
 
@@ -1117,120 +1477,120 @@ msgstr "��大頭貼"
 msgid "Unable to save avatar"
 msgstr "����大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
+#: ../libempathy-gtk/empathy-contact-widget.c:1010
+#: ../src/empathy-main-window.c:1038
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1261
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1263
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1265
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1267
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1269
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1271
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1273
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1275
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1277
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1279
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1281
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1283
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1285
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1287
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1289
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1291
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·®ï¼?å?¬å°ºï¼?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1293
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差��尺��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1295
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1297
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1299
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1301
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1303
 msgid "Longitude:"
 msgstr "�度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:1305
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:1307
 msgid "Altitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
+#: ../libempathy-gtk/empathy-contact-widget.c:1368
 msgid "<b>Location</b>"
 msgstr "<b>ä½?ç½®</b>"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:1381
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1431
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
@@ -1238,13 +1598,6 @@ msgstr "%B %e, %Y æ?¼ %R UTC"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-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-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "å?¥å??:"
@@ -1262,7 +1615,7 @@ msgid "Client:"
 msgstr "客�端:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
+#: ../src/empathy-main-window.c:1021
 msgid "Contact"
 msgstr "�絡人"
 
@@ -1314,28 +1667,28 @@ msgstr "網�:"
 msgid "_Add Group"
 msgstr "��群�(_G)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:556
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1355,56 +1708,74 @@ msgstr "æ??å°?"
 msgid "_For:"
 msgstr "æ??å°?(_F):"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "é??話(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "�絡人 ID:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:144
 msgid "C_hat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "�絡人 ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:154
 msgid "New Conversation"
 msgstr "���話"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#, fuzzy
+#| msgid "Send video"
+msgid "Send _Video"
+msgstr "å?³é??è¦?è¨?"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../src/empathy-call-window.ui.h:17
+msgid "_Call"
+msgstr "é??話(_C)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#, fuzzy
+#| msgid "Call"
+msgid "New Call"
+msgstr "æ??å?ºæ?°é?»è©±"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message..."
 msgstr "����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages..."
 msgstr "編輯����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to remove this status as a favorite"
 msgstr "æ??é??裡å°?é??å??ç??æ??å¾?å??好中移é?¤"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:353
 msgid "Click to make this status a favorite"
 msgstr "æ??é??裡å°?é??å??ç??æ??設ç?ºå??好"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "設å®?ç??æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:896
 msgid "Set your presence and current status"
 msgstr "設å®?æ?¨ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1083
 msgid "Custom messages..."
 msgstr "����..."
 
@@ -1448,11 +1819,11 @@ msgstr "æ?­å?ºèª?é?³é??話"
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "輸�����"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "編輯����"
 
@@ -1480,15 +1851,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1396
+#: ../libempathy-gtk/empathy-ui-utils.c:1519
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1486
+#: ../libempathy-gtk/empathy-ui-utils.c:1649
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1546
+#: ../libempathy-gtk/empathy-ui-utils.c:1709
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -1659,75 +2030,44 @@ msgstr "西��系"
 msgid "Vietnamese"
 msgstr "è¶?å??æ??"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??é?£çµ¡äººã??ç??空代表ä¸?顯示é?£çµ¡äººã??"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "æ­¤é?£çµ¡äººç??大頭貼è¨?è??ã??ç??空代表é?£çµ¡äººæ²?æ??大頭貼ã??"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "話�"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "�話�"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "é??æ?¼(_A)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "��(_I)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "å??好設å®?(_P)"
-
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "è«?設å®?é?£çµ¡äººã??"
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "é?¸æ??é?£çµ¡äºº..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "ä¸?ç·?ç??æ??"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
-
-#: ../src/empathy.c:742
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+#, fuzzy
+msgid "The contact selected cannot receive files."
+msgstr "æ??é?¸ç??æª?æ¡?ç?¡æ³?移è?³å??æ?¶ç­?ã??"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+#, fuzzy
+msgid "The contact selected is offline."
+msgstr "�端主�����"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#, fuzzy
+msgid "No error message"
+msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#, fuzzy
+msgid "Instant Message (Empathy)"
+msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
+
+#: ../src/empathy.c:893
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:746
-msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:897
+#, fuzzy
+msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®"
 
-#: ../src/empathy.c:750
+#: ../src/empathy.c:901
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:913
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM 客�端��"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:84
 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 "
@@ -1738,7 +2078,7 @@ msgstr ""
 "ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?"
 "é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:88
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1748,7 +2088,7 @@ msgstr ""
 "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:92
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1758,11 +2098,11 @@ msgstr ""
 "給� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:120
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:126
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1812,37 +2152,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:321
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:506
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:393
+#: ../src/empathy-account-assistant.c:403
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:399
+#: ../src/empathy-account-assistant.c:409
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:405
+#: ../src/empathy-account-assistant.c:415
 msgid "Enter your account details"
 msgstr "è«?輸å?¥æ?¨ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:410
+#: ../src/empathy-account-assistant.c:420
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:426
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:423
+#: ../src/empathy-account-assistant.c:433
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:509
+#: ../src/empathy-account-assistant.c:519
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1853,77 +2192,94 @@ msgstr ""
 "Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?"
 "èª?é?³æ??è¦?è¨?é??話ã??"
 
-#: ../src/empathy-account-assistant.c:526
+#: ../src/empathy-account-assistant.c:536
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:549
+#: ../src/empathy-account-assistant.c:559
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:570
+#: ../src/empathy-account-assistant.c:580
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:592
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:612
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:623
+#: ../src/empathy-account-assistant.c:633
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:710
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:717
+#: ../src/empathy-account-assistant.c:727
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:910
+#: ../src/empathy-account-assistant.c:920
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:919
+#: ../src/empathy-account-assistant.c:929
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modification regarding your %s account."
 msgstr "é??æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 
-#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../src/empathy-accounts-dialog.c:236
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s ç?? %1$s"
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr ""
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../src/empathy-accounts-dialog.c:248
-#, c-format
-msgid "%s Account"
-msgstr "%s 帳è??"
+#: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
+msgid "Connecting..."
+msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:252
-msgid "New account"
-msgstr "æ?°å¢?帳è??"
+#: ../src/empathy-accounts-dialog.c:259
+#, fuzzy, c-format
+#| msgid "Disconnected"
+msgid "Disconnected - %s"
+msgstr "ã??%sã??å·²æ?·ç·?"
+
+#: ../src/empathy-accounts-dialog.c:264
+#, fuzzy, c-format
+#| msgid "Offline"
+msgid "Offline - %s"
+msgstr "��"
+
+#: ../src/empathy-accounts-dialog.c:277
+#, fuzzy
+msgid "Offline - No Network Connection"
+msgstr "æ?¾ä¸?å?°ç¶²è·¯è¨­å??"
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:285
+#, fuzzy
+#| msgid "Unknown reason"
+msgid "Unknown Status"
+msgstr "é?»æ± ç??æ??ä¸?詳"
+
+#: ../src/empathy-accounts-dialog.c:296
+#, fuzzy
+msgid "Offline - Account disabled"
+msgstr "æº?å??帳è??ã??%sã??é?¢ç·?å·¥ä½?"
+
+#: ../src/empathy-accounts-dialog.c:645
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1931,28 +2287,16 @@ msgstr ""
 "æ?¨å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:934
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"æ?¨å?³å°?移é?¤æ?¨ç?? %s 帳è??ï¼?\n"
-"確��繼��"
+msgid "Do you want to remove %s from your computer?"
+msgstr "æ?¨æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸­ç§»é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:792
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"å¦?æ??æ?¨æ±ºå®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
-"\n"
-"ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
+#: ../src/empathy-accounts-dialog.c:938
+msgid "This will not remove your account on the server."
+msgstr "é??ä¸?æ??移é?¤æ?¨å?¨ä¼ºæ??å?¨ä¸?æ??æ??æ??ç??帳æ?¶ã??"
 
-#: ../src/empathy-accounts-dialog.c:980
+#: ../src/empathy-accounts-dialog.c:1120
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1960,7 +2304,7 @@ msgstr ""
 "æ?¨å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1537
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -1973,127 +2317,247 @@ msgid "Accounts"
 msgstr "帳è??"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "å? å?¥æ?°ç??"
+msgid "No protocol installed"
+msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "建�(_E)"
+#, fuzzy
+#| msgid "Protocol"
+msgid "Protocol:"
+msgstr "é??è¨?å??å®?(_P):"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?æ?¨å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "_Add..."
 msgstr "å? å?¥(_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "建ç«?æ?°ç??使ç?¨è??帳è??(_C)"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "帳è??"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#, fuzzy
+msgid "_Import..."
+msgstr "��(_I)..."
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:453
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:456
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:459
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:567
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "��中..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1022
 msgid "_Sidebar"
 msgstr "å?´é??å??(_S)"
 
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:1041
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1047
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1051
 msgid "Video input"
 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:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1116
 #, 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:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1197
 msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1437
+#: ../src/empathy-call-window.c:1700
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
+#: ../src/empathy-call-window.c:1761
+#, fuzzy
+msgid "Technical Details"
+msgstr "<b>æ??è¡?è³?æ??ï¼?</b>"
+
+#: ../src/empathy-call-window.c:1799
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1804
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1810
+#, 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 ""
+
+#: ../src/empathy-call-window.c:1816
+msgid "There was a failure on the network"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1820
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1823
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1833
+#, c-format
+msgid ""
+"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+
+#: ../src/empathy-call-window.c:1841
+msgid "There was a failure in the call engine"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1880
+msgid "Can't establish audio stream"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1890
+msgid "Can't establish video stream"
+msgstr ""
+
 #: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
-msgstr "æ??æ?·"
+#, fuzzy
+#| msgid "Compact contact list"
+msgid "Call the contact again"
+msgstr "Bourne Again Shell"
 
 #: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "é??æ?¥"
+#, fuzzy
+msgid "Camera Off"
+msgstr "Eight Off"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "å?³é??é?³è¨?"
+#, fuzzy
+msgid "Camera On"
+msgstr "%s (已��)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "å?³é??è¦?è¨?"
+msgid "Disable camera and stop sending video"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "���覽"
+msgid "Enable camera and send video"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "é??話(_C)"
+msgid "Enable camera but don't send video"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Hang up"
+msgstr "æ??æ?·"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Hang up current call"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:9
+#, fuzzy
+#| msgid "Video preview"
+msgid "Preview"
+msgstr "�覽"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Redial"
+msgstr "é??æ?¥"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Send Audio"
+msgstr "å?³é??é?³è¨?"
+
+#: ../src/empathy-call-window.ui.h:12
+#, fuzzy
+msgid "Toggle audio transmission"
+msgstr "å??æ??å¾? %s é??é?³"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:13
+msgid "V_ideo"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+#| msgid "Video input"
+msgid "Video Off"
+msgstr "Eight Off"
+
+#: ../src/empathy-call-window.ui.h:15
+#, fuzzy
+#| msgid "Video input"
+msgid "Video On"
+msgstr "%s (已��)"
+
+#: ../src/empathy-call-window.ui.h:16
+#, fuzzy
+#| msgid "Video preview"
+msgid "Video Preview"
+msgstr "å½±ç??é ?覽ç??é«?度"
+
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:343
-#, c-format
-msgid "Conversations (%d)"
-msgstr "�話 (%d)"
-
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#, fuzzy, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "��"
+
+#: ../src/empathy-chat-window.c:447
+#, fuzzy, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "å?¶å®?é??æ?²å??"
+
+#: ../src/empathy-chat-window.c:463
+#, fuzzy, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "é??æ??å¾?å¤?人..."
+
+#: ../src/empathy-chat-window.c:472
+#, fuzzy, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "顯示æ??æ??å·¥ä½?å??中ç??è¦?çª?"
+
+#: ../src/empathy-chat-window.c:683
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2102,70 +2566,76 @@ msgid "C_lear"
 msgstr "��(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+msgid "C_ontact"
+msgstr "�絡人"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "è??天"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+#, fuzzy
+msgid "Invite _Participant..."
+msgstr "å?ºå¸­è??"
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "å°?å??é ?左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "å°?å??é ?å?³ç§»(_R)"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "�絡人(_C)"
-
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Conversation"
 msgstr "�話(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chatroom"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "ä¸?å??å??é ?(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Previous Tab"
 msgstr "ä¸?å??å??é ?(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "顯示�絡人��(_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:17
 msgid "_Tabs"
 msgstr "å??é ?(_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:256
 msgid "Name"
 msgstr "å??稱"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:274
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:282
 msgid "Auto-Connect"
 msgstr "è?ªå??é?£ç·?"
 
@@ -2173,75 +2643,93 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:345
+#, fuzzy
+#| msgid "Incoming voice call"
+msgid "Incoming video call"
+msgstr "ä¾?é?»ç??è?²é?³"
+
+#: ../src/empathy-event-manager.c:345
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:349
+#, fuzzy, c-format
+#| msgid "%s is calling you, do you want to answer?"
+msgid "%s is video calling you, do you want to answer?"
+msgstr "æ?¨ç¢ºå®?è¦?å? å?¥å½±ç??æª?æ¡?ã??%sã??ï¼?"
+
+#: ../src/empathy-event-manager.c:350
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s è¦?è??æ?¨é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:372
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:378
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:495
+#, fuzzy, c-format
+#| msgid "Incoming call from %s"
+msgid "Incoming video call from %s"
+msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
+
+#: ../src/empathy-event-manager.c:495
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:541
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å?¨é??è«?æ?¨"
 
-#: ../src/empathy-event-manager.c:503
+#: ../src/empathy-event-manager.c:547
 msgid "An external application will be started to handle it."
 msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:552
 msgid "You don't have the needed external application to handle it."
 msgstr "æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:680
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:691
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:696
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:735
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:761
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:941
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid ""
 "\n"
@@ -2251,117 +2739,117 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:985
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:1001
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:100
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:103
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:179
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:275
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:306
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æ­£å?¨æ?¥æ?¶ %2$s é??å?ºç??ã??%1$sã??"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:309
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:339
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å¾? %2$s æ?¥æ?¶ã??%1$sã??æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:342
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:347
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:350
 msgid "Error sending a file"
 msgstr "å?³é??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:489
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã??%sã??æ?¥æ?¶è?ª %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:494
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:497
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??è??è??ç??å??æ??"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:991
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1003
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1025
 msgid "Remaining"
 msgstr "��"
 
@@ -2384,15 +2872,15 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:290
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:299
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:323
 msgid "Source"
 msgstr "��"
 
@@ -2401,67 +2889,22 @@ msgstr "��"
 msgid "%s account"
 msgstr "%s 帳è??"
 
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "編輯帳è??(_E)"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "網路�誤"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "é©?è­?失æ??"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "å? å¯?ç?¼ç??é?¯èª¤"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "使ç?¨ä¸­ç??å??稱"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "æ²?æ??æ??ä¾?æ??è­?"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "æ??è­?ä¸?被信任"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "æ??è­?å·²é?¾æ??"
-
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "æ??è­?å°?æ?ªä½¿ç?¨"
-
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "æ??è­?主æ©?å??稱ä¸?符"
-
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "æ??è­?æ??ç´?æª?ä¸?符"
-
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "æ??è­?ç?ºè?ªæ??簽署"
+#: ../src/empathy-main-window.c:431
+#, fuzzy
+msgid "Reconnect"
+msgstr "已��"
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "æ??è­?é?¯èª¤"
+#: ../src/empathy-main-window.c:438
+#, fuzzy
+msgid "Edit Account"
+msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "ä¸?æ??ç??é?¯èª¤"
+#: ../src/empathy-main-window.c:445
+#, fuzzy
+msgid "Close"
+msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1331
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -2489,67 +2932,79 @@ msgstr "管ç??å??好"
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#, fuzzy
+msgid "New _Call..."
+msgstr "æ??å?ºæ?°é?»è©±"
+
+#: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "正常大��大頭貼(_A)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+msgid "P_references"
+msgstr "å??好設å®?(_R)"
+
+#: ../src/empathy-main-window.ui.h:10
+#, fuzzy
+#| msgid "Protocol"
+msgid "Show P_rotocols"
+msgstr "顯示æ??示"
+
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Name"
 msgstr "ä¾?å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:12
 msgid "Sort by _Status"
 msgstr "ä¾?ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Join..."
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
+#: ../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:21
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "å??人è³?è¨?(_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "��次�話(_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-new-chatroom-dialog.c:338
 msgid "Chat Room"
 msgstr "è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:354
 msgid "Members"
 msgstr "æ??å?¡"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
 msgctxt ""
 "Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2565,16 +3020,16 @@ msgstr ""
 "é??è¦?å¯?碼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:541
+#: ../src/empathy-new-chatroom-dialog.c:542
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:569
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??天室æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:579
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ­¢å??å?ºè??天室æ¸?å?®"
 
@@ -2639,86 +3094,75 @@ msgid "Language"
 msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "å??許使ç?¨ _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "å??許使ç?¨è¡?å??é?»è©±(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "å??許使ç?¨ç¶²è·¯(_N)"
-
-#: ../src/empathy-preferences.ui.h:4
 msgid "Appearance"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:2
 msgid "Automatically _connect on startup "
 msgstr "å??å??æ??è?ªå??é?£ç·?(_C)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "è¡?ç?º"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:4
 msgid "Chat Th_eme:"
 msgstr "è??天ä½?æ?¯ä¸»é¡?(_E):"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?èª?è¨?ï¼?"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue 設��"
-
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:13
+#, fuzzy
+msgid "Location sources:"
+msgstr "�設��"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Play sound for events"
 msgstr "æ?­æ?¾äº?件é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:16
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -2727,40 +3171,53 @@ msgstr ""
 "é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??"
 "GPS ç??座æ¨?æº?確度å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "å°?表æ??符è??以å??ç??顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??天室顯示é?£çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "��檢���"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??裡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºæ?¨å·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "��主�"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "è¡?å??é?»è©±(_C)"
+
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+#, fuzzy
+msgid "_Network (IP, Wifi)"
+msgstr "Metricom Starmode IP"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天(_O)"
@@ -2773,11 +3230,15 @@ msgstr "å°?æ??ç??é?£çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:179
+msgid "Respond"
+msgstr "å??æ??"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç??æ??"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
@@ -2797,65 +3258,161 @@ msgstr "æ??æ??å?ºæ??å?? %s ç??é??è«?ï¼?ä½?æ?¯æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
-msgid "Error"
-msgstr "�誤"
-
-#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
-msgid "Critical"
-msgstr "å?´é??"
-
-#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
-msgid "Warning"
-msgstr "è­¦å??"
-
-#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
-#: ../src/empathy-debug-window.c:1111
-msgid "Message"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
-msgid "Info"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
-msgid "Debug"
-msgstr "��"
-
-#: ../src/empathy-debug-window.c:841
+#: ../src/empathy-debug-window.c:1063
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:944
+#: ../src/empathy-debug-window.c:1185
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1019
+#: ../src/empathy-debug-window.c:1265
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1031
+#: ../src/empathy-debug-window.c:1277
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1100
+#: ../src/empathy-debug-window.c:1297
+msgid "Debug"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1303
+msgid "Info"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+msgid "Message"
+msgstr "��"
+
+#: ../src/empathy-debug-window.c:1315
+msgid "Warning"
+msgstr "è­¦å??"
+
+#: ../src/empathy-debug-window.c:1321
+msgid "Critical"
+msgstr "å?´é??"
+
+#: ../src/empathy-debug-window.c:1327
+msgid "Error"
+msgstr "�誤"
+
+#: ../src/empathy-debug-window.c:1346
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1102
+#: ../src/empathy-debug-window.c:1349
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1104
+#: ../src/empathy-debug-window.c:1351
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1106
+#: ../src/empathy-debug-window.c:1353
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1138
+#: ../src/empathy-debug-window.c:1385
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? ç«¯å?µé?¯æ?´å??å??è?½ã??"
+
+#~ msgid "C_all"
+#~ msgstr "é??話(_A)"
+
+#~ msgid "_Next"
+#~ msgstr "ä¸?ä¸?å??(_N)"
+
+#~ msgid "Add new"
+#~ msgstr "å? å?¥æ?°ç??"
+
+#~ msgid "Cr_eate"
+#~ msgstr "建�(_E)"
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
+
+#~ msgid "account"
+#~ msgstr "帳è??"
+
+#~ msgid "No error specified"
+#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
+
+#~ msgid "Unknown error"
+#~ msgstr "ä¸?æ??ç??é?¯èª¤"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
+
+#~ msgid "Unsupported command"
+#~ msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "檢è¦?å??ä¸?次è«?話(_V)"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??é?£çµ¡äººã??ç??空代表ä¸?顯示é?£çµ¡äººã??"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "æ­¤é?£çµ¡äººç??大頭貼è¨?è??ã??ç??空代表é?£çµ¡äººæ²?æ??大頭貼ã??"
+
+#~ msgid "Talk!"
+#~ msgstr "�話�"
+
+#~ msgid "_Information"
+#~ msgstr "��(_I)"
+
+#~ msgid "_Preferences"
+#~ msgstr "å??好設å®?(_P)"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "è«?設å®?é?£çµ¡äººã??"
+
+#~ msgid "Select contact..."
+#~ msgstr "é?¸æ??é?£çµ¡äºº..."
+
+#~ msgid "Presence"
+#~ msgstr "ä¸?ç·?ç??æ??"
+
+#~ msgid "Set your own presence"
+#~ msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "æ?¨å?³å°?移é?¤æ?¨ç?? %s 帳è??ï¼?\n"
+#~ "確��繼��"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "å¦?æ??æ?¨æ±ºå®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
+#~ "\n"
+#~ "ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "�話 (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "�絡人(_C)"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "å??許使ç?¨ _GPS"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "å??許使ç?¨è¡?å??é?»è©±(_C)"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "å??許使ç?¨ç¶²è·¯(_N)"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue 設��"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]