[empathy] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Update Simplified Chinese translation.
Date: Thu, 3 Mar 2011 14:46:15 +0000 (UTC)
commit 1839a4f2675fea1855f8961ab7a263d54a5f4c4c
Author: liuzhen <liuzhen1191 gmail com>
Date:   Thu Mar 3 14:45:55 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 1258 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 711 insertions(+), 547 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1e6da00..4214de3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
-# Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Abel Cheung <maddog linux org hk>, 2003.
@@ -14,17 +14,18 @@
 # Tao Wei <weitao1979 gmail com>, 2009.
 # Tao Wang <dancefire gmail com>, 2010.
 # Dean Lee <xslidian gmail com>, 2010.
-# Aron Xu <happyaron xu gmail com>, 2009, 2010.
 # Yinghua Wang <wantinghard gmail com>, 2010
+# liuzhen <liuzhen1191 gmail com>, 2011.
+# Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2010-10-25 23:29+0000\n"
-"PO-Revision-Date: 2010-10-27 16:00+0000\n"
-"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2011-03-03 13:42+0000\n"
+"PO-Revision-Date: 2011-03-03 22:44+0800\n"
+"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -436,208 +437,213 @@ msgstr "ç®¡ç??æ¶?æ?¯å?? VoIP å¸?æ?·"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2242
 msgid "Messaging and VoIP Accounts"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
 
-#: ../libempathy/empathy-ft-handler.c:830
-msgid "The hash of the received file and the sent one do not match"
-msgstr "æ?¥æ?¶å?°ç??æ??ä»¶å??å??é??ç??é?£ä¸ªæ??ä»¶å??å¸?å?¼ä¸?å?¹é??"
+#: ../libempathy/empathy-ft-handler.c:825
+#, fuzzy
+#| msgid "File transfer completed"
+msgid "File transfer completed, but the file was corrupted"
+msgstr "æ??ä»¶ä¼ é??å®?æ??"
 
-#: ../libempathy/empathy-ft-handler.c:1122
+#: ../libempathy/empathy-ft-handler.c:1116
 msgid "File transfer not supported by remote contact"
 msgstr "æ??ä»¶ä¼ è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1172
 msgid "The selected file is not a regular file"
 msgstr "æ??é??æ??ä»¶æ?¯é??æ£å¸¸ç??æ??ä»¶"
 
-#: ../libempathy/empathy-ft-handler.c:1187
+#: ../libempathy/empathy-ft-handler.c:1181
 msgid "The selected file is empty"
 msgstr "æ??é??æ??ä»¶æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-file.c:283
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
 msgstr "ä¸?æ?¯æ?? Socket ç±»å??"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "é??è¦?ç?¶æ??æ?¹å??ä¿¡æ?¯"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "æ?¨å??æ¶?äº?æ??ä»¶ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "å?¦å¤?ç??å??ä¸?è??å??æ¶?äº?æ??ä»¶ç??ä¼ è¾?"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "å½?ä¼ è¾?è¿?ä¸ªæ??ä»¶ç??æ?¶å??å??ç??é??è¯¯"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¦å¤?ç??å??ä¸?è??æ? æ³?ä¼ è¾?è¿?ä¸ªæ??ä»¶"
 
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:305
 msgid "Available"
 msgstr "å?¨çº¿"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:307
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:310
 msgid "Away"
 msgstr "ç¦»å¼?"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:312
 msgid "Invisible"
 msgstr "é??èº«"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:314
 msgid "Offline"
 msgstr "ç¦»çº¿"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
-#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
-#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:316
+#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1898
+#: ../src/empathy-streamed-media-window.c:1899
+#: ../src/empathy-streamed-media-window.c:1900
+#: ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:355
 msgid "No reason specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
 msgid "Status is set to offline"
 msgstr "ç?¶æ??å·²è®¾ç½®ä¸ºç¦»çº¿"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
 msgid "Network error"
 msgstr "ç½?ç»?é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
 msgid "Authentication failed"
 msgstr "éª?è¯?å¤±è´¥"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
 msgid "Encryption error"
 msgstr "å? å¯?é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:365
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?è¢«å? ç?¨"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?ä¹¦"
 
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
 msgid "Certificate untrusted"
 msgstr "è¯?ä¹¦ä¸?è¢«ä¿¡ä»»"
 
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
 msgid "Certificate expired"
 msgstr "è¯?ä¹¦å·²è¿?æ??"
 
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
 msgid "Certificate not activated"
 msgstr "è¯?ä¹¦å°?æ?ªæ¿?æ´»"
 
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
 msgid "Certificate hostname mismatch"
 msgstr "è¯?ä¹¦ä¸»æ?ºå??ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?ä¹¦æ??çº¹ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
 msgid "Certificate self-signed"
 msgstr "è¯?ä¹¦æ?¯è?ªç¾å±?ç??"
 
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:381
 msgid "Certificate error"
 msgstr "è¯?ä¹¦é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:415
 msgid "Encryption is not available"
 msgstr "å? å¯?ä¸?å?¯ç?¨"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:417
 msgid "Certificate is invalid"
 msgstr "è¯?ä¹¦æ? æ??"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:419
 msgid "Connection has been refused"
 msgstr "è¿?æ?¥è¢«æ??ç»?"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:421
 msgid "Connection can't be established"
 msgstr "æ? æ³?å»ºç«?è¿?æ?¥"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:423
 msgid "Connection has been lost"
 msgstr "è¿?æ?¥å·²ä¸¢å¤±"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:425
 msgid "This resource is already connected to the server"
 msgstr "è¯¥èµ?æº?å·²è¢«è¿?æ?¥è?³æ??å?¡å?¨"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:427
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "è¿?æ?¥å·²è¢«ä½¿ç?¨ç?¸å??èµ?æº?ç??æ?°è¿?æ?¥å??ä»£"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:430
 msgid "The account already exists on the server"
 msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:432
 msgid "Server is currently too busy to handle the connection"
 msgstr "æ??å?¡å?¨å¤ªå¿?ï¼?æ? æ³?å¤?ç??å½?å??è¿?æ?¥"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:434
 msgid "Certificate has been revoked"
 msgstr "è¯?ä¹¦å·²è¢«å??é??"
 
 # lainmeï¼?è¯?ä¹¦ä½¿ç?¨ä¸?å®?å?¨ç??å? å¯?ç®?æ³?æ??æ?¯å¼±å? å¯?ç??
 # xslidianï¼?è¯?ä¹¦ä½¿ç?¨ç??å? å¯?ç®?æ³?ä¸?å®?å?¨æ??è??æ??è¢«ç ´è§£
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:436
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "è¯?ä¹¦ä½¿ç?¨ä¸?å®?å?¨ç??å? å¯?ç®?æ³?æ??è??æ?¯å¼±å? å¯?ç??"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:439
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "æ??å?¡å?¨è¯?ä¹¦ç??é?¿åº¦â??â??æ??æ??å?¡å?¨è¯?ä¹¦é?¾ç??æ·±åº¦â??â??è¶?å?ºäº?å? å¯?åº?ç??ç¡¬æ?§é??å?¶"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:602
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:548
+#: ../libempathy/empathy-utils.c:607
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:577
+#: ../libempathy/empathy-utils.c:636
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:637
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -681,85 +687,86 @@ msgstr[0] "%d æ??å??"
 msgid "in the future"
 msgstr "å°?æ?¥"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
+#: ../libempathy-gtk/empathy-account-chooser.c:501
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:617
-#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-log-window.c:647
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:618
+#: ../libempathy-gtk/empathy-account-widget.c:680
 msgid "Password"
 msgstr "å¯?ç ?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:619
+#: ../libempathy-gtk/empathy-account-widget.c:681
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:620
+#: ../libempathy-gtk/empathy-account-widget.c:682
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ç«¯å?£"
 
-#: ../libempathy-gtk/empathy-account-widget.c:692
-#: ../libempathy-gtk/empathy-account-widget.c:749
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1074
+#: ../libempathy-gtk/empathy-account-widget.c:1163
 #, c-format
 msgid "The account %s is edited via My Web Accounts."
 msgstr "%s è´¦æ?·é??è¿?æ??ç??ç½?ç»?è´¦æ?·è¿?è¡?äº?ç¼?è¾?ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1080
+#: ../libempathy-gtk/empathy-account-widget.c:1169
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s è´¦æ?·æ? æ³?å?¨ Empathy ä¸ç¼?è¾?ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1100
+#: ../libempathy-gtk/empathy-account-widget.c:1189
 msgid "Launch My Web Accounts"
 msgstr "å?¯å?¨æ??ç??ç½?ç»?è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1527
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1733
+#: ../libempathy-gtk/empathy-account-widget.c:1894
 msgid "A_pply"
 msgstr "åº?ç?¨(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1763
+#: ../libempathy-gtk/empathy-account-widget.c:1924
 msgid "L_og in"
 msgstr "ç?»å½?(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1829
+#: ../libempathy-gtk/empathy-account-widget.c:1990
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:463
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1400
+#: ../libempathy-gtk/empathy-individual-widget.c:1479
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "è´¦æ?·ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1840
+#: ../libempathy-gtk/empathy-account-widget.c:2001
 msgid "_Enabled"
 msgstr "å·²å?¯ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1905
+#: ../libempathy-gtk/empathy-account-widget.c:2066
 msgid "This account already exists on the server"
 msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1908
+#: ../libempathy-gtk/empathy-account-widget.c:2069
 msgid "Create a new account on the server"
 msgstr "å?¨æ??å?¡å?¨ä¸?å??å»ºæ?°ç??å¸?æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2022
+#: ../libempathy-gtk/empathy-account-widget.c:2261
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -768,19 +775,19 @@ msgstr "å??æ¶?(_N)"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2314
+#: ../libempathy-gtk/empathy-account-widget.c:2558
 #, 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:2340
+#: ../libempathy-gtk/empathy-account-widget.c:2584
 #, c-format
 msgid "%s Account"
 msgstr "%s è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2344
+#: ../libempathy-gtk/empathy-account-widget.c:2588
 msgid "New account"
 msgstr "æ?°å»ºè´¦æ?·"
 
@@ -811,32 +818,54 @@ msgid "Pass_word:"
 msgstr "å¯?ç ?(_W)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#, fuzzy
+#| msgid "Password"
+msgid "Remember Password"
+msgstr "å¯?ç ?"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "è®°ä½?å¯?ç ?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "ç?¨æ?·å??(_N)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
 msgstr "æ?¨ç?? AIM å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "æ?¨ç?? AIM å±?å¹?å??ç§°æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "ç«¯å?£(_P)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "æ??å?¡å?¨(_S)ï¼?"
@@ -852,11 +881,11 @@ msgstr "<b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??"
 msgid "Login I_D:"
 msgstr "ç?»å½? I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
 msgstr "æ?¨ç?? GroupWise ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
 msgstr "æ?¨ç?? GroupWise å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
@@ -873,11 +902,11 @@ msgstr "å?ç¬¦é??(_A):"
 msgid "ICQ _UIN:"
 msgstr "ICQ _UINï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
 msgstr "æ?¨ç?? ICQ UIN æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
 msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
@@ -978,12 +1007,12 @@ msgstr "è¦?ç??æ??å?¡å?¨è®¾ç½®"
 msgid "Priori_ty:"
 msgstr "ä¼?å??çº§(_T):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "èµ?æº?(_U)ï¼?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -995,39 +1024,39 @@ msgstr ""
 "<b>badger</b>ã??å¦?æ??æ?¨è¿?æ²¡æ?? Facebook ç?¨æ?·å??ç??è¯?ï¼?ä½¿ç?¨<a href=\"http://www.";
 "facebook.com/username/\">è¿?ä¸ªé¡µé?¢</a> æ?¥é??æ?©ä¸?ä¸ªã??"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨æ?§ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Facebook password?"
 msgstr "æ?¨ç?? Facebook å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Facebook username?"
 msgstr "æ?¨ç?? Facebook ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your Google ID?"
 msgstr "æ?¨ç?? Google ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your Google password?"
 msgstr "æ?¨ç?? Google å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
 msgstr "æ?¨ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
 msgstr "æ?¨ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
@@ -1035,11 +1064,11 @@ msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>ä¾?å¦?ï¼?</b>user hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
 msgstr "æ?¨ç?? Windows Live å¸?æ?·æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
 msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
@@ -1115,27 +1144,27 @@ msgstr "ç«¯å?£ï¼?"
 msgid "Proxy Options"
 msgstr "ä»£ç??é??é¡¹"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "STUN Server:"
 msgstr "STUN æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Server:"
 msgstr "æ??å?¡å?¨ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Transport:"
 msgstr "ä¼ è¾?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "What is your SIP account password?"
 msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP login ID?"
 msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "ç?¨æ?·å??(_U)ï¼?"
 
@@ -1143,203 +1172,209 @@ msgstr "ç?¨æ?·å??(_U)ï¼?"
 msgid "I_gnore conference and chat room invitations"
 msgstr "å¿½ç?¥ä¼?è®®å??è??å¤©å®¤é??è¯·(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
 msgstr "æ?¨ç?? Yahoo! ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
 msgstr "æ?¨ç?? Yahoo! å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Yahoo! I_D:"
 msgstr "Yahoo I_Dï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "è??å¤©å®¤å??è¡¨ locale(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "æ? æ³?è½¬æ?¢å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
 msgid "None of the accepted image formats are supported on your system"
 msgstr "æ²¡æ??ä»»ä½?æ?¥å??ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:935
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??å¤´å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "æ??æ??æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:644
+#: ../libempathy-gtk/empathy-chat.c:655
 msgid "Failed to open private chat"
 msgstr "å»ºç«?ç§?äººå¯¹è¯?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:720
 msgid "Topic not supported on this conversation"
 msgstr "ä¸?æ?¯æ??å?¨æ¤ä¼?è¯?ä¸?è®¾ç½®ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:690
+#: ../libempathy-gtk/empathy-chat.c:726
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?è?½æ?´æ?¹ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:909
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?ç©ºå½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:912
 msgid "/topic <topic>: set the topic of the current conversation"
-msgstr "/topic <ä¸»é¢?>ï¼?è®¾å®?å½?å??å¯¹è¯?ç??ä¸»é¢?"
+msgstr "/topic <ä¸»é¢?>ï¼?è®¾å®?å½?å??å¯¹è¯?ç??ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
+msgstr "/join <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:918
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
+msgstr "/j <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
+
+#: ../libempathy-gtk/empathy-chat.c:923
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/ç?¨æ?·[<è??å¤©å®¤ID>] [<å??å? >]ï¼?å½?å??é»?è®¤ç¦»å¼?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:838
+#: ../libempathy-gtk/empathy-chat.c:928
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
+msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:931
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
+msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
 
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:934
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
+msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
 
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:937
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??å¯¹è¯?ä¸å??é??ä¸?ä¸ªå?¨ä½?æ¶?æ?¯"
+msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??å¯¹è¯?ä¸å??é??ä¸?ä¸ªå?¨ä½?æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:940
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??å¯¹è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?ä¸ªâ??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
+"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??å¯¹è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?ä¸ªâ??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
 "say /join æ?¯ç?¨æ?¥å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤â??"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:945
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
+"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:955
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:895
+#: ../libempathy-gtk/empathy-chat.c:997
 msgid "Unknown command"
 msgstr "æ?ªç?¥å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1016
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥å?½ä»¤ï¼?è¯·ä½¿ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1154
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "offline"
 msgstr "ç¦»çº¿"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "invalid contact"
 msgstr "æ? æ??è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1160
+#: ../libempathy-gtk/empathy-chat.c:1269
 msgid "permission denied"
 msgstr "æ??é??ä¸?è¶³"
 
-#: ../libempathy-gtk/empathy-chat.c:1163
+#: ../libempathy-gtk/empathy-chat.c:1272
 msgid "too long message"
 msgstr "æ¶?æ?¯å¤ªé?¿"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1275
 msgid "not implemented"
 msgstr "å°?æ?ªå®?ç?°"
 
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1279
 msgid "unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1283
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:705
+#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:704
 msgid "Topic:"
 msgstr "è¯?é¢?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1356
 #, c-format
 msgid "Topic set to: %s"
 msgstr "è¯?é¢?è¢«è®¾ç½®ä¸ºï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1358
 msgid "No topic defined"
 msgstr "æ?ªè®¾ç½®è¯?é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1857
 msgid "(No Suggestions)"
 msgstr "(æ²¡æ??å»ºè®®)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1899
+#: ../libempathy-gtk/empathy-chat.c:1925
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "æ·»å?  %s å?°å?å?¸"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1936
+#: ../libempathy-gtk/empathy-chat.c:1962
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "æ·»å?  %s å?° %s å?°å?å?¸"
 
-#: ../libempathy-gtk/empathy-chat.c:1995
+#: ../libempathy-gtk/empathy-chat.c:2021
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2013
-#: ../libempathy-gtk/empathy-ui-utils.c:1805
+#: ../libempathy-gtk/empathy-chat.c:2039
+#: ../libempathy-gtk/empathy-ui-utils.c:1810
 msgid "_Send"
 msgstr "å??é??(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2048
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??å»ºè®®(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2163
 msgid "Failed to retrieve recent logs"
 msgstr "è?·å??æ??è¿?æ?¥å¿?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2242
+#: ../libempathy-gtk/empathy-chat.c:2274
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -1347,12 +1382,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:2249
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?º"
 
-#: ../libempathy-gtk/empathy-chat.c:2252
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1360,17 +1395,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:2260
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s å·²è¢« %s ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2295
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-chat.c:2299
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
@@ -1380,79 +1415,97 @@ msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2276
+#: ../libempathy-gtk/empathy-chat.c:2308
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2333
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2326
+#: ../libempathy-gtk/empathy-chat.c:2358
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?°å?¨å?«å?? %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2465 ../src/empathy-call-window.c:1938
+#: ../libempathy-gtk/empathy-chat.c:2497
+#: ../src/empathy-streamed-media-window.c:1942
+#: ../src/empathy-event-manager.c:1122
 msgid "Disconnected"
 msgstr "å·²æ?å¼?è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3088
-msgid "Wrong password; please try again:"
-msgstr "å¯?ç ?é??è¯¯ï¼?è¯·é??è¯?ï¼?"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3127
+msgid "Would you like to store this password?"
+msgstr "æ?¯å?¦ä¿?å?å¯?ç ?ï¼?"
+
+#: ../libempathy-gtk/empathy-chat.c:3133
+#, fuzzy
+#| msgid "Members"
+msgid "Remember"
+msgstr "æ??å??"
 
-#: ../libempathy-gtk/empathy-chat.c:3089
+#: ../libempathy-gtk/empathy-chat.c:3143
+msgid "Not now"
+msgstr "æ??ä¸?"
+
+#: ../libempathy-gtk/empathy-chat.c:3187
 msgid "Retry"
 msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:3094
+#: ../libempathy-gtk/empathy-chat.c:3191
+msgid "Wrong password; please try again:"
+msgstr "å¯?ç ?é??è¯¯ï¼?è¯·é??è¯?ï¼?"
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3308
 msgid "This room is protected by a password:"
 msgstr "è¿?ä¸ªæ?¿é?´æ?¯ç?±ä¸?ä¸ªå¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3095
+#: ../libempathy-gtk/empathy-chat.c:3335
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3235
+#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
 msgid "Connected"
 msgstr "å·²è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3288
-#: ../libempathy-gtk/empathy-log-window.c:653
+#: ../libempathy-gtk/empathy-chat.c:3558
+#: ../libempathy-gtk/empathy-log-window.c:654
 msgid "Conversation"
 msgstr "å¯¹è¯?"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:791
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:798
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "ç¼?è¾?è??ç³»äººä¿¡æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:292
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
 msgid "Personal Information"
 msgstr "ä¸ªäººä¿¡æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:397
-#: ../libempathy-gtk/empathy-individual-dialogs.c:110
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
 msgid "New Contact"
 msgstr "æ?°å»ºè??ç³»äºº"
 
@@ -1472,280 +1525,305 @@ msgstr "æ?ªå??ç»?"
 msgid "Favorite People"
 msgstr "æ?¶è??å¤¹"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2206
+#: ../libempathy-gtk/empathy-contact-list-view.c:2012
+#: ../libempathy-gtk/empathy-individual-view.c:2309
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2209
+#: ../libempathy-gtk/empathy-contact-list-view.c:2014
+#: ../libempathy-gtk/empathy-individual-view.c:2312
 msgid "Removing group"
 msgstr "å? é?¤ç¾¤ç»?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2055
-#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2263
-#: ../libempathy-gtk/empathy-individual-view.c:2377
+#: ../libempathy-gtk/empathy-contact-list-view.c:2063
+#: ../libempathy-gtk/empathy-contact-list-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2367
+#: ../libempathy-gtk/empathy-individual-view.c:2514
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2294
+#: ../libempathy-gtk/empathy-contact-list-view.c:2093
+#: ../libempathy-gtk/empathy-individual-view.c:2417
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??ç³»äººâ??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2296
+#: ../libempathy-gtk/empathy-contact-list-view.c:2095
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Removing contact"
 msgstr "å? é?¤è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:204
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ·»å? è??ç³»äºº(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-individual-menu.c:517
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:559
+#: ../libempathy-gtk/empathy-contact-menu.c:262
+#: ../libempathy-gtk/empathy-individual-menu.c:560
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "é?³é¢?å?¼å?«(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-#: ../libempathy-gtk/empathy-individual-menu.c:601
+#: ../libempathy-gtk/empathy-contact-menu.c:293
+#: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è§?é¢?å?¼å?«(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:333
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:339
+#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "æ??è¿?ä¼?è¯?(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:355
-#: ../libempathy-gtk/empathy-individual-menu.c:685
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "å??é??æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:378
-#: ../libempathy-gtk/empathy-individual-menu.c:727
+#: ../libempathy-gtk/empathy-contact-menu.c:384
+#: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "å?±äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:418
-#: ../libempathy-gtk/empathy-contact-widget.c:1568
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-menu.c:424
+#: ../libempathy-gtk/empathy-contact-widget.c:1681
+#: ../libempathy-gtk/empathy-individual-menu.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:1370
 msgid "Favorite"
 msgstr "æ?¶è??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:447
-#: ../libempathy-gtk/empathy-individual-menu.c:788
+#: ../libempathy-gtk/empathy-contact-menu.c:453
+#: ../libempathy-gtk/empathy-individual-menu.c:789
 msgid "Infor_mation"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:493
+#: ../libempathy-gtk/empathy-contact-menu.c:499
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:917
+#: ../libempathy-gtk/empathy-contact-menu.c:553
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:916
 msgid "Inviting you to this room"
 msgstr "é??è¯·å?°æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:578
-#: ../libempathy-gtk/empathy-individual-menu.c:1016
+#: ../libempathy-gtk/empathy-contact-menu.c:584
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 msgid "_Invite to Chat Room"
 msgstr "é??è¯·å?°è??å¤©å®¤(_I)"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:456
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Search contacts"
+msgstr "é??æ?©ä¸?ä¸ªè??ç³»"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:486
+#, fuzzy
+#| msgid "Search"
+msgid "Search: "
+msgstr "æ??ç´¢"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:537
+#, fuzzy
+#| msgid "_Add Contactâ?¦"
+msgid "_Add Contact"
+msgstr "æ·»å? è??ç³»äºº(_A)..."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:555
+#, fuzzy
+#| msgid "No match found"
+msgid "No contacts found"
+msgstr "æ²¡æ??æ?¾å?°å?¹é??é¡¹"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é??æ?©ä¸?ä¸ªè??ç³»"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:225
-#: ../libempathy-gtk/empathy-individual-widget.c:147
+#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "å?¨ç§°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:226
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "ç?µè¯?å?·ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:227
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:228
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "ç½?ç«?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:229
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:453
+#: ../libempathy-gtk/empathy-contact-widget.c:724
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Country ISO Code:"
 msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-contact-widget.c:726
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Country:"
 msgstr "å?½å®¶ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-contact-widget.c:728
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "State:"
 msgstr "ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-contact-widget.c:730
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-contact-widget.c:732
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Area:"
 msgstr "å?°å?ºï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Street:"
 msgstr "è¡?é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-contact-widget.c:738
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Building:"
 msgstr "å»ºç?ç?©ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:740
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Floor:"
 msgstr "æ¥¼å±?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:626
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:742
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:628
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:744
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:630
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:746
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:632
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:634
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:636
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Error:"
 msgstr "é??è¯¯ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:638
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:640
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:642
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:644
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Bearing:"
 msgstr "æ?¹ä½?æ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:646
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:648
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Last Updated on:"
 msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:650
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Longitude:"
 msgstr "ç»?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:652
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Latitude:"
 msgstr "çº¬åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:654
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:717
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:581
-#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../libempathy-gtk/empathy-contact-widget.c:833
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:632
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:600
+#: ../libempathy-gtk/empathy-contact-widget.c:852
+#: ../libempathy-gtk/empathy-individual-widget.c:634
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-contact-widget.c:904
+#: ../libempathy-gtk/empathy-individual-widget.c:683
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y äº? %R UTC æ?¶é?´"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-individual-widget.c:840
+#: ../libempathy-gtk/empathy-contact-widget.c:986
+#: ../libempathy-gtk/empathy-individual-widget.c:918
 msgid "Save Avatar"
 msgstr "ä¿?å?å¤´å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:1042
+#: ../libempathy-gtk/empathy-individual-widget.c:976
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å?å¤´å??"
 
@@ -1755,7 +1833,7 @@ msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1226
+#: ../libempathy-gtk/empathy-individual-widget.c:1305
 msgid "Alias:"
 msgstr "å?«å??ï¼?"
 
@@ -1775,7 +1853,7 @@ msgstr "è??ç³»äººè¯¦æ??"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1430
+#: ../libempathy-gtk/empathy-individual-widget.c:1509
 msgid "Identifier:"
 msgstr "æ ?è¯?ç¬¦ï¼?"
 
@@ -1812,7 +1890,7 @@ msgid "Select"
 msgstr "é??æ?©"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1261
+#: ../src/empathy-main-window.c:1432
 msgid "Group"
 msgstr "ç¾¤ç»?"
 
@@ -1836,42 +1914,58 @@ msgstr "å?¨å·¦ä¾§å??è¡¨ä¸é??ä¸ç??è??ç³»äººå°?è¢«ç»?å®?å?¨ä¸?èµ·ã??"
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:132
+#: ../libempathy-gtk/empathy-individual-menu.c:131
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:836
+#: ../libempathy-gtk/empathy-individual-menu.c:837
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-menu.c:863
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
-msgstr "ç»?å®?è??ç³»äºº(_L)â?¦"
+msgstr "å??å¹¶è??ç³»äºº(_L)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2425
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"æ?¨æ?¯å?¦ç¡®å®?è¦?å? é?¤å·²å??å¹¶ç??è??ç³»äºº %sï¼?æ³¨æ??è¿?å°?å? é?¤è¯¥ç»?ä¸?ç??æ??æ??è??ç³»äººã??"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
 #, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "å??å?« %u ä½?è??ç³»äººç??å??è??ç³»äºº"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "è¯¥è??ç³»äººæ?¯ %u ä½?è??ç³»äººå??å¹¶æ??å¾?"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ä½?ç½®</b> äº? (æ?¥æ??)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Online from a phone or mobile device"
+msgstr "æ??æ?ºæ??ç§»å?¨è®¾å¤?å?¨çº¿"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
 msgid "New Network"
 msgstr "æ?°å»ºç½?ç»?"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
 msgid "Choose an IRC network"
 msgstr "é??æ?©ä¸?ä¸ª IRC ç½?ç»?"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "é??ç½®ç½?ç»?å??è¡¨(_N)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "é??æ?©"
@@ -1897,8 +1991,11 @@ msgid "_Unlinkâ?¦"
 msgstr "è§£é?¤ç»?å®?(_U)â?¦"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
+#, fuzzy
+#| msgid ""
+#| "Completely split the displayed meta-contact into the contacts it contains."
 msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"Completely split the displayed linked contacts into the separate contacts."
 msgstr "å°?æ?¾ç¤ºç??å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
 
 #. Add button
@@ -1909,15 +2006,20 @@ msgstr "å°?æ?¾ç¤ºç??å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
 msgid "_Link"
 msgstr "ç»?å®?(_L)"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
-#, c-format
-msgid "Unlink meta-contact '%s'?"
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, fuzzy, c-format
+#| msgid "Unlink meta-contact '%s'?"
+msgid "Unlink linked contacts '%s'?"
 msgstr "è§£é?¤ç»?å®?å??è??ç³»äºº '%s'?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to unlink this meta-contact? This will completely "
+#| "split the meta-contact into the contacts it contains."
 msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
 msgstr "æ?¯å?¦å¸?æ??è§£é?¤ç»?å®?è¯¥å??è??ç³»äºº? è¿?å°?å°?è¯¥å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
@@ -1925,7 +2027,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "è§£é?¤ç»?å®?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:663
+#: ../libempathy-gtk/empathy-log-window.c:664
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1963,30 +2065,39 @@ msgid "Contact ID:"
 msgstr "è??ç³»äºº IDï¼?"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "è??å¤©(_H)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "æ?°å»ºå¯¹è¯?"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
 msgid "Send _Video"
 msgstr "å??é??è§?é¢?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+#: ../libempathy-gtk/empathy-new-call-dialog.c:260
 msgid "C_all"
 msgstr "é??è¯?(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:270
 msgid "New Call"
 msgstr "æ?°å»ºé??è¯?"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"è¾?å?¥æ?¨ç??å¸?æ?·å¯?ç ?\n"
+"<b>%s</b>"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
@@ -2045,43 +2156,43 @@ msgstr "å?ºå??å¤§å°?å??"
 msgid "Phrase not found"
 msgstr "æ?ªæ?¾å?°ç?è¯"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°äº?å?³æ?¶æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "å??é??å?³æ?¶æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "æ?¶å?°ç??è??å¤©è¯·æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "è??ç³»äººå·²è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "è??ç³»äººå·²æ?å¼?"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "å·²è¿?æ?¥å?°æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "å·²ä»?æ??å?¡å?¨æ?å¼?è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "å?¼å?¥ç??è¯é?³é??è¯?"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "å?¼å?ºç??è¯é?³é??è¯?"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "è¯é?³é??è¯?ç»?æ??"
 
@@ -2094,12 +2205,16 @@ msgid "Edit Custom Messages"
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "æ·»å? æ?°è?ªå®?ä¹?ç?¶æ??(_N)"
+#, fuzzy
+#| msgid "Save message"
+msgid "Save _New Status Message"
+msgstr "ä¿?å?æ¶?æ?¯"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "å·²ä¿?å?ç??è?ªå®?ä¹?ç?¶æ??"
+#, fuzzy
+#| msgid "Save message"
+msgid "Saved Status Messages"
+msgstr "ä¿?å?æ¶?æ?¯"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -2172,31 +2287,31 @@ msgstr "é¢?æ??ä¸»æ?ºå??: %s"
 msgid "Certificate hostname: %s"
 msgstr "è¯?ä¹¦ä¸»æ?ºå??: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
 msgid "Continue"
 msgstr "ç»§ç»"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "è¿?æ?¥ä¸?å??ä¿¡ä»»ã??æ?¯å?¦ä»?è¦?ç»§ç»?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Remember this choice for future connections"
 msgstr "ä¸ºå°?æ?¥ç??è¿?æ?¥è®°ä½?æ?¬æ¬¡é??æ?©"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:312
 msgid "Certificate Details"
 msgstr "è¯?ä¹¦è¯¦æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1702
+#: ../libempathy-gtk/empathy-ui-utils.c:1707
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1797
+#: ../libempathy-gtk/empathy-ui-utils.c:1802
 msgid "Select a file"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#: ../libempathy-gtk/empathy-ui-utils.c:1871
 #, c-format
 msgid "Incoming file from %s"
 msgstr "ä»? %s ä¼ æ?¥ç??æ??ä»¶"
@@ -2384,11 +2499,23 @@ msgstr "æ? é??è¯¯ä¿¡æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ?¶æ¶?æ?¯(Empathy)"
 
-#: ../src/empathy.c:420
+#: ../src/empathy.c:308
+msgid "Don't connect on startup"
+msgstr "å?¯å?¨æ?¶ä¸?è?ªå?¨è¿?æ?¥"
+
+#: ../src/empathy.c:312
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??ç³»äººå??è¡¨"
+
+#: ../src/empathy.c:320
+msgid "- Empathy IM Client"
+msgstr " - Empathy IM å®¢æ?·ç«¯"
+
+#: ../src/empathy.c:499
 msgid "Error contacting the Account Manager"
 msgstr "è??ç³»è´¦æ?·ç®¡ç??å?¨å?ºé??"
 
-#: ../src/empathy.c:422
+#: ../src/empathy.c:501
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2400,18 +2527,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy.c:649
-msgid "Don't connect on startup"
-msgstr "å?¯å?¨æ?¶ä¸?è?ªå?¨è¿?æ?¥"
-
-#: ../src/empathy.c:653
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??ç³»äººå??è¡¨"
-
-#: ../src/empathy.c:670
-msgid "- Empathy IM Client"
-msgstr " - Empathy IM å®¢æ?·ç«¯"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2563,8 +2678,8 @@ msgid "Select the accounts you want to import:"
 msgstr "é??æ?©æ?¨è¦?å¯¼å?¥ç??è´¦æ?·ï¼?"
 
 #: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "Yes"
 msgstr "æ?¯"
 
@@ -2636,54 +2751,68 @@ msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å?ç??ä¿®æ?¹ã??"
 msgid "Your new account has not been saved yet."
 msgstr "æ?¨ç??æ?°å¸?æ?·è¿?æ²¡æ??ä¿?å?ã??"
 
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-streamed-media-window.c:809
 msgid "Connectingâ?¦"
 msgstr "æ£å?¨è¿?æ?¥..."
 
-#: ../src/empathy-accounts-dialog.c:321
+#: ../src/empathy-accounts-dialog.c:327
 #, c-format
 msgid "Offline â?? %s"
 msgstr "ç¦»çº¿ - %s"
 
-#: ../src/empathy-accounts-dialog.c:333
+#: ../src/empathy-accounts-dialog.c:339
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?å¼? - %s"
 
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:350
 msgid "Offline â?? No Network Connection"
 msgstr "ç¦»çº¿ - æ? å?¯ç?¨ç½?ç»?"
 
-#: ../src/empathy-accounts-dialog.c:351
+#: ../src/empathy-accounts-dialog.c:357
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç?¶æ??"
 
-#: ../src/empathy-accounts-dialog.c:363
+#: ../src/empathy-accounts-dialog.c:369
 msgid "Offline â?? Account Disabled"
 msgstr "ç¦»çº¿ - å¸?æ?·è¢«ç¦?ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:759
+#: ../src/empathy-accounts-dialog.c:772
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "æ?¨å°?è¦?å??å»ºä¸?ä¸ªæ?°è´¦æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?ç»§ç»å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1106
+#: ../src/empathy-accounts-dialog.c:1133
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¨è¦?ä»?ç?µè??ä¸ç§»é?¤ %s å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1110
+#: ../src/empathy-accounts-dialog.c:1137
 msgid "This will not remove your account on the server."
 msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
 
-#: ../src/empathy-accounts-dialog.c:1348
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "æ?¨å°?è¦?é??æ?©å?¦ä¸?ä¸ªè´¦æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?ç»§ç»å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1571
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "å·²å?¯ç?¨(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1572
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "å·²å?¯ç?¨(_E)"
+
+#: ../src/empathy-accounts-dialog.c:2086
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2715,11 +2844,11 @@ msgstr "æ·»å? (_A)..."
 msgid "_Importâ?¦"
 msgstr "å¯¼å?¥(_I)..."
 
-#: ../src/empathy-auth-client.c:217
+#: ../src/empathy-auth-client.c:243
 msgid " - Empathy authentication client"
 msgstr " - Empathy è®¤è¯?å®¢æ?·ç«¯"
 
-#: ../src/empathy-auth-client.c:233
+#: ../src/empathy-auth-client.c:259
 msgid "Empathy authentication client"
 msgstr "Empathy è®¤è¯?å®¢æ?·ç«¯"
 
@@ -2727,129 +2856,129 @@ msgstr "Empathy è®¤è¯?å®¢æ?·ç«¯"
 msgid "People nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../src/empathy-av.c:122
+#: ../src/empathy-av.c:118
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy è¯é?³/è§?é¢?å®¢æ?·ç«¯"
 
-#: ../src/empathy-av.c:138
+#: ../src/empathy-av.c:134
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy è¯é?³/è§?é¢?å®¢æ?·ç«¯"
 
-#: ../src/empathy-call-window.c:479
+#: ../src/empathy-streamed-media-window.c:479
 msgid "Contrast"
 msgstr "å¯¹æ¯?åº¦"
 
-#: ../src/empathy-call-window.c:482
+#: ../src/empathy-streamed-media-window.c:482
 msgid "Brightness"
 msgstr "äº®åº¦"
 
-#: ../src/empathy-call-window.c:485
+#: ../src/empathy-streamed-media-window.c:485
 msgid "Gamma"
 msgstr "ä¼½é©¬"
 
-#: ../src/empathy-call-window.c:590
+#: ../src/empathy-streamed-media-window.c:590
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1165
 msgid "_Sidebar"
 msgstr "ä¾§è¾¹æ ?(_S)"
 
-#: ../src/empathy-call-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1185
 msgid "Audio input"
 msgstr "é?³é¢?è¾?å?¥"
 
-#: ../src/empathy-call-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1189
 msgid "Video input"
 msgstr "è§?é¢?è¾?å?¥"
 
-#: ../src/empathy-call-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1193
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-call-window.c:1199
+#: ../src/empathy-streamed-media-window.c:1198
 msgid "Details"
 msgstr "è¯¦ç»?ä¿¡æ?¯"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1266
+#: ../src/empathy-streamed-media-window.c:1267
 #, c-format
 msgid "Call with %s"
 msgstr "ä¸? %s é??è¯?"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1345
+#: ../src/empathy-streamed-media-window.c:1346
 msgid "Call"
 msgstr "é??è¯?"
 
-#: ../src/empathy-call-window.c:1499
+#: ../src/empathy-streamed-media-window.c:1500
 msgid "The IP address as seen by the machine"
 msgstr "æ?ºå?¨æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-call-window.c:1501
+#: ../src/empathy-streamed-media-window.c:1502
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet ä¸?æ??å?¡å?¨æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-streamed-media-window.c:1504
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¦ä¸?æ?¹æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-streamed-media-window.c:1506
 msgid "The IP address of a relay server"
 msgstr "ä¸è½¬æ??å?¡å?¨ IP å?°å??"
 
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1508
 msgid "The IP address of the multicast group"
 msgstr "å¤?æ?ç»?ç?? IP å?°å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2254
+#: ../src/empathy-streamed-media-window.c:2259
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2315
+#: ../src/empathy-streamed-media-window.c:2320
 msgid "Technical Details"
 msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-call-window.c:2353
+#: ../src/empathy-streamed-media-window.c:2358
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?é?³é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-call-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2363
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?è§?é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-call-window.c:2364
+#: ../src/empathy-streamed-media-window.c:2369
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ä¸?è?½ä¸? %s å»ºç«?è¿?æ?¥ã??å?¯è?½æ?¯ä¸¤å?°è®¡ç®?æ?ºä¹?ä¸?ä¸?å??è®¸ç?´æ?¥è¿?æ?¥ã??"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2375
 msgid "There was a failure on the network"
 msgstr "ç½?ç»?å?ºç?°ä¸?ä¸ªé??è¯¯"
 
-#: ../src/empathy-call-window.c:2374
+#: ../src/empathy-streamed-media-window.c:2379
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-streamed-media-window.c:2382
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2387
+#: ../src/empathy-streamed-media-window.c:2392
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2859,19 +2988,19 @@ msgstr ""
 "Telepathy ç»?ä»¶å?ºç?°äº?ä¸?äº?æ??å¤?ã??è¯·<a href=\"%s\">æ±?æ?¥è¿?ä¸ªé??è¯¯</a>ï¼?å¹¶é??ä¸?å¸®å?©è??"
 "å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
 
-#: ../src/empathy-call-window.c:2395
+#: ../src/empathy-streamed-media-window.c:2400
 msgid "There was a failure in the call engine"
 msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?ä¸ªæ??é??"
 
-#: ../src/empathy-call-window.c:2398
+#: ../src/empathy-streamed-media-window.c:2403
 msgid "The end of the stream was reached"
 msgstr "å·²å?°è¾¾æµ?ç??æ?«å°¾"
 
-#: ../src/empathy-call-window.c:2438
+#: ../src/empathy-streamed-media-window.c:2443
 msgid "Can't establish audio stream"
 msgstr "ä¸?è?½å»ºç«?é?³é¢?æµ?"
 
-#: ../src/empathy-call-window.c:2448
+#: ../src/empathy-streamed-media-window.c:2453
 msgid "Can't establish video stream"
 msgstr "ä¸?è?½å»ºç«?è§?é¢?æµ?"
 
@@ -2971,31 +3100,31 @@ msgstr "é??è¯?(_C)"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:478
+#: ../src/empathy-chat-window.c:481
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (å?? %u å?¶å®?)"
 
-#: ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:497
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d å?¶å®?æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:503
+#: ../src/empathy-chat-window.c:506
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d å?¨é?¨æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:708
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -3031,7 +3160,7 @@ msgstr "å?³ç§»æ ?ç¾(_R)"
 msgid "Notify for All Messages"
 msgstr "æ??ç¤ºæ??æ??æ¶?æ?¯"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "å??å®¹(_C)"
 
@@ -3043,7 +3172,7 @@ msgstr "å¯¹è¯?(_C)"
 msgid "_Detach Tab"
 msgstr "æ¼?ç§»æ ?ç¾(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
@@ -3051,7 +3180,7 @@ msgstr "ç¼?è¾?(_E)"
 msgid "_Favorite Chat Room"
 msgstr "æ?¶è??è??å¤©å®¤(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "å¸®å?©(_H)"
 
@@ -3091,86 +3220,93 @@ msgstr "è?ªå?¨è¿?æ?¥"
 msgid "Manage Favorite Rooms"
 msgstr "ç®¡ç??è??å¤©å®¤æ?¶è??"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming video call"
 msgstr "å?¼å?¥ç??è§?é¢?é??è¯?"
 
-#: ../src/empathy-event-manager.c:468
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming call"
 msgstr "æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-event-manager.c:511
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è§?é¢?æ?¥ç?µã??æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
 
-#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:540
 msgid "_Reject"
 msgstr "æ??ç»?(_R)"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:546
 msgid "_Answer"
 msgstr "æ?¥å?¬(_A)"
 
-#: ../src/empathy-event-manager.c:618
+#: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ç??è§?é¢?å?¼å?«"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:737
 msgid "Room invitation"
 msgstr "è??å¤©å®¤é??è¯·"
 
-#: ../src/empathy-event-manager.c:697
+#: ../src/empathy-event-manager.c:739
 #, c-format
 msgid "Invitation to join %s"
 msgstr "é??è¯·æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:746
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ£é??è¯·æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:754
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:759
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:743
+#: ../src/empathy-event-manager.c:786
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??è¯·æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:792
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æ?¨è¢«é??è¯·å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:797
+#: ../src/empathy-event-manager.c:843
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??ä»¶ä¼ è¾?"
 
-#: ../src/empathy-event-manager.c:1005
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "%s ç??è®¢é??è¯·æ±?"
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#, fuzzy
+#| msgid "Password"
+msgid "Password required"
+msgstr "å¯?ç ?"
 
-#: ../src/empathy-event-manager.c:1009
+#: ../src/empathy-event-manager.c:1069
+#, fuzzy, c-format
+#| msgid "%s would like to send you a file"
+msgid "%s would like permission to see when you are online"
+msgstr "%s æ?³è¦?ç»?æ?¨å??é??ä¸?ä¸ªæ??ä»¶"
+
+#: ../src/empathy-event-manager.c:1073
 #, c-format
 msgid ""
 "\n"
@@ -3179,16 +3315,6 @@ msgstr ""
 "\n"
 "æ¶?æ?¯ï¼?%s"
 
-#: ../src/empathy-event-manager.c:1052
-#, c-format
-msgid "%s is now offline."
-msgstr "%s å½?å??ç¦»çº¿ã??"
-
-#: ../src/empathy-event-manager.c:1072
-#, c-format
-msgid "%s is now online."
-msgstr "%s å½?å??å?¨çº¿ã??"
-
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:99
 #, c-format
@@ -3280,15 +3406,15 @@ msgstr "æ£?æ?¥\"%s\"å®?æ?´æ?§"
 msgid "Hashing \"%s\""
 msgstr "æ ¡éª?ä¸ \"%s\""
 
-#: ../src/empathy-ft-manager.c:996
+#: ../src/empathy-ft-manager.c:1016
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1028
 msgid "File"
 msgstr "æ??ä»¶"
 
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1050
 msgid "Remaining"
 msgstr "å?©ä½?"
 
@@ -3324,30 +3450,42 @@ msgid "Source"
 msgstr "æº?"
 
 #: ../src/empathy-main-window.c:384
+#, fuzzy
+#| msgid "Password"
+msgid "Provide Password"
+msgstr "å¯?ç ?"
+
+#: ../src/empathy-main-window.c:390
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "å·²æ?å¼?è¿?æ?¥"
+
+#: ../src/empathy-main-window.c:530
 msgid "No match found"
 msgstr "æ²¡æ??æ?¾å?°å?¹é??é¡¹"
 
-#: ../src/empathy-main-window.c:539
+#: ../src/empathy-main-window.c:685
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:545
+#: ../src/empathy-main-window.c:691
 msgid "Edit Account"
 msgstr "ç¼?è¾?è´¦æ?·"
 
-#: ../src/empathy-main-window.c:551
+#: ../src/empathy-main-window.c:697
 msgid "Close"
 msgstr "å?³é?"
 
-#: ../src/empathy-main-window.c:1243
+#: ../src/empathy-main-window.c:1414
 msgid "Contact"
 msgstr "è??ç³»äºº"
 
-#: ../src/empathy-main-window.c:1567
+#: ../src/empathy-main-window.c:1748
 msgid "Contact List"
 msgstr "è??ç³»äººå??è¡¨"
 
-#: ../src/empathy-main-window.c:1677
+#: ../src/empathy-main-window.c:1863
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -3356,98 +3494,101 @@ msgid "Contacts on a _Map"
 msgstr "è??ç³»äººå?°å?¾(_M)"
 
 #: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "ä¸?ä¸?æ??"
-
-#: ../src/empathy-main-window.ui.h:3
 #, fuzzy
 #| msgid "Contact List"
 msgid "Find in Contact _List"
 msgstr "è??ç³»äººå??è¡¨"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "å? å?¥å·²æ?¶è??ç??è??å¤©å®¤(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "ç®¡ç??æ?¶è??å¤¹"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "å¸¸è§?è§?å?¾(_O)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "æ?°å»ºå?¼å?«(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "æ?©å±?è§?å?¾(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
 msgid "P_references"
 msgstr "é¦?é??é¡¹(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
 msgid "Show P_rotocols"
 msgstr "æ?¾ç¤ºå??è®®(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "æ??å§?å??æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "æ??ç?¶æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "è´¦æ?·(_A)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "ç´§å??è§?å?¾(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "è°?è¯?(_D)"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "æ??ä»¶ä¼ è¾?(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "æ?°å»ºå¯¹è¯?(_N)..."
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "ç¦»çº¿è??ç³»äºº(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "ä¸ªäººä¿¡æ?¯(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "è??å¤©å®¤(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-main-window.ui.h:27
+#, fuzzy
+#| msgctxt "Link individual (contextual menu)"
+#| msgid "_Link Contactsâ?¦"
+msgid "_Search for Contactsâ?¦"
+msgstr "ç»?å®?è??ç³»äºº(_L)â?¦"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "è??å¤©å®¤"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "æ??å??"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:560
 #, c-format
 msgid ""
 "%s\n"
@@ -3460,16 +3601,16 @@ msgstr ""
 "é??è¦?å¯?ç ?: %s\n"
 "æ??å??: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:609
-#: ../src/empathy-new-chatroom-dialog.c:610
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "æ? æ³?å¼?å§?è??å¤©å®¤å??è¡¨"
 
-#: ../src/empathy-new-chatroom-dialog.c:648
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "æ? æ³?å??æ¢è??å¤©å®¤å??è¡¨"
 
@@ -3672,26 +3813,6 @@ msgstr "å??æ??ç??è??ç³»äººå?¬å¸?ä½?ç½®ä¿¡æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®ä¿¡æ?¯ç²¾åº¦(_R)"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "å??åº?"
-
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "æ??ç»?"
-
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "æ?¥å?¬"
-
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "æ??ç»?"
-
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "æ?¥å??"
-
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "ç?¶æ??"
@@ -3700,67 +3821,67 @@ msgstr "ç?¶æ??"
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../src/empathy-map-view.c:452
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "ä¿?å?"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "è°?è¯?çª?å?£"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1474
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1486
 msgid "Level "
 msgstr "çº§å?« "
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1506
 msgid "Debug"
 msgstr "è°?è¯?"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1512
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
 msgid "Message"
 msgstr "æ¶?æ?¯"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1524
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1530
 msgid "Critical"
 msgstr "å?±æ?¥"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1536
 msgid "Error"
 msgstr "é??è¯¯"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1555
 msgid "Time"
 msgstr "æ?¶é?´"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1558
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1560
 msgid "Category"
 msgstr "ç±»å?«"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1562
 msgid "Level"
 msgstr "çº§å?«"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1599
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3779,11 +3900,11 @@ msgstr "é??æ?©ä¸?ä¸ªè??ç³»äººä»¥å? å?¥è¯¥ä¼?è¯?ï¼?"
 msgid "Invite"
 msgstr "é??è¯·"
 
-#: ../src/empathy-accounts.c:163
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?ï¼?å®?æ??æ??æ??å·¥ä½?ï¼?å¦?å¯¼å?¥ï¼?ç?¶å??é??å?º"
 
-#: ../src/empathy-accounts.c:167
+#: ../src/empathy-accounts.c:187
 #, fuzzy
 #| msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgid ""
@@ -3791,26 +3912,75 @@ msgid ""
 msgstr "å¦?æ??æ??ä»»ä½?é?? salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?"
 
 # lainmeï¼?å??æ¬¡é??æ?©ç»?å®?ç??è´¦æ?·(æ¯?å¦? gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:171
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?·(å¦? gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:173
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<è´¦æ?· ID>"
 
-#: ../src/empathy-accounts.c:181
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy è´¦æ?·"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy è´¦æ?·"
 
-#: ../src/empathy-debugger.c:45
+#: ../src/empathy-debugger.c:66
 msgid "Empathy Debugger"
 msgstr "Empathy è°?è¯?å?¨"
 
+#: ../src/empathy-chat.c:107
+#, fuzzy
+#| msgid "- Empathy IM Client"
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM å®¢æ?·ç«¯"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "å??åº?"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "æ??ç»?"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "æ?¥å?¬"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "æ??ç»?"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "æ?¥å??"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "æ?¥æ?¶å?°ç??æ??ä»¶å??å??é??ç??é?£ä¸ªæ??ä»¶å??å¸?å?¼ä¸?å?¹é??"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "æ·»å? æ?°è?ªå®?ä¹?ç?¶æ??(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "å·²ä¿?å?ç??è?ªå®?ä¹?ç?¶æ??"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "%s ç??è®¢é??è¯·æ±?"
+
+#~ msgid "%s is now offline."
+#~ msgstr "%s å½?å??ç¦»çº¿ã??"
+
+#~ msgid "%s is now online."
+#~ msgstr "%s å½?å??å?¨çº¿ã??"
+
+#~ msgid "Context"
+#~ msgstr "ä¸?ä¸?æ??"
+
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy å·²ç»?è¯¢é?®å¯¼å?¥è´¦æ?·"
 
@@ -4094,9 +4264,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "Message:"
 #~ msgstr "æ¶?æ?¯ï¼?"
 
-#~ msgid "Save message"
-#~ msgstr "ä¿?å?æ¶?æ?¯"
-
 #~ msgid "Status:"
 #~ msgstr "ç?¶æ??ï¼?"
 
@@ -4162,9 +4329,6 @@ msgstr "Empathy è°?è¯?å?¨"
 #~ msgid "unknown size"
 #~ msgstr "æ?ªç?¥å¤§å°?"
 
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s æ?³è¦?ç»?æ?¨å??é??ä¸?ä¸ªæ??ä»¶"
-
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr "æ?¨æ?³è¦?æ?¥æ?¶æ??ä»¶â??%sâ??(%s)å??ï¼?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]