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

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Tue, 22 Mar 2011 11:21:48 +0000 (UTC)
commit bf2ef141ceb1515dfabfd07b29236e13d333c884
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Tue Mar 22 19:21:39 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  827 +++++++++++++++++++++++++++++++++--------------------------
 po/zh_TW.po |  827 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 932 insertions(+), 722 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 0eaf097..a3fd3ca 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.91.90\n"
+"Project-Id-Version: empathy 2.91.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:27+0800\n"
-"PO-Revision-Date: 2011-02-23 19:28+0800\n"
+"POT-Creation-Date: 2011-03-22 19:20+0800\n"
+"PO-Revision-Date: 2011-03-22 19:21+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -422,23 +422,23 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2242
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
 msgstr "æª?æ¡?å?³è¼¸å®?ç?¢ï¼?ä½?æ?¯æª?æ¡?å·²æ??æ¯?"
 
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1113
 msgid "File transfer not supported by remote contact"
 msgstr "é? ç«¯è?¯çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
@@ -470,161 +470,161 @@ 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 "å·²æ?¤é?·è?æ?¸"
 
-#: ../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 è??å¤©"
 
@@ -668,86 +668,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:653
+#: ../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 "å¥?ç?¨(_A)"
 
-#: ../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:451
+#: ../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)"
 
@@ -756,19 +757,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 "æ?°å¢?å¸³è??"
 
@@ -1175,19 +1176,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 "æ??æ??æª?æ¡?"
 
@@ -1195,155 +1196,161 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-chat.c:652
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:717
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:723
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?è¢«å??è¨±æ?´æ?¹é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:906
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:909
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:912
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<è??å¤©å®¤ ID>] [<å??å? >]ï¼?é?¢é??è??å¤©å®¤ï¼?é ?è¨ç?ºç?®å??ç??è??å¤©å®¤"
+
+#: ../libempathy-gtk/empathy-chat.c:925
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:928
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:931
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ç¶²å??>ï¼?æ?´æ?¹å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??ä½ ç??ç¶²å??"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:934
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../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 "
 "join a new chat room\""
 msgstr "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å??å? æ?°ç??è??å¤©å®¤ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../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:884
+#: ../libempathy-gtk/empathy-chat.c:952
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1117
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1254
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1257
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1260
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1270
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1274
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1273 ../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:1285
+#: ../libempathy-gtk/empathy-chat.c:1347
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1349
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:1848
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../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:1891
+#: ../libempathy-gtk/empathy-chat.c:1953
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "å? å?¥ã??%sã??è?³ %s å?å?¸"
 
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2010
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../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:2003
+#: ../libempathy-gtk/empathy-chat.c:2063
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2152
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2263
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1351,12 +1358,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:2205
+#: ../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:2208
+#: ../libempathy-gtk/empathy-chat.c:2273
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1364,17 +1371,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:2216
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1384,66 +1391,90 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2297
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2322
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å??å? æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2347
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../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:3051
+#: ../libempathy-gtk/empathy-chat.c:3116
 msgid "Would you like to store this password?"
 msgstr "ä½ æ?³è¦?å?²å?æ¤å¯?ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3122
 msgid "Remember"
 msgstr "è¨?ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:3067
+#: ../libempathy-gtk/empathy-chat.c:3132
 msgid "Not now"
 msgstr "ç?¾å?¨ä¸?è¦?"
 
-#: ../libempathy-gtk/empathy-chat.c:3111
+#: ../libempathy-gtk/empathy-chat.c:3176
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:3115
+#: ../libempathy-gtk/empathy-chat.c:3180
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3232
+#: ../libempathy-gtk/empathy-chat.c:3297
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3259
+#: ../libempathy-gtk/empathy-chat.c:3324
 msgid "Join"
 msgstr "å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:3429 ../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:3482
-#: ../libempathy-gtk/empathy-log-window.c:660
+#: ../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
@@ -1462,20 +1493,43 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../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:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "å°?é?? %sï¼?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../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:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "å°?é??(_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "å??å ±é??äº?è?¯çµ¡äººæ¿«ç?¨å¸³è??(_R)"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
@@ -1484,6 +1538,10 @@ msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
 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 "æ?ªç¾£çµ?"
@@ -1492,114 +1550,122 @@ 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)â?¦"
+msgstr "å? å?¥è?¯çµ¡äºº(_A)â?¦"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr "å°?é??è?¯çµ¡äºº(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:328
 #: ../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:359
 #: ../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:390
 #: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:334
+#: ../libempathy-gtk/empathy-contact-menu.c:436
 #: ../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:356
+#: ../libempathy-gtk/empathy-contact-menu.c:458
 #: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:379
+#: ../libempathy-gtk/empathy-contact-menu.c:481
 #: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../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:521
+#: ../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:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:596
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../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:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
 msgid "Search contacts"
 msgstr "æ??å°?è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
 msgid "Search: "
 msgstr "æ??å°?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "å? å?¥è?¯çµ¡äºº(_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
 msgid "No contacts found"
 msgstr "æ?¾ä¸?å?°è?¯çµ¡äºº"
 
@@ -1607,178 +1673,178 @@ msgstr "æ?¾ä¸?å?°è?¯çµ¡äºº"
 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 "%Y %B %e æ?¼ %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 "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1788,7 +1854,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\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 "å?¥å??ï¼?"
 
@@ -1808,7 +1874,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 "è?å?¥èº«å??ï¼?"
 
@@ -1845,10 +1911,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"
@@ -1874,26 +1950,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ã??å??ï¼?è«?æ³¨æ??é??æ??ç§»é?¤æ??æ??æ§?æ??æ¤é?£çµ?è?¯çµ¡ç¾£ç??è?¯çµ¡äººã??"
 
-#: ../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"
@@ -1973,7 +2053,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:670
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -2021,17 +2101,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 "æ?°å¢?é??è©±"
 
@@ -2072,12 +2152,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 "è?ªé?¸è¨?æ?¯â?¦"
 
@@ -2229,31 +2309,42 @@ 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:297
 msgid "Remember this choice for future connections"
 msgstr "è«?è¨?ä½?æ¤é?¸æ??ä»¥ä¾?æ?ªä¾?é?£ç·?ä½¿ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../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 ç??æª?æ¡?"
@@ -2441,23 +2532,23 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:310
+#: ../src/empathy.c:308
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:314
+#: ../src/empathy.c:312
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?é¡¯ç¤ºè?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?è©±çª?"
 
-#: ../src/empathy.c:322
+#: ../src/empathy.c:320
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:499
 msgid "Error contacting the Account Manager"
 msgstr "è?¯çµ¡å¸³è??ç®¡ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy.c:503
+#: ../src/empathy.c:501
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2536,7 +2627,7 @@ msgid ""
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??æ¬¡è¼¸å?¥å¸³è??ç??è©³ç´°è³?æ??æ??çµ?æ??æ¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??ç·¨è¼¯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
+#: ../src/empathy-account-assistant.c:1271
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2596,17 +2687,17 @@ msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??èª°ä¸?ç·?"
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../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 "
@@ -2614,16 +2705,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢è??ä½ é?£ç·?å?°ç?¸å??ç¶²çµ¡ä¸?ç??äººå??ï¼?ä¸¦ä¸?å??ä»?å??è??å¤©ã??å¦?æ??ä½ æ?³è¦?ä½¿ç?¨æ¤å??è?½ï¼?è«?æª¢æ?¥ä¸?å??è©³ç´°è³?æ??æ?¯å?¦æ£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯ç?¨ã??å¸³è??ã??å°?è©±çª?ä¾?å??ç?¨æ¤å??è?½"
 
-#: ../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"
-msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½(_N)"
 
-#: ../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 "
@@ -2631,23 +2722,23 @@ msgid ""
 "the Accounts dialog"
 msgstr "ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?ç¶²çµ¡ç??äººå??è??å¤©ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??å¦?æ??ä½ æ?³è¦?å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../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 "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2725,7 +2816,7 @@ msgstr "å??ç?¨(_E)"
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../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?"
@@ -2759,11 +2850,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 èª?è?ç?¨æ?¶ç«¯"
 
@@ -2795,105 +2886,105 @@ msgstr "Gamma"
 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 "äº?è?¯ç¶²ä¸?ç??ä¼ºæ??å?¨ç??è¦?ç?? 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"
@@ -2901,19 +2992,19 @@ msgid ""
 "the Help menu."
 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 "ç?¡æ³?å»ºç«?è¦?å??ä¸²æµ?"
 
@@ -3009,35 +3100,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 "æ£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3073,7 +3164,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)"
 
@@ -3085,7 +3176,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)"
 
@@ -3093,7 +3184,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)"
 
@@ -3167,7 +3258,7 @@ msgstr "æ?¥è?½(_A)"
 #: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "ä¾?è?ª %s ç??è¦?å??é?»è©±"
+msgstr "ä¾?è?ª %s ç??è¦?å??é??è©±"
 
 #: ../src/empathy-event-manager.c:737
 msgid "Room invitation"
@@ -3207,7 +3298,7 @@ msgstr "ä½ è¢«é??è«?å??å?  %s"
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
 msgid "Password required"
 msgstr "é??è¦?å¯?ç¢¼"
 
@@ -3359,39 +3450,39 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:387
 msgid "Provide Password"
 msgstr "æ??ä¾?å¯?ç¢¼"
 
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:393
 msgid "Disconnect"
 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:1862
+#: ../src/empathy-main-window.c:1881
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3443,39 +3534,43 @@ msgstr "æ ¹æ??ç??æ??æ??åº?(_S)"
 msgid "_Accounts"
 msgstr "å¸³è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "è¢«å°?é??ç??è?¯çµ¡äºº"
+
+#: ../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
+#: ../src/empathy-main-window.ui.h:28
 msgid "_Search for Contactsâ?¦"
 msgstr "æ??å°?è?¯çµ¡äºº(_S)â?¦"
 
@@ -3489,7 +3584,7 @@ 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:565
+#: ../src/empathy-new-chatroom-dialog.c:560
 #, c-format
 msgid ""
 "%s\n"
@@ -3502,16 +3597,16 @@ msgstr ""
 "é??è¦?å¯?ç¢¼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??å¤©å®¤æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ¢å??å?ºè??å¤©å®¤æ¸?å?®"
 
@@ -3732,55 +3827,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."
@@ -3799,28 +3894,28 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?è©±ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:179
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ (ä¾?ï¼?å?¯å?¥) ä¸¦é?¢é??"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:187
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-accounts.c:187
+#: ../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:189
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy å¸³è??"
 
-#: ../src/empathy-accounts.c:233
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy å¸³è??"
 
@@ -3854,6 +3949,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 "%s is now offline."
 #~ msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a059880..edc6fae 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.91.90\n"
+"Project-Id-Version: empathy 2.91.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-23 19:27+0800\n"
-"PO-Revision-Date: 2011-02-18 16:24+0800\n"
+"POT-Creation-Date: 2011-03-22 19:20+0800\n"
+"PO-Revision-Date: 2011-03-20 17:03+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "Language: zh_TW\n"
@@ -424,23 +424,23 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2229
+#: ../src/empathy-accounts-dialog.c:2242
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
-#: ../libempathy/empathy-ft-handler.c:835
+#: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
 msgstr "æª?æ¡?å?³è¼¸å®?ç?¢ï¼?ä½?æ?¯æª?æ¡?å·²æ??æ¯?"
 
-#: ../libempathy/empathy-ft-handler.c:1126
+#: ../libempathy/empathy-ft-handler.c:1113
 msgid "File transfer not supported by remote contact"
 msgstr "é? ç«¯é?£çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1182
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1191
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
@@ -472,161 +472,161 @@ 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 "å·²æ?¤é?·æ??è?"
 
-#: ../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 è??å¤©"
 
@@ -670,86 +670,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:653
+#: ../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 "å¥?ç?¨(_A)"
 
-#: ../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:451
+#: ../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)"
 
@@ -758,19 +759,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 "æ?°å¢?å¸³è??"
 
@@ -1178,19 +1179,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 "æ??æ??æª?æ¡?"
 
@@ -1198,51 +1199,57 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£¡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:646
+#: ../libempathy-gtk/empathy-chat.c:652
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:697
+#: ../libempathy-gtk/empathy-chat.c:717
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:703
+#: ../libempathy-gtk/empathy-chat.c:723
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?è¢«å??è¨±è®?æ?´é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:906
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearï¼?æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:909
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:912
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:915
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å??å? æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:920
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<è??å¤©å®¤ ID>] [<å??å? >]ï¼?é?¢é??è??å¤©å®¤ï¼?é ?è¨ç?ºç?®å??ç??è??å¤©å®¤"
+
+#: ../libempathy-gtk/empathy-chat.c:925
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:928
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:931
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:934
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../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 "
@@ -1251,7 +1258,7 @@ msgstr ""
 "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å??å? æ?°ç??è??å¤©å®¤ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:874
+#: ../libempathy-gtk/empathy-chat.c:942
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1259,98 +1266,98 @@ msgstr ""
 "/help [<å?½ä»¤>]ï¼?é¡¯ç¤ºæ??æ??æ?¯æ?´ç??æ??ä»¤ã??å¦?æ??æ??å®?ç¾©é??å?? <å?½ä»¤> ç??è©±ï¼?ä¾¿é¡¯ç¤ºå®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:952
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:991
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1117
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1254
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1195
+#: ../libempathy-gtk/empathy-chat.c:1257
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1198
+#: ../libempathy-gtk/empathy-chat.c:1260
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1204
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:1270
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1274
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1273 ../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:1285
+#: ../libempathy-gtk/empathy-chat.c:1347
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1287
+#: ../libempathy-gtk/empathy-chat.c:1349
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1786
+#: ../libempathy-gtk/empathy-chat.c:1848
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1854
+#: ../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:1891
+#: ../libempathy-gtk/empathy-chat.c:1953
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "å? å?¥ã??%sã??è?³ %s å?å?¸"
 
-#: ../libempathy-gtk/empathy-chat.c:1950
+#: ../libempathy-gtk/empathy-chat.c:2010
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1968
-#: ../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:2003
+#: ../libempathy-gtk/empathy-chat.c:2063
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2152
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2198
+#: ../libempathy-gtk/empathy-chat.c:2263
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1358,12 +1365,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:2205
+#: ../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:2208
+#: ../libempathy-gtk/empathy-chat.c:2273
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1371,17 +1378,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:2216
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2219
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2223
+#: ../libempathy-gtk/empathy-chat.c:2288
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1391,66 +1398,90 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2232
+#: ../libempathy-gtk/empathy-chat.c:2297
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2257
+#: ../libempathy-gtk/empathy-chat.c:2322
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å??å? æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2282
+#: ../libempathy-gtk/empathy-chat.c:2347
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2421
-#: ../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:3051
+#: ../libempathy-gtk/empathy-chat.c:3116
 msgid "Would you like to store this password?"
 msgstr "æ?¨æ?³è¦?å?²å?æ¤å¯?ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3057
+#: ../libempathy-gtk/empathy-chat.c:3122
 msgid "Remember"
 msgstr "è¨?ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:3067
+#: ../libempathy-gtk/empathy-chat.c:3132
 msgid "Not now"
 msgstr "ç?¾å?¨ä¸?è¦?"
 
-#: ../libempathy-gtk/empathy-chat.c:3111
+#: ../libempathy-gtk/empathy-chat.c:3176
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:3115
+#: ../libempathy-gtk/empathy-chat.c:3180
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3232
+#: ../libempathy-gtk/empathy-chat.c:3297
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:3259
+#: ../libempathy-gtk/empathy-chat.c:3324
 msgid "Join"
 msgstr "å??å? "
 
-#: ../libempathy-gtk/empathy-chat.c:3429 ../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:3482
-#: ../libempathy-gtk/empathy-log-window.c:660
+#: ../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
@@ -1469,20 +1500,43 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../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:533
+#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#, c-format
+msgid "Block %s?"
+msgstr "å°?é?? %sï¼?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../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:543
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+msgid "_Block"
+msgstr "å°?é??(_B)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "å??å ±é??äº?è?¯çµ¡äººæ¿«ç?¨å¸³è??(_R)"
+
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
@@ -1491,6 +1545,10 @@ msgstr "ç¨?å¾?å??æ±ºå®?(_L)"
 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 "æ?ªç¾¤çµ?"
@@ -1499,114 +1557,122 @@ 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)â?¦"
+msgstr "å? å?¥è?¯çµ¡äºº(_A)â?¦"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:299
+msgid "_Block Contact"
+msgstr "å°?é??è?¯çµ¡äºº(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-contact-menu.c:328
 #: ../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:359
 #: ../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:390
 #: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:334
+#: ../libempathy-gtk/empathy-contact-menu.c:436
 #: ../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:356
+#: ../libempathy-gtk/empathy-contact-menu.c:458
 #: ../libempathy-gtk/empathy-individual-menu.c:686
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:379
+#: ../libempathy-gtk/empathy-contact-menu.c:481
 #: ../libempathy-gtk/empathy-individual-menu.c:728
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:419
-#: ../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:521
+#: ../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:448
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../libempathy-gtk/empathy-individual-menu.c:791
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:494
+#: ../libempathy-gtk/empathy-contact-menu.c:596
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:548
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-contact-menu.c:650
+#: ../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:579
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:681
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:445
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
 msgid "Search contacts"
 msgstr "æ??å°?é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:473
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
 msgid "Search: "
 msgstr "æ??å°?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:534
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+msgid "_Add Contact"
+msgstr "å? å?¥è?¯çµ¡äºº(_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
 msgid "No contacts found"
 msgstr "æ?¾ä¸?å?°è?¯çµ¡äºº"
 
@@ -1614,178 +1680,178 @@ msgstr "æ?¾ä¸?å?°è?¯çµ¡äºº"
 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 "%Y %B %e æ?¼ %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 "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1795,7 +1861,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\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 "å?¥å??ï¼?"
 
@@ -1815,7 +1881,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 "è?å?¥èº«å??ï¼?"
 
@@ -1853,10 +1919,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"
@@ -1882,19 +1958,23 @@ 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 "
@@ -1903,7 +1983,7 @@ 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"
@@ -1984,7 +2064,7 @@ msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:670
+#: ../libempathy-gtk/empathy-log-window.c:660
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -2032,17 +2112,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 "æ?°å¢?é??è©±"
 
@@ -2083,12 +2163,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 "è?ªè¨?è¨?æ?¯â?¦"
 
@@ -2240,31 +2320,42 @@ 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:297
 msgid "Remember this choice for future connections"
 msgstr "è«?è¨?ä½?æ¤é?¸æ??ä»¥ä¾?æ?ªä¾?é?£ç·?ä½¿ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../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 ç??æª?æ¡?"
@@ -2452,23 +2543,23 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:310
+#: ../src/empathy.c:308
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:314
+#: ../src/empathy.c:312
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?é¡¯ç¤ºé?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?è©±çª?"
 
-#: ../src/empathy.c:322
+#: ../src/empathy.c:320
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:499
 msgid "Error contacting the Account Manager"
 msgstr "è?¯çµ¡å¸³è??ç®¡ç??ç¨?å¼?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy.c:503
+#: ../src/empathy.c:501
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2557,7 +2648,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 "ç?¼ç??é?¯èª¤"
 
@@ -2620,17 +2711,17 @@ msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??èª°ä¸?ç·?"
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??å¸³è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../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 "
@@ -2641,16 +2732,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"
-msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
+#: ../src/empathy-account-assistant.c:1107
+msgid "I do _not want to enable this feature for now"
+msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½(_N)"
 
-#: ../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 "
@@ -2661,23 +2752,23 @@ msgstr ""
 "å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³"
 "è??"
 
-#: ../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 "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2755,7 +2846,7 @@ msgstr "å??ç?¨(_E)"
 msgid "_Disable"
 msgstr "å??ç?¨(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2073
+#: ../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?"
@@ -2789,11 +2880,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 èª?è?ç?¨æ?¶ç«¯"
 
@@ -2825,105 +2916,105 @@ msgstr "Gamma"
 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 "ç¶²é??ç¶²è·¯ä¸?ç??ä¼ºæ??å?¨ç??è¦?ç?? 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"
@@ -2933,19 +3024,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 "ç?¡æ³?å»ºç«?è¦?è¨?ä¸²æµ?"
 
@@ -3041,35 +3132,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 "æ£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3105,7 +3196,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)"
 
@@ -3117,7 +3208,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)"
 
@@ -3125,7 +3216,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)"
 
@@ -3199,7 +3290,7 @@ msgstr "æ?¥è?½(_A)"
 #: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "ä¾?è?ª %s ç??è¦?è¨?é?»è©±"
+msgstr "ä¾?è?ª %s ç??è¦?è¨?é??è©±"
 
 #: ../src/empathy-event-manager.c:737
 msgid "Room invitation"
@@ -3239,7 +3330,7 @@ msgstr "æ?¨è¢«é??è«?å??å?  %s"
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
 msgid "Password required"
 msgstr "é??è¦?å¯?ç¢¼"
 
@@ -3391,39 +3482,39 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../src/empathy-main-window.c:384
+#: ../src/empathy-main-window.c:387
 msgid "Provide Password"
 msgstr "æ??ä¾?å¯?ç¢¼"
 
-#: ../src/empathy-main-window.c:390
+#: ../src/empathy-main-window.c:393
 msgid "Disconnect"
 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:1862
+#: ../src/empathy-main-window.c:1881
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3475,39 +3566,43 @@ msgstr "ä¾?ç??æ??æ??åº?(_S)"
 msgid "_Accounts"
 msgstr "å¸³è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "è¢«å°?é??ç??è?¯çµ¡äºº"
+
+#: ../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
+#: ../src/empathy-main-window.ui.h:28
 msgid "_Search for Contactsâ?¦"
 msgstr "æ??å°?è?¯çµ¡äºº(_S)â?¦"
 
@@ -3521,7 +3616,7 @@ 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:565
+#: ../src/empathy-new-chatroom-dialog.c:560
 #, c-format
 msgid ""
 "%s\n"
@@ -3534,16 +3629,16 @@ msgstr ""
 "é??è¦?å¯?ç¢¼ï¼?%s\n"
 "æ??å?¡ï¼?%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:567
-#: ../src/empathy-new-chatroom-dialog.c:568
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "å?¦"
 
-#: ../src/empathy-new-chatroom-dialog.c:596
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "ç?¡æ³?é??å§?å??å?ºè??å¤©å®¤æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.c:606
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "ç?¡æ³?å??æ¢å??å?ºè??å¤©å®¤æ¸?å?®"
 
@@ -3767,55 +3862,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."
@@ -3834,28 +3929,28 @@ msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?è©±ç??è?¯çµ¡äººï¼?"
 msgid "Invite"
 msgstr "é??è«?"
 
-#: ../src/empathy-accounts.c:179
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?å?·è¡?ä»»ä½?ä½?æ¥ (ä¾?ï¼?å?¯å?¥) ä¸¦é?¢é??"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:187
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ä¸?è¦?é¡¯ç¤ºä»»ä½?å°?è©±çª?ï¼?é?¤é??å?ªæ??ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-accounts.c:187
+#: ../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:189
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
 msgstr "- Empathy å¸³è??"
 
-#: ../src/empathy-accounts.c:233
+#: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
 msgstr "Empathy å¸³è??"
 
@@ -3889,6 +3984,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 "%s is now offline."
 #~ msgstr "%s ç?¾å?¨é?¢ç·?ã??"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]