[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: Sat, 19 Mar 2011 16:17:11 +0000 (UTC)
commit 8e4b1bdae8815bc8e64eea6ec78592c50c413bc8
Author: Aron Xu <aronxu gnome org>
Date:   Sat Mar 19 16:16:57 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  877 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 463 insertions(+), 414 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4214de3..13e1cf2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,14 +17,15 @@
 # Yinghua Wang <wantinghard gmail com>, 2010
 # liuzhen <liuzhen1191 gmail com>, 2011.
 # Aron Xu <happyaron xu gmail com>, 2009, 2010, 2011.
+# Lele Long <schemacs gmail com>, 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: 2011-03-03 13:42+0000\n"
-"PO-Revision-Date: 2011-03-03 22:44+0800\n"
+"product=empathy&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-03-18 15:05+0000\n"
+"PO-Revision-Date: 2011-03-20 00:15+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"
@@ -442,20 +443,18 @@ msgid "Messaging and VoIP Accounts"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
 
 #: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
 msgid "File transfer completed, but the file was corrupted"
-msgstr "æ??ä»¶ä¼ é??å®?æ??"
+msgstr "æ??ä»¶ä¼ é??å®?æ??ï¼?ä½?æ?¯å·²æ??å??ã??"
 
-#: ../libempathy/empathy-ft-handler.c:1116
+#: ../libempathy/empathy-ft-handler.c:1113
 msgid "File transfer not supported by remote contact"
 msgstr "æ??ä»¶ä¼ è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
 
-#: ../libempathy/empathy-ft-handler.c:1172
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "æ??é??æ??ä»¶æ?¯é??æ£å¸¸ç??æ??ä»¶"
 
-#: ../libempathy/empathy-ft-handler.c:1181
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "æ??é??æ??ä»¶æ?¯ç©ºç??"
 
@@ -487,163 +486,163 @@ msgstr "å½?ä¼ è¾?è¿?ä¸ªæ??ä»¶ç??æ?¶å??å??ç??é??è¯¯"
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¦å¤?ç??å??ä¸?è??æ? æ³?ä¼ è¾?è¿?ä¸ªæ??ä»¶"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
 msgid "Unknown reason"
 msgstr "æ?ªç?¥å??å? "
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:304
 msgid "Available"
 msgstr "å?¨çº¿"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:306
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:309
 msgid "Away"
 msgstr "ç¦»å¼?"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:311
 msgid "Invisible"
 msgstr "é??èº«"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:313
 msgid "Offline"
 msgstr "ç¦»çº¿"
 
-#: ../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
+#: ../libempathy/empathy-utils.c:315
+#: ../src/empathy-streamed-media-window.c:1904
+#: ../src/empathy-streamed-media-window.c:1905
+#: ../src/empathy-streamed-media-window.c:1906
+#: ../src/empathy-streamed-media-window.c:1907
 #: ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "No reason specified"
 msgstr "æ?ªæ??å®?å??å? "
 
-#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
 msgid "Status is set to offline"
 msgstr "ç?¶æ??å·²è®¾ç½®ä¸ºç¦»çº¿"
 
-#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
 msgid "Network error"
 msgstr "ç½?ç»?é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
 msgid "Authentication failed"
 msgstr "éª?è¯?å¤±è´¥"
 
-#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
 msgid "Encryption error"
 msgstr "å? å¯?é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:364
 msgid "Name in use"
 msgstr "ç?¨æ?·å??å·²ç»?è¢«å? ç?¨"
 
-#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
 msgid "Certificate not provided"
 msgstr "æ?ªæ??ä¾?è¯?ä¹¦"
 
-#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
 msgid "Certificate untrusted"
 msgstr "è¯?ä¹¦ä¸?è¢«ä¿¡ä»»"
 
-#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
 msgid "Certificate expired"
 msgstr "è¯?ä¹¦å·²è¿?æ??"
 
-#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
 msgid "Certificate not activated"
 msgstr "è¯?ä¹¦å°?æ?ªæ¿?æ´»"
 
-#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
 msgid "Certificate hostname mismatch"
 msgstr "è¯?ä¹¦ä¸»æ?ºå??ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
 msgid "Certificate fingerprint mismatch"
 msgstr "è¯?ä¹¦æ??çº¹ä¸?å?¹é??"
 
-#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
 msgid "Certificate self-signed"
 msgstr "è¯?ä¹¦æ?¯è?ªç¾å±?ç??"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:380
 msgid "Certificate error"
 msgstr "è¯?ä¹¦é??è¯¯"
 
-#: ../libempathy/empathy-utils.c:415
+#: ../libempathy/empathy-utils.c:414
 msgid "Encryption is not available"
 msgstr "å? å¯?ä¸?å?¯ç?¨"
 
-#: ../libempathy/empathy-utils.c:417
+#: ../libempathy/empathy-utils.c:416
 msgid "Certificate is invalid"
 msgstr "è¯?ä¹¦æ? æ??"
 
-#: ../libempathy/empathy-utils.c:419
+#: ../libempathy/empathy-utils.c:418
 msgid "Connection has been refused"
 msgstr "è¿?æ?¥è¢«æ??ç»?"
 
-#: ../libempathy/empathy-utils.c:421
+#: ../libempathy/empathy-utils.c:420
 msgid "Connection can't be established"
 msgstr "æ? æ³?å»ºç«?è¿?æ?¥"
 
-#: ../libempathy/empathy-utils.c:423
+#: ../libempathy/empathy-utils.c:422
 msgid "Connection has been lost"
 msgstr "è¿?æ?¥å·²ä¸¢å¤±"
 
-#: ../libempathy/empathy-utils.c:425
+#: ../libempathy/empathy-utils.c:424
 msgid "This resource is already connected to the server"
 msgstr "è¯¥èµ?æº?å·²è¢«è¿?æ?¥è?³æ??å?¡å?¨"
 
-#: ../libempathy/empathy-utils.c:427
+#: ../libempathy/empathy-utils.c:426
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "è¿?æ?¥å·²è¢«ä½¿ç?¨ç?¸å??èµ?æº?ç??æ?°è¿?æ?¥å??ä»£"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:429
 msgid "The account already exists on the server"
 msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
 
-#: ../libempathy/empathy-utils.c:432
+#: ../libempathy/empathy-utils.c:431
 msgid "Server is currently too busy to handle the connection"
 msgstr "æ??å?¡å?¨å¤ªå¿?ï¼?æ? æ³?å¤?ç??å½?å??è¿?æ?¥"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:433
 msgid "Certificate has been revoked"
 msgstr "è¯?ä¹¦å·²è¢«å??é??"
 
 # lainmeï¼?è¯?ä¹¦ä½¿ç?¨ä¸?å®?å?¨ç??å? å¯?ç®?æ³?æ??æ?¯å¼±å? å¯?ç??
 # xslidianï¼?è¯?ä¹¦ä½¿ç?¨ç??å? å¯?ç®?æ³?ä¸?å®?å?¨æ??è??æ??è¢«ç ´è§£
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:435
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "è¯?ä¹¦ä½¿ç?¨ä¸?å®?å?¨ç??å? å¯?ç®?æ³?æ??è??æ?¯å¼±å? å¯?ç??"
 
-#: ../libempathy/empathy-utils.c:439
+#: ../libempathy/empathy-utils.c:438
 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:602
+#: ../libempathy/empathy-utils.c:601
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:607
+#: ../libempathy/empathy-utils.c:606
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:635
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:636
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -687,86 +686,87 @@ msgstr[0] "%d æ??å??"
 msgid "in the future"
 msgstr "å°?æ?¥"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:501
+#: ../libempathy-gtk/empathy-account-chooser.c:491
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:679
-#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-log-window.c:643
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "å¯?ç ?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "æ??å?¡å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ç«¯å?£"
 
-#: ../libempathy-gtk/empathy-account-widget.c:754
-#: ../libempathy-gtk/empathy-account-widget.c:811
+#: ../libempathy-gtk/empathy-account-widget.c:757
+#: ../libempathy-gtk/empathy-account-widget.c:814
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1163
+#: ../libempathy-gtk/empathy-account-widget.c:1166
 #, c-format
 msgid "The account %s is edited via My Web Accounts."
 msgstr "%s è´¦æ?·é??è¿?æ??ç??ç½?ç»?è´¦æ?·è¿?è¡?äº?ç¼?è¾?ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1169
+#: ../libempathy-gtk/empathy-account-widget.c:1172
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s è´¦æ?·æ? æ³?å?¨ Empathy ä¸ç¼?è¾?ã??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1189
+#: ../libempathy-gtk/empathy-account-widget.c:1192
 msgid "Launch My Web Accounts"
 msgstr "å?¯å?¨æ??ç??ç½?ç»?è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1527
+#: ../libempathy-gtk/empathy-account-widget.c:1530
 msgid "Username:"
 msgstr "ç?¨æ?·å??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1894
+#: ../libempathy-gtk/empathy-account-widget.c:1897
 msgid "A_pply"
 msgstr "åº?ç?¨(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1924
+#: ../libempathy-gtk/empathy-account-widget.c:1927
 msgid "L_og in"
 msgstr "ç?»å½?(_O)"
 
 #. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1990
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:463
+#: ../libempathy-gtk/empathy-account-widget.c:1993
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../libempathy-gtk/empathy-individual-widget.c:1481
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "è´¦æ?·ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2001
+#: ../libempathy-gtk/empathy-account-widget.c:2004
 msgid "_Enabled"
 msgstr "å·²å?¯ç?¨(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2066
+#: ../libempathy-gtk/empathy-account-widget.c:2069
 msgid "This account already exists on the server"
 msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:2072
 msgid "Create a new account on the server"
 msgstr "å?¨æ??å?¡å?¨ä¸?å??å»ºæ?°ç??å¸?æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2261
+#: ../libempathy-gtk/empathy-account-widget.c:2264
 msgid "Ca_ncel"
 msgstr "å??æ¶?(_N)"
 
@@ -775,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:2558
+#: ../libempathy-gtk/empathy-account-widget.c:2561
 #, 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:2584
+#: ../libempathy-gtk/empathy-account-widget.c:2587
 #, c-format
 msgid "%s Account"
 msgstr "%s è´¦æ?·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2588
+#: ../libempathy-gtk/empathy-account-widget.c:2591
 msgid "New account"
 msgstr "æ?°å»ºè´¦æ?·"
 
@@ -823,10 +823,8 @@ msgstr "å¯?ç ?(_W)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-#, fuzzy
-#| msgid "Password"
 msgid "Remember Password"
-msgstr "å¯?ç ?"
+msgstr "è®°ä½?å¯?ç ?"
 
 #. remember password ticky box
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
@@ -1197,19 +1195,19 @@ msgstr "æ? æ³?è½¬æ?¢å?¾å??"
 msgid "None of the accepted image formats are supported on your system"
 msgstr "æ²¡æ??ä»»ä½?æ?¥å??ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:930
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??å¤´å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:995
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:999
 msgid "All Files"
 msgstr "æ??æ??æ??ä»¶"
 
@@ -1217,57 +1215,57 @@ msgstr "æ??æ??æ??ä»¶"
 msgid "Click to enlarge"
 msgstr "å??å?»ä»¥æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:652
 msgid "Failed to open private chat"
 msgstr "å»ºç«?ç§?äººå¯¹è¯?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:717
 msgid "Topic not supported on this conversation"
 msgstr "ä¸?æ?¯æ??å?¨æ¤ä¼?è¯?ä¸?è®¾ç½®ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:726
+#: ../libempathy-gtk/empathy-chat.c:723
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?è?½æ?´æ?¹ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:906
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?ç©ºå½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:909
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¢?>ï¼?è®¾å®?å½?å??å¯¹è¯?ç??ä¸»é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:912
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:918
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤å??>ï¼?å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:920
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/ç?¨æ?·[<è??å¤©å®¤ID>] [<å??å? >]ï¼?å½?å??é»?è®¤ç¦»å¼?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:925
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:928
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?ä¸ªç§?äººè??å¤©"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:931
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:934
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??å¯¹è¯?ä¸å??é??ä¸?ä¸ªå?¨ä½?æ¶?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:940
+#: ../libempathy-gtk/empathy-chat.c:937
 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 "
@@ -1276,105 +1274,105 @@ msgstr ""
 "/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??å¯¹è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?ä¸ªâ??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
 "say /join æ?¯ç?¨æ?¥å? å?¥ä¸?ä¸ªæ?°ç??è??å¤©å®¤â??"
 
-#: ../libempathy-gtk/empathy-chat.c:945
+#: ../libempathy-gtk/empathy-chat.c:942
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:955
+#: ../libempathy-gtk/empathy-chat.c:952
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:997
+#: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command"
 msgstr "æ?ªç?¥å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1117
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥å?½ä»¤ï¼?è¯·ä½¿ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1254
 msgid "offline"
 msgstr "ç¦»çº¿"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1257
 msgid "invalid contact"
 msgstr "æ? æ??è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1269
+#: ../libempathy-gtk/empathy-chat.c:1260
 msgid "permission denied"
 msgstr "æ??é??ä¸?è¶³"
 
-#: ../libempathy-gtk/empathy-chat.c:1272
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "too long message"
 msgstr "æ¶?æ?¯å¤ªé?¿"
 
-#: ../libempathy-gtk/empathy-chat.c:1275
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "not implemented"
 msgstr "å°?æ?ªå®?ç?°"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1270
 msgid "unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1274
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:704
+#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
 msgid "Topic:"
 msgstr "è¯?é¢?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1356
+#: ../libempathy-gtk/empathy-chat.c:1347
 #, c-format
 msgid "Topic set to: %s"
 msgstr "è¯?é¢?è¢«è®¾ç½®ä¸ºï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1358
+#: ../libempathy-gtk/empathy-chat.c:1349
 msgid "No topic defined"
 msgstr "æ?ªè®¾ç½®è¯?é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:1857
+#: ../libempathy-gtk/empathy-chat.c:1848
 msgid "(No Suggestions)"
 msgstr "(æ²¡æ??å»ºè®®)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1925
+#: ../libempathy-gtk/empathy-chat.c:1916
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "æ·»å?  %s å?°å?å?¸"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1962
+#: ../libempathy-gtk/empathy-chat.c:1953
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "æ·»å?  %s å?° %s å?°å?å?¸"
 
-#: ../libempathy-gtk/empathy-chat.c:2021
+#: ../libempathy-gtk/empathy-chat.c:2010
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2039
-#: ../libempathy-gtk/empathy-ui-utils.c:1810
+#: ../libempathy-gtk/empathy-chat.c:2028
+#: ../libempathy-gtk/empathy-ui-utils.c:1808
 msgid "_Send"
 msgstr "å??é??(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2063
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??å»ºè®®(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2163
+#: ../libempathy-gtk/empathy-chat.c:2152
 msgid "Failed to retrieve recent logs"
 msgstr "è?·å??æ??è¿?æ?¥å¿?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2274
+#: ../libempathy-gtk/empathy-chat.c:2263
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -1382,12 +1380,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:2281
+#: ../libempathy-gtk/empathy-chat.c:2270
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?º"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2273
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1395,17 +1393,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:2292
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s å·²è¢« %s ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:2295
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
@@ -1415,68 +1413,90 @@ msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2308
+#: ../libempathy-gtk/empathy-chat.c:2297
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2333
+#: ../libempathy-gtk/empathy-chat.c:2322
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2358
+#: ../libempathy-gtk/empathy-chat.c:2347
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?°å?¨å?«å?? %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2497
-#: ../src/empathy-streamed-media-window.c:1942
+#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../src/empathy-streamed-media-window.c:1949
 #: ../src/empathy-event-manager.c:1122
 msgid "Disconnected"
 msgstr "å·²æ?å¼?è¿?æ?¥"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-chat.c:3116
 msgid "Would you like to store this password?"
 msgstr "æ?¯å?¦ä¿?å?å¯?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3133
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3122
 msgid "Remember"
-msgstr "æ??å??"
+msgstr "è®°ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:3143
+#: ../libempathy-gtk/empathy-chat.c:3132
 msgid "Not now"
 msgstr "æ??ä¸?"
 
-#: ../libempathy-gtk/empathy-chat.c:3187
+#: ../libempathy-gtk/empathy-chat.c:3176
 msgid "Retry"
 msgstr "é??è¯?"
 
-#: ../libempathy-gtk/empathy-chat.c:3191
+#: ../libempathy-gtk/empathy-chat.c:3180
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç ?é??è¯¯ï¼?è¯·é??è¯?ï¼?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3308
+#: ../libempathy-gtk/empathy-chat.c:3297
 msgid "This room is protected by a password:"
 msgstr "è¿?ä¸ªæ?¿é?´æ?¯ç?±ä¸?ä¸ªå¯?ç ?ä¿?æ?¤ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3335
+#: ../libempathy-gtk/empathy-chat.c:3324
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
 msgid "Connected"
 msgstr "å·²è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3558
-#: ../libempathy-gtk/empathy-log-window.c:654
+#: ../libempathy-gtk/empathy-chat.c:3547
+#: ../libempathy-gtk/empathy-log-window.c:650
 msgid "Conversation"
 msgstr "å¯¹è¯?"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+msgid "Unknown or invalid identifier"
+msgstr "æ?ªç?¥æ??æ? æ??ç??è¯?å?«ç¬¦"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+msgid "Contact blocking temporarily unavailable"
+msgstr "è??ç³»äººå±?è?½ä¸´æ?¶ä¸?å?¯ç?¨"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+msgid "Contact blocking unavailable"
+msgstr "è??ç³»äººå±?è?½ä¸?å?¯ç?¨"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+msgid "Permission Denied"
+msgstr "æ??é??ä¸?è¶³"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+msgid "Could not block contact"
+msgstr "æ? æ³?å±?è?½è??ç³»äºº"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+msgid "Edit Blocked Contacts"
+msgstr "ç¼?è¾?å±?è?½ç??è??ç³»äºº"
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
 #: ../libempathy-gtk/empathy-theme-adium.c:794
@@ -1495,28 +1515,55 @@ msgstr "æ??å¼?é?¾æ?¥(_O)"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-contact-dialogs.c:299
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "ç¼?è¾?è??ç³»äººä¿¡æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
+#: ../libempathy-gtk/empathy-contact-dialogs.c:350
 msgid "Personal Information"
 msgstr "ä¸ªäººä¿¡æ?¯"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
+#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-individual-dialogs.c:119
 msgid "New Contact"
 msgstr "æ?°å»ºè??ç³»äºº"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.c:532
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "å±?è?½ %sï¼?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:537
+#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "ç¡®å®?è¦?å±?è?½ %s ä»¥é?»æ¢ä»?å??æ¬¡è??ç³»æ?¨ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:542
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "å±?è?½(_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:552
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] ""
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
-msgstr "ä»¥å??å??å?³å®?(_L)"
+msgstr "ä»¥å??å??è¯´(_L)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "è®¢é??è¯·æ±?"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "_Block User"
+msgstr "å±?è?½ç?¨æ?·(_B)"
+
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
 msgstr "æ?ªå??ç»?"
@@ -1525,305 +1572,301 @@ msgstr "æ?ªå??ç»?"
 msgid "Favorite People"
 msgstr "æ?¶è??å¤¹"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2012
-#: ../libempathy-gtk/empathy-individual-view.c:2309
+#: ../libempathy-gtk/empathy-contact-list-view.c:2001
+#: ../libempathy-gtk/empathy-individual-view.c:2336
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2014
-#: ../libempathy-gtk/empathy-individual-view.c:2312
+#: ../libempathy-gtk/empathy-contact-list-view.c:2003
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 msgid "Removing group"
 msgstr "å? é?¤ç¾¤ç»?"
 
 #. Remove
-#: ../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
+#: ../libempathy-gtk/empathy-contact-list-view.c:2052
+#: ../libempathy-gtk/empathy-contact-list-view.c:2129
+#: ../libempathy-gtk/empathy-individual-view.c:2394
+#: ../libempathy-gtk/empathy-individual-view.c:2588
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2093
-#: ../libempathy-gtk/empathy-individual-view.c:2417
+#: ../libempathy-gtk/empathy-contact-list-view.c:2082
+#: ../libempathy-gtk/empathy-individual-view.c:2458
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??ç³»äººâ??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2095
-#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-contact-list-view.c:2084
+#: ../libempathy-gtk/empathy-individual-view.c:2479
 msgid "Removing contact"
 msgstr "å? é?¤è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:204
+#: ../libempathy-gtk/empathy-contact-menu.c:219
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ·»å? è??ç³»äºº(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:296
+msgid "_Block Contact"
+msgstr "å±?è?½è??ç³»äºº(_B)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:325
 #: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:262
+#: ../libempathy-gtk/empathy-contact-menu.c:356
 #: ../libempathy-gtk/empathy-individual-menu.c:560
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "é?³é¢?å?¼å?«(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:293
+#: ../libempathy-gtk/empathy-contact-menu.c:387
 #: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è§?é¢?å?¼å?«(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:339
+#: ../libempathy-gtk/empathy-contact-menu.c:433
 #: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "æ??è¿?ä¼?è¯?(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-contact-menu.c:455
 #: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "å??é??æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:384
+#: ../libempathy-gtk/empathy-contact-menu.c:478
 #: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "å?±äº«æ??ç??æ¡?é?¢"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-menu.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:1763
+#: ../libempathy-gtk/empathy-individual-menu.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "æ?¶è??"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:453
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:791
 msgid "Infor_mation"
 msgstr "ä¿¡æ?¯(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:499
+#: ../libempathy-gtk/empathy-contact-menu.c:593
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:553
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-contact-menu.c:647
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:935
 msgid "Inviting you to this room"
 msgstr "é??è¯·å?°æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:584
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:678
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "é??è¯·å?°è??å¤©å®¤(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:456
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
 msgid "Search contacts"
-msgstr "é??æ?©ä¸?ä¸ªè??ç³»"
+msgstr "æ??ç´¢è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:486
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
 msgid "Search: "
-msgstr "æ??ç´¢"
+msgstr "æ??ç´¢ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:537
-#, fuzzy
-#| msgid "_Add Contactâ?¦"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
 msgid "_Add Contact"
-msgstr "æ·»å? è??ç³»äºº(_A)..."
+msgstr "æ·»å? è??ç³»äºº(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:555
-#, fuzzy
-#| msgid "No match found"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
 msgid "No contacts found"
-msgstr "æ²¡æ??æ?¾å?°å?¹é??é¡¹"
+msgstr "æ²¡æ??æ?¾å?°è??ç³»äºº"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é??æ?©ä¸?ä¸ªè??ç³»"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-contact-widget.c:295
 #: ../libempathy-gtk/empathy-individual-widget.c:153
 msgid "Full name:"
 msgstr "å?¨ç§°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-contact-widget.c:296
 #: ../libempathy-gtk/empathy-individual-widget.c:154
 msgid "Phone number:"
 msgstr "ç?µè¯?å?·ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-contact-widget.c:297
 #: ../libempathy-gtk/empathy-individual-widget.c:155
 msgid "E-mail address:"
 msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-contact-widget.c:298
 #: ../libempathy-gtk/empathy-individual-widget.c:156
 msgid "Website:"
 msgstr "ç½?ç«?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-contact-widget.c:299
 #: ../libempathy-gtk/empathy-individual-widget.c:157
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:724
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:488
 msgid "Country ISO Code:"
 msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:726
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:490
 msgid "Country:"
 msgstr "å?½å®¶ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:728
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:492
 msgid "State:"
 msgstr "ç??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:730
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:494
 msgid "City:"
 msgstr "å??å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:732
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:496
 msgid "Area:"
 msgstr "å?°å?ºï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:734
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:498
 msgid "Postal Code:"
 msgstr "é?®æ?¿ç¼?ç ?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:736
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:500
 msgid "Street:"
 msgstr "è¡?é??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:738
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:502
 msgid "Building:"
 msgstr "å»ºç?ç?©ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:740
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:504
 msgid "Floor:"
 msgstr "æ¥¼å±?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:742
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:506
 msgid "Room:"
 msgstr "æ?¿é?´ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:744
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:508
 msgid "Text:"
 msgstr "æ??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:510
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:512
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:514
 msgid "Accuracy Level:"
 msgstr "å??ç¡®ç¨?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:516
 msgid "Error:"
 msgstr "é??è¯¯ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:518
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:520
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³è¯¯å·®(ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:796
+#: ../libempathy-gtk/empathy-individual-widget.c:522
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:798
+#: ../libempathy-gtk/empathy-individual-widget.c:524
 msgid "Bearing:"
 msgstr "æ?¹ä½?æ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:800
+#: ../libempathy-gtk/empathy-individual-widget.c:526
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:802
+#: ../libempathy-gtk/empathy-individual-widget.c:528
 msgid "Last Updated on:"
 msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:804
+#: ../libempathy-gtk/empathy-individual-widget.c:530
 msgid "Longitude:"
 msgstr "ç»?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:806
+#: ../libempathy-gtk/empathy-individual-widget.c:532
 msgid "Latitude:"
 msgstr "çº¬åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:808
+#: ../libempathy-gtk/empathy-individual-widget.c:534
 msgid "Altitude:"
 msgstr "æµ·æ??ï¼?"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:888
+#: ../libempathy-gtk/empathy-individual-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:633
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:852
-#: ../libempathy-gtk/empathy-individual-widget.c:634
+#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-individual-widget.c:635
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../libempathy-gtk/empathy-individual-widget.c:683
+#: ../libempathy-gtk/empathy-contact-widget.c:942
+#: ../libempathy-gtk/empathy-individual-widget.c:684
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y äº? %R UTC æ?¶é?´"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:986
-#: ../libempathy-gtk/empathy-individual-widget.c:918
+#: ../libempathy-gtk/empathy-contact-widget.c:1024
+#: ../libempathy-gtk/empathy-individual-widget.c:919
 msgid "Save Avatar"
 msgstr "ä¿?å?å¤´å??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1042
-#: ../libempathy-gtk/empathy-individual-widget.c:976
+#: ../libempathy-gtk/empathy-contact-widget.c:1080
+#: ../libempathy-gtk/empathy-individual-widget.c:977
 msgid "Unable to save avatar"
 msgstr "æ? æ³?ä¿?å?å¤´å??"
 
@@ -1833,7 +1876,7 @@ msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
+#: ../libempathy-gtk/empathy-individual-widget.c:1307
 msgid "Alias:"
 msgstr "å?«å??ï¼?"
 
@@ -1853,7 +1896,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:1509
+#: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "æ ?è¯?ç¬¦ï¼?"
 
@@ -1890,10 +1933,20 @@ msgid "Select"
 msgstr "é??æ?©"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1432
+#: ../src/empathy-main-window.c:1436
 msgid "Group"
 msgstr "ç¾¤ç»?"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] ""
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
@@ -1919,27 +1972,30 @@ msgstr "å?¨å·¦ä¾§å??è¡¨ä¸é??ä¸ç??è??ç³»äººå°?è¢«ç»?å®?å?¨ä¸?èµ·ã??"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
 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:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "å??å¹¶è??ç³»äºº(_L)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2425
+#: ../libempathy-gtk/empathy-individual-view.c:2301
+msgid "Delete and _Block"
+msgstr "å? é?¤å¹¶å±?è?½(_B)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2467
 #, 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ï¼?æ³¨æ??è¿?å°?å? é?¤è¯¥ç»?ä¸?ç??æ??æ??è??ç³»äººã??"
+msgstr "æ?¨æ?¯å?¦ç¡®å®?è¦?å? é?¤å·²å??å¹¶ç??è??ç³»äºº %sï¼?æ³¨æ??è¿?å°?å? é?¤è¯¥ç»?ä¸?ç??æ??æ??è??ç³»äººã??"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -1986,17 +2042,13 @@ msgid "Link Contacts"
 msgstr "ç»?å®?è??ç³»äºº"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
 msgid "_Unlinkâ?¦"
-msgstr "è§£é?¤ç»?å®?(_U)â?¦"
+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 linked contacts into the separate contacts."
-msgstr "å°?æ?¾ç¤ºç??å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
+msgstr "å°?æ??æ?¾ç¤ºç??å·²ç»?å®?ç??è??ç³»äººå®?å?¨æ??å??ä¸ºå??ç?¬ç??è??ç³»äººã??"
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2007,27 +2059,23 @@ msgid "_Link"
 msgstr "ç»?å®?(_L)"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "Unlink meta-contact '%s'?"
+#, c-format
 msgid "Unlink linked contacts '%s'?"
-msgstr "è§£é?¤ç»?å®?å??è??ç³»äºº '%s'?"
+msgstr "è§£é?¤å·²ç»?å®?ç??è??ç³»äºº '%s'?"
 
 #: ../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 these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
-msgstr "æ?¯å?¦å¸?æ??è§£é?¤ç»?å®?è¯¥å??è??ç³»äºº? è¿?å°?å°?è¯¥å??è??ç³»äººæ??å??å?«ç??è??ç³»äººå®?å?¨å??å¼?ã??"
+msgstr ""
+"æ?¯å?¦å¸?æ??è§£é?¤è¿?äº?ç»?å®?ç??è??ç³»äººï¼?è¿?ä¼?å°?ç»?å®?ç??è??ç³»äººå®?å?¨æ??å??ä¸ºå??ç?¬ç??è??ç³»äººã??"
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "è§£é?¤ç»?å®?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:664
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -2075,17 +2123,17 @@ msgid "New Conversation"
 msgstr "æ?°å»ºå¯¹è¯?"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:253
 msgid "Send _Video"
 msgstr "å??é??è§?é¢?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+#: ../libempathy-gtk/empathy-new-call-dialog.c:261
 msgid "C_all"
 msgstr "é??è¯?(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+#: ../libempathy-gtk/empathy-new-call-dialog.c:271
 msgid "New Call"
 msgstr "æ?°å»ºé??è¯?"
 
@@ -2126,12 +2174,12 @@ msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 msgid "Set status"
 msgstr "è®¾ç½®ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
+#: ../libempathy-gtk/empathy-presence-chooser.c:946
 msgid "Set your presence and current status"
 msgstr "è®¾ç½®ä½ ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1134
 msgid "Custom messagesâ?¦"
 msgstr "è?ªå®?ä¹?æ¶?æ?¯..."
 
@@ -2205,16 +2253,12 @@ msgid "Edit Custom Messages"
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#, fuzzy
-#| msgid "Save message"
 msgid "Save _New Status Message"
-msgstr "ä¿?å?æ¶?æ?¯"
+msgstr "ä¿?å?æ?°ç??ç?¶æ??æ¶?æ?¯(_N)"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-#, fuzzy
-#| msgid "Save message"
 msgid "Saved Status Messages"
-msgstr "ä¿?å?æ¶?æ?¯"
+msgstr "ä¿?å?ç?¶æ??æ¶?æ?¯"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -2295,23 +2339,36 @@ msgstr "ç»§ç»"
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "è¿?æ?¥ä¸?å??ä¿¡ä»»ã??æ?¯å?¦ä»?è¦?ç»§ç»?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
 msgstr "ä¸ºå°?æ?¥ç??è¿?æ?¥è®°ä½?æ?¬æ¬¡é??æ?©"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:312
+#: ../libempathy-gtk/empathy-tls-dialog.c:303
 msgid "Certificate Details"
 msgstr "è¯?ä¹¦è¯¦æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1707
+#: ../libempathy-gtk/empathy-ui-utils.c:1705
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1802
+#: ../libempathy-gtk/empathy-ui-utils.c:1800
 msgid "Select a file"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Insufficient free space to save file"
+msgstr "å?©ä½?ç©ºé?´ä¸?è¶³æ? æ³?ä¿?å?æ??ä»¶"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"ä¿?å?æ¤æ??ä»¶é??è¦? %s ç©ºé?²ç©ºé?´ï¼?ä½?ç?°å?¨å?ªæ?? %s å?©ä½?ã??"
+"è¯·é??æ?©å?¶ä»?ä½?ç½®ã??"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1924
 #, c-format
 msgid "Incoming file from %s"
 msgstr "ä»? %s ä¼ æ?¥ç??æ??ä»¶"
@@ -2614,7 +2671,7 @@ msgstr ""
 "æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??ä¸å? å?¥è´¦æ?·ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "å??ç??é??è¯¯"
 
@@ -2677,17 +2734,17 @@ msgstr "æ²¡æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 msgid "Select the accounts you want to import:"
 msgstr "é??æ?©æ?¨è¦?å¯¼å?¥ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-account-assistant.c:813
 #: ../src/empathy-new-chatroom-dialog.c:562
 #: ../src/empathy-new-chatroom-dialog.c:563
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:817
+#: ../src/empathy-account-assistant.c:820
 msgid "No, that's all for now"
 msgstr "æ²¡æ??ï¼?å°±è¿?æ ·å?§"
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-account-assistant.c:1085
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2698,16 +2755,16 @@ msgstr ""
 "æ?³ä½¿ç?¨è¿?ä¸ªå??è?½ï¼?è¯·ä»?ç»?æ?¥ç??ä¸?å??ä¿¡æ?¯æ?¯å?¦æ£ç¡®ã??æ?¨ä¹?å??ä¹?å?¯ä»¥é??è¿?â??è´¦æ?·â??å¯¹è¯?æ¡?è½»æ?¾"
 "ç??ä¿®æ?¹è¿?äº?ä¿¡æ?¯æ??å?³é?è¿?ä¸ªå??è?½"
 
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1091
+#: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
 msgstr "ç¼?è¾?->è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
 msgstr "æ??ä¸?å?¯ç?¨æ¤ç?¹æ?§"
 
-#: ../src/empathy-account-assistant.c:1140
+#: ../src/empathy-account-assistant.c:1143
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2718,23 +2775,23 @@ msgstr ""
 "ç?¨è¯¥å??è?½ï¼?è¯·å®?è£? telepathy-salut å??ï¼?å¹¶ä¸?å?¨è´¦æ?·å¯¹è¯?æ¡?ä¸å??å»ºé??è¿?ç??äºº(People "
 "Nearby)è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:1146
+#: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
 
-#: ../src/empathy-account-assistant.c:1226
+#: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
 msgstr "æ¬¢è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1235
+#: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
 msgstr "å¯¼å?¥ç?°æ??å¸?æ?·"
 
-#: ../src/empathy-account-assistant.c:1253
+#: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
 msgstr "è¯·è¾?å?¥ä¸ªäººä¿¡æ?¯"
 
@@ -2801,16 +2858,12 @@ msgstr "æ?¨å°?è¦?é??æ?©å?¦ä¸?ä¸ªè´¦æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?
 
 #. Menu items: to enabled/disable the account
 #: ../src/empathy-accounts-dialog.c:1571
-#, fuzzy
-#| msgid "_Enabled"
 msgid "_Enable"
-msgstr "å·²å?¯ç?¨(_E)"
+msgstr "å?¯ç?¨(_E)"
 
 #: ../src/empathy-accounts-dialog.c:1572
-#, fuzzy
-#| msgid "_Enabled"
 msgid "_Disable"
-msgstr "å·²å?¯ç?¨(_E)"
+msgstr "ç¦?ç?¨(_D)"
 
 #: ../src/empathy-accounts-dialog.c:2086
 msgid ""
@@ -2844,11 +2897,11 @@ msgstr "æ·»å? (_A)..."
 msgid "_Importâ?¦"
 msgstr "å¯¼å?¥(_I)..."
 
-#: ../src/empathy-auth-client.c:243
+#: ../src/empathy-auth-client.c:246
 msgid " - Empathy authentication client"
 msgstr " - Empathy è®¤è¯?å®¢æ?·ç«¯"
 
-#: ../src/empathy-auth-client.c:259
+#: ../src/empathy-auth-client.c:262
 msgid "Empathy authentication client"
 msgstr "Empathy è®¤è¯?å®¢æ?·ç«¯"
 
@@ -2880,105 +2933,105 @@ msgstr "ä¼½é©¬"
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-streamed-media-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1166
 msgid "_Sidebar"
 msgstr "ä¾§è¾¹æ ?(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1185
+#: ../src/empathy-streamed-media-window.c:1186
 msgid "Audio input"
 msgstr "é?³é¢?è¾?å?¥"
 
-#: ../src/empathy-streamed-media-window.c:1189
+#: ../src/empathy-streamed-media-window.c:1190
 msgid "Video input"
 msgstr "è§?é¢?è¾?å?¥"
 
-#: ../src/empathy-streamed-media-window.c:1193
+#: ../src/empathy-streamed-media-window.c:1194
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-streamed-media-window.c:1198
+#: ../src/empathy-streamed-media-window.c:1205
 msgid "Details"
 msgstr "è¯¦ç»?ä¿¡æ?¯"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1267
+#: ../src/empathy-streamed-media-window.c:1274
 #, c-format
 msgid "Call with %s"
 msgstr "ä¸? %s é??è¯?"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-streamed-media-window.c:1346
+#: ../src/empathy-streamed-media-window.c:1353
 msgid "Call"
 msgstr "é??è¯?"
 
-#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-streamed-media-window.c:1507
 msgid "The IP address as seen by the machine"
 msgstr "æ?ºå?¨æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-streamed-media-window.c:1509
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet ä¸?æ??å?¡å?¨æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-streamed-media-window.c:1504
+#: ../src/empathy-streamed-media-window.c:1511
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¦ä¸?æ?¹æ??è§?ç?? IP å?°å??"
 
-#: ../src/empathy-streamed-media-window.c:1506
+#: ../src/empathy-streamed-media-window.c:1513
 msgid "The IP address of a relay server"
 msgstr "ä¸è½¬æ??å?¡å?¨ IP å?°å??"
 
-#: ../src/empathy-streamed-media-window.c:1508
+#: ../src/empathy-streamed-media-window.c:1515
 msgid "The IP address of the multicast group"
 msgstr "å¤?æ?ç»?ç?? IP å?°å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-streamed-media-window.c:2266
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-streamed-media-window.c:2327
 msgid "Technical Details"
 msgstr "æ??æ?¯ç»?è??"
 
-#: ../src/empathy-streamed-media-window.c:2358
+#: ../src/empathy-streamed-media-window.c:2365
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?é?³é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-streamed-media-window.c:2363
+#: ../src/empathy-streamed-media-window.c:2370
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s è½¯ä»¶æ? æ³?ç??è§£æ?¨è®¡ç®?æ?ºæ??æ?¯æ??ç??ä»»ä½?è§?é¢?æ ¼å¼?ã??"
 
-#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-streamed-media-window.c:2376
 #, 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-streamed-media-window.c:2375
+#: ../src/empathy-streamed-media-window.c:2382
 msgid "There was a failure on the network"
 msgstr "ç½?ç»?å?ºç?°ä¸?ä¸ªé??è¯¯"
 
-#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-streamed-media-window.c:2386
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2389
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?æ²¡æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
 
-#: ../src/empathy-streamed-media-window.c:2392
+#: ../src/empathy-streamed-media-window.c:2399
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2988,19 +3041,19 @@ msgstr ""
 "Telepathy ç»?ä»¶å?ºç?°äº?ä¸?äº?æ??å¤?ã??è¯·<a href=\"%s\">æ±?æ?¥è¿?ä¸ªé??è¯¯</a>ï¼?å¹¶é??ä¸?å¸®å?©è??"
 "å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
 
-#: ../src/empathy-streamed-media-window.c:2400
+#: ../src/empathy-streamed-media-window.c:2407
 msgid "There was a failure in the call engine"
 msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?ä¸ªæ??é??"
 
-#: ../src/empathy-streamed-media-window.c:2403
+#: ../src/empathy-streamed-media-window.c:2410
 msgid "The end of the stream was reached"
 msgstr "å·²å?°è¾¾æµ?ç??æ?«å°¾"
 
-#: ../src/empathy-streamed-media-window.c:2443
+#: ../src/empathy-streamed-media-window.c:2450
 msgid "Can't establish audio stream"
 msgstr "ä¸?è?½å»ºç«?é?³é¢?æµ?"
 
-#: ../src/empathy-streamed-media-window.c:2453
+#: ../src/empathy-streamed-media-window.c:2460
 msgid "Can't establish video stream"
 msgstr "ä¸?è?½å»ºç«?è§?é¢?æµ?"
 
@@ -3096,35 +3149,35 @@ msgstr "è§?é¢?é¢?è§?"
 msgid "_Call"
 msgstr "é??è¯?(_C)"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:481
+#: ../src/empathy-chat-window.c:486
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (å?? %u å?¶å®?)"
 
-#: ../src/empathy-chat-window.c:497
+#: ../src/empathy-chat-window.c:502
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d å?¶å®?æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:506
+#: ../src/empathy-chat-window.c:511
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d å?¨é?¨æ?ªè¯»)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:721
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -3160,7 +3213,7 @@ msgstr "å?³ç§»æ ?ç¾(_R)"
 msgid "Notify for All Messages"
 msgstr "æ??ç¤ºæ??æ??æ¶?æ?¯"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
 msgid "_Contents"
 msgstr "å??å®¹(_C)"
 
@@ -3172,7 +3225,7 @@ msgstr "å¯¹è¯?(_C)"
 msgid "_Detach Tab"
 msgstr "æ¼?ç§»æ ?ç¾(_D)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
@@ -3180,7 +3233,7 @@ msgstr "ç¼?è¾?(_E)"
 msgid "_Favorite Chat Room"
 msgstr "æ?¶è??è??å¤©å®¤(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
 msgid "_Help"
 msgstr "å¸®å?©(_H)"
 
@@ -3294,17 +3347,14 @@ msgstr "æ?¨è¢«é??è¯·å? å?¥ %s"
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??ä»¶ä¼ è¾?"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
-#, fuzzy
-#| msgid "Password"
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
 msgid "Password required"
-msgstr "å¯?ç ?"
+msgstr "é??è¦?å¯?ç ?"
 
 #: ../src/empathy-event-manager.c:1069
-#, fuzzy, c-format
-#| msgid "%s would like to send you a file"
+#, c-format
 msgid "%s would like permission to see when you are online"
-msgstr "%s æ?³è¦?ç»?æ?¨å??é??ä¸?ä¸ªæ??ä»¶"
+msgstr "%s æ?³è¦?æ?¥ç??æ?¨ä½?æ?¶å?¨çº¿ç??æ??é??"
 
 #: ../src/empathy-event-manager.c:1073
 #, c-format
@@ -3449,43 +3499,39 @@ msgstr "å??è®®"
 msgid "Source"
 msgstr "æº?"
 
-#: ../src/empathy-main-window.c:384
-#, fuzzy
-#| msgid "Password"
+#: ../src/empathy-main-window.c:387
 msgid "Provide Password"
-msgstr "å¯?ç ?"
+msgstr "æ??ä¾?å¯?ç ?"
 
-#: ../src/empathy-main-window.c:390
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-main-window.c:393
 msgid "Disconnect"
-msgstr "å·²æ?å¼?è¿?æ?¥"
+msgstr "æ?å¼?è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:530
+#: ../src/empathy-main-window.c:533
 msgid "No match found"
 msgstr "æ²¡æ??æ?¾å?°å?¹é??é¡¹"
 
-#: ../src/empathy-main-window.c:685
+#: ../src/empathy-main-window.c:688
 msgid "Reconnect"
 msgstr "é??æ?°è¿?æ?¥"
 
-#: ../src/empathy-main-window.c:691
+#: ../src/empathy-main-window.c:694
 msgid "Edit Account"
 msgstr "ç¼?è¾?è´¦æ?·"
 
-#: ../src/empathy-main-window.c:697
+#: ../src/empathy-main-window.c:700
 msgid "Close"
 msgstr "å?³é?"
 
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1418
 msgid "Contact"
 msgstr "è??ç³»äºº"
 
-#: ../src/empathy-main-window.c:1748
+#: ../src/empathy-main-window.c:1765
 msgid "Contact List"
 msgstr "è??ç³»äººå??è¡¨"
 
-#: ../src/empathy-main-window.c:1863
+#: ../src/empathy-main-window.c:1881
 msgid "Show and edit accounts"
 msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
 
@@ -3494,10 +3540,8 @@ msgid "Contacts on a _Map"
 msgstr "è??ç³»äººå?°å?¾(_M)"
 
 #: ../src/empathy-main-window.ui.h:2
-#, fuzzy
-#| msgid "Contact List"
 msgid "Find in Contact _List"
-msgstr "è??ç³»äººå??è¡¨"
+msgstr "å?¨è??ç³»äººå??è¡¨ä¸æ?¥æ?¾"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
@@ -3539,44 +3583,45 @@ msgstr "æ??ç?¶æ??æ??åº?(_S)"
 msgid "_Accounts"
 msgstr "è´¦æ?·(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "å·²å±?è?½ç??è??ç³»äºº(_B)"
+
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Compact Size"
 msgstr "ç´§å??è§?å?¾(_C)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
 msgid "_Debug"
 msgstr "è°?è¯?(_D)"
 
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
 msgid "_File Transfers"
 msgstr "æ??ä»¶ä¼ è¾?(_F)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "æ?°å»ºå¯¹è¯?(_N)..."
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
 msgstr "ç¦»çº¿è??ç³»äºº(_O)"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Personal Information"
 msgstr "ä¸ªäººä¿¡æ?¯(_P)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
 msgid "_Room"
 msgstr "è??å¤©å®¤(_R)"
 
-#: ../src/empathy-main-window.ui.h:27
-#, fuzzy
-#| msgctxt "Link individual (contextual menu)"
-#| msgid "_Link Contactsâ?¦"
+#: ../src/empathy-main-window.ui.h:28
 msgid "_Search for Contactsâ?¦"
-msgstr "ç»?å®?è??ç³»äºº(_L)â?¦"
+msgstr "æ??ç´¢è??ç³»äºº(_S)â?¦"
 
 #: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
@@ -3833,55 +3878,55 @@ msgstr "ä¿?å?"
 msgid "Debug Window"
 msgstr "è°?è¯?çª?å?£"
 
-#: ../src/empathy-debug-window.c:1474
+#: ../src/empathy-debug-window.c:1476
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-window.c:1486
+#: ../src/empathy-debug-window.c:1488
 msgid "Level "
 msgstr "çº§å?« "
 
-#: ../src/empathy-debug-window.c:1506
+#: ../src/empathy-debug-window.c:1508
 msgid "Debug"
 msgstr "è°?è¯?"
 
-#: ../src/empathy-debug-window.c:1512
+#: ../src/empathy-debug-window.c:1514
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
 msgid "Message"
 msgstr "æ¶?æ?¯"
 
-#: ../src/empathy-debug-window.c:1524
+#: ../src/empathy-debug-window.c:1526
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../src/empathy-debug-window.c:1530
+#: ../src/empathy-debug-window.c:1532
 msgid "Critical"
 msgstr "å?±æ?¥"
 
-#: ../src/empathy-debug-window.c:1536
+#: ../src/empathy-debug-window.c:1538
 msgid "Error"
 msgstr "é??è¯¯"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1557
 msgid "Time"
 msgstr "æ?¶é?´"
 
-#: ../src/empathy-debug-window.c:1558
+#: ../src/empathy-debug-window.c:1560
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1562
 msgid "Category"
 msgstr "ç±»å?«"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1564
 msgid "Level"
 msgstr "çº§å?«"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1601
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3906,10 +3951,9 @@ msgstr "ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?ï¼?å®?æ??æ??æ??å·¥ä½?ï¼?å¦?å¯¼å?¥ï¼?ç?¶å??é??å?º
 
 #: ../src/empathy-accounts.c:187
 #, fuzzy
-#| msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "å¦?æ??æ??ä»»ä½?é?? salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?å¯¹è¯?æ¡?"
+msgstr "å?¨å?ªæ?? \"People Nearby\"  è´¦æ?·ç??æ??å½¢ä¸?æ??æ?¾ç¤ºå¯¹è¯?æ¡?"
 
 # lainmeï¼?å??æ¬¡é??æ?©ç»?å®?ç??è´¦æ?·(æ¯?å¦? gabble/jabber/foo_40example_2eorg0)
 #: ../src/empathy-accounts.c:191
@@ -3933,10 +3977,8 @@ msgid "Empathy Debugger"
 msgstr "Empathy è°?è¯?å?¨"
 
 #: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Chat Client"
-msgstr " - Empathy IM å®¢æ?·ç«¯"
+msgstr " - Empathy è??å¤©å®¢æ?·ç«¯"
 
 #: ../src/empathy-notifications-approver.c:184
 msgid "Respond"
@@ -3960,6 +4002,16 @@ msgstr "æ??ç»?"
 msgid "Accept"
 msgstr "æ?¥å??"
 
+#: ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s ç??æ?ªæ?¥æ?¥ç?µ"
+
+#: ../src/empathy-call-observer.c:133
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s å??å??å°?è¯?äº?å?¼å?«æ?¨ï¼?ä½?å½?æ?¶æ?¨æ£å?¨ä¸?å?¶ä»?äººé??è¯?ã??"
+
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "æ?¥æ?¶å?°ç??æ??ä»¶å??å??é??ç??é?£ä¸ªæ??ä»¶å??å¸?å?¼ä¸?å?¹é??"
 
@@ -4170,9 +4222,6 @@ msgstr "æ?¥å??"
 #~ msgid "Conversations (%d)"
 #~ msgstr "å¯¹è¯? (%d)"
 
-#~ msgid "_Contact"
-#~ msgstr "è??ç³»äºº(_C)"
-
 #~ msgid "Allow _GPS usage"
 #~ msgstr "å??è®¸ä½¿ç?¨ GPS ä¿¡æ?¯(_G)"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]