[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: Mon, 23 Aug 2010 12:03:30 +0000 (UTC)
commit 3ecae374709ef76a984656f90f360e5f42831fc0
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Mon Aug 23 20:03:21 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  826 +++++++++++++++++++++++++++++++++++++----------------------
 po/zh_TW.po |  826 +++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 1030 insertions(+), 622 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 39541d8..2a49cd6 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.5\n"
+"Project-Id-Version: empathy 2.31.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-24 19:59+0800\n"
-"PO-Revision-Date: 2010-07-24 20:00+0800\n"
+"POT-Creation-Date: 2010-08-23 20:02+0800\n"
+"PO-Revision-Date: 2010-08-23 20:02+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -432,77 +432,77 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
-#: ../libempathy/empathy-ft-handler.c:843
+#: ../libempathy/empathy-ft-handler.c:851
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?ç¬¦"
 
-#: ../libempathy/empathy-ft-handler.c:1103
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "é? ç«¯è?¯çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1161
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1170
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-file.c:281
+#: ../libempathy/empathy-tp-file.c:283
 msgid "Socket type not supported"
 msgstr "Socket é¡?å??ä¸?æ?¯æ?´"
 
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-tp-file.c:402
 msgid "No reason was specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-tp-file.c:405
 msgid "The change in state was requested"
 msgstr "å·²è¦?æ±?æ?´æ?¹ç??æ??"
 
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-tp-file.c:408
 msgid "You canceled the file transfer"
 msgstr "ä½ å·²å??æ¶?æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-tp-file.c:411
 msgid "The other participant canceled the file transfer"
 msgstr "å?¶ä»?ç??å??è??è??å??æ¶?äº?æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-tp-file.c:414
 msgid "Error while trying to transfer the file"
 msgstr "å??è©¦å?³è¼¸æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-tp-file.c:417
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
 msgid "Unknown reason"
 msgstr "ä¸?æ??å??å? "
 
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:242
 msgid "Available"
 msgstr "æ??ç©º"
 
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:247
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../libempathy/empathy-utils.c:250
+#: ../libempathy/empathy-utils.c:249
 msgid "Invisible"
 msgstr "é?±è??"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-utils.c:251
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy/empathy-utils.c:254 ../src/empathy-call-window.c:1763
-#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
-#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
+#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -510,19 +510,19 @@ msgstr "ä¸?æ??"
 msgid "No reason specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
 msgid "Status is set to offline"
 msgstr "ç??æ??è¨ç?ºé?¢ç·?"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
 msgid "Network error"
 msgstr "ç¶²çµ¡é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
 msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
 msgid "Encryption error"
 msgstr "å? å¯?ç?¼ç??é?¯èª¤"
 
@@ -530,31 +530,31 @@ msgstr "å? å¯?ç?¼ç??é?¯èª¤"
 msgid "Name in use"
 msgstr "ä½¿ç?¨ä¸ç??å??ç¨±"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate not provided"
 msgstr "æ²?æ??æ??ä¾?è?æ?¸"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate untrusted"
 msgstr "è?æ?¸ä¸?è¢«ä¿¡ä»»"
 
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate expired"
 msgstr "è?æ?¸å·²é?¾æ??"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
 msgid "Certificate not activated"
 msgstr "è?æ?¸å°?æ?ªä½¿ç?¨"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
 msgid "Certificate hostname mismatch"
 msgstr "è?æ?¸ä¸»æ©?å??ç¨±ä¸?ç¬¦"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
 msgid "Certificate fingerprint mismatch"
 msgstr "è?æ?¸æ??ç´?æª?ä¸?ç¬¦"
 
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
 msgid "Certificate self-signed"
 msgstr "è?æ?¸ç?ºè?ªæ??ç°½ç½²"
 
@@ -562,15 +562,67 @@ msgstr "è?æ?¸ç?ºè?ªæ??ç°½ç½²"
 msgid "Certificate error"
 msgstr "è?æ?¸é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:352
+msgid "Encryption is not available"
+msgstr "å? å¯?ç?¡æ³?ä½¿ç?¨"
+
+#: ../libempathy/empathy-utils.c:354
+msgid "Certificate is invalid"
+msgstr "è?æ?¸ç?¡æ??"
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Connection has been refused"
+msgstr "é?£ç·?é?æ??"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Connection can't be established"
+msgstr "ç?¡æ³?å»ºç«?é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been lost"
+msgstr "å·²å¤±å?»é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "This resource is already connected to the server"
+msgstr "æ¤è³?æº?å·²é?£æ?¥è?³è©²ä¼ºæ??å?¨"
+
+#: ../libempathy/empathy-utils.c:364
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "é?£ç·?å·²è¢«ä½¿ç?¨ç?¸å??è³?æº?ç??æ?°é?£ç·?å??ä»£"
+
+#: ../libempathy/empathy-utils.c:367
+msgid "The account already exists on the server"
+msgstr "è©²å¸³è??å·²ç¶?å?å?¨æ?¼ä¼ºæ??å?¨ä¸?"
+
+#: ../libempathy/empathy-utils.c:369
+msgid "Server is currently too busy to handle the connection"
+msgstr "ä¼ºæ??å?¨ç?®å??é??æ?¼å¿?ç¢?ä»¥è?´æ?¼ç?¡æ³?è??ç??è©²é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "Certificate has been revoked"
+msgstr "å·²æ?¤é?·è?æ?¸"
+
+#: ../libempathy/empathy-utils.c:373
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "è?æ?¸ä½¿ç?¨ä¸?å®?å?¨ç??å¯?ç¢¼æ¼?ç®?æ³?ï¼?æ??æ?¯å¯?ç¢¼è??ç??ä¸?è¼?å¼±"
+
+#: ../libempathy/empathy-utils.c:376
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain exceed the limits imposed by the crypto library"
+msgstr "ä¼ºæ??å?¨è?æ?¸ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨è?æ?¸é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??é??å?¶ã??"
+
+#: ../libempathy/empathy-utils.c:529
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:441
+#: ../libempathy/empathy-utils.c:535
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -619,36 +671,38 @@ msgid "All"
 msgstr "å?¨é?¨"
 
 #: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:606
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1137
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1480
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1548
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1390
 #: ../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:1558
+#: ../libempathy-gtk/empathy-account-widget.c:1559
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1624
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1627
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
@@ -657,19 +711,19 @@ msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1995
+#: ../libempathy-gtk/empathy-account-widget.c:1996
 #, 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:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2022
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2026
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
@@ -770,7 +824,7 @@ msgstr "ä½ ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 msgid "_Character set:"
 msgstr "å?é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:246
 msgid "New Network"
 msgstr "æ?°å¢?ç¶²çµ¡"
 
@@ -1072,145 +1126,145 @@ msgstr "å??ç??"
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:323
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:645
+#: ../libempathy-gtk/empathy-chat.c:639
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:679
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:685
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?è¢«å??è¨±æ?´æ?¹é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:819
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:833
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:840
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ç¶²å??>ï¼?æ?´æ?¹å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??ä½ ç??ç¶²å??"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:846
 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:857
+#: ../libempathy-gtk/empathy-chat.c:851
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<å?½ä»¤>]ï¼?é¡¯ç¤ºæ??æ??æ?¯æ?´ç??æ??ä»¤ã??å¦?æ??æ??å®?ç¾©é??å?? <å?½ä»¤> ç??è©±ï¼?ä¾¿é¡¯ç¤ºå®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:861
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:890
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1011
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1169
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1291
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1293
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1777
+#: ../libempathy-gtk/empathy-chat.c:1772
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1849
-#: ../libempathy-gtk/empathy-ui-utils.c:1799
+#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1883
+#: ../libempathy-gtk/empathy-chat.c:1878
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:1955
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2061
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1218,12 +1272,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:2073
+#: ../libempathy-gtk/empathy-chat.c:2068
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?ºå?»"
 
-#: ../libempathy-gtk/empathy-chat.c:2076
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1231,17 +1285,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:2084
+#: ../libempathy-gtk/empathy-chat.c:2079
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2091
+#: ../libempathy-gtk/empathy-chat.c:2086
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1251,59 +1305,59 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2095
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2120
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2150
+#: ../libempathy-gtk/empathy-chat.c:2145
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
+#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2927
+#: ../libempathy-gtk/empathy-chat.c:2922
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2923
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:2933
+#: ../libempathy-gtk/empathy-chat.c:2928
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2929
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3074
+#: ../libempathy-gtk/empathy-chat.c:3069
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3127
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "è«?è©±"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:785
+#: ../libempathy-gtk/empathy-theme-adium.c:791
 msgid "_Copy Link Address"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:792
+#: ../libempathy-gtk/empathy-theme-adium.c:798
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
@@ -1314,6 +1368,7 @@ msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
 msgid "Edit Contact Information"
 msgstr "ç·¨è¼¯è?¯çµ¡äººè³?è¨?"
 
@@ -1334,101 +1389,102 @@ msgstr "ç¨?å¾?å??æ±ºå®?"
 msgid "Subscription Request"
 msgstr "è¨?é?±è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1984
-#: ../libempathy-gtk/empathy-individual-view.c:1948
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2083
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:1951
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2086
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾£çµ?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2035
-#: ../libempathy-gtk/empathy-contact-list-view.c:2112
-#: ../libempathy-gtk/empathy-individual-view.c:2005
-#: ../libempathy-gtk/empathy-individual-view.c:2090
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2225
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2065
-#: ../libempathy-gtk/empathy-individual-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2171
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2038
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2173
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤è?¯çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:223
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ?°å¢?è?¯çµ¡äºº(_A)â?¦"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../libempathy-gtk/empathy-individual-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:463
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:306
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:504
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??è©±(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:291
-#: ../libempathy-gtk/empathy-individual-menu.c:351
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:546
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:331
-#: ../libempathy-gtk/empathy-individual-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:604
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:444
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:645
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:486
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:687
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:416
-#: ../libempathy-gtk/empathy-contact-widget.c:1801
-#: ../libempathy-gtk/empathy-individual-menu.c:515
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1537
+#: ../libempathy-gtk/empathy-individual-menu.c:721
+#: ../libempathy-gtk/empathy-individual-widget.c:1283
 msgid "Favorite"
 msgstr "å??å¥½"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:445
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:491
+#: ../libempathy-gtk/empathy-contact-menu.c:490
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:545
-#: ../libempathy-gtk/empathy-individual-menu.c:664
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:934
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:576
-#: ../libempathy-gtk/empathy-individual-menu.c:702
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:981
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
@@ -1436,149 +1492,174 @@ msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "é?»è©±è??ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "é?»å?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:222
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "ç¶²ç«?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:223
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "Select"
-msgstr "é?¸æ??"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../src/empathy-main-window.c:1195
-msgid "Group"
-msgstr "ç¾£çµ?"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "Country ISO Code:"
 msgstr "å??å®¶ ISO ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country:"
 msgstr "å??å®¶ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "City:"
 msgstr "å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:849
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:851
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:853
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Building:"
 msgstr "å»ºç¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:857
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Floor:"
 msgstr "æ¨?å±¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:859
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Room:"
 msgstr "å®¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Text:"
 msgstr "æ??å?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Accuracy Level:"
 msgstr "æº?ç¢ºåº¦ç?ç´?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:869
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Error:"
 msgstr "é?¯èª¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:873
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:877
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Bearing:"
 msgstr "æ?¹ä½?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:879
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:881
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Last Updated on:"
 msgstr "ä¸?æ¬¡æ?´æ?°æ?¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:883
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Longitude:"
 msgstr "ç¶?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:885
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Latitude:"
 msgstr "ç·¯åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:887
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Altitude:"
 msgstr "ç·¯åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:950
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:578
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:966
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:594
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:642
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1100
+#: ../libempathy-gtk/empathy-contact-widget.c:838
+#: ../libempathy-gtk/empathy-individual-widget.c:832
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1156
+#: ../libempathy-gtk/empathy-contact-widget.c:894
+#: ../libempathy-gtk/empathy-individual-widget.c:890
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1586,7 +1667,9 @@ msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1218
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1599,45 +1682,96 @@ msgid "Client:"
 msgstr "ç?¨æ?¶ç«¯ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-msgid "Groups"
-msgstr "ç¾£çµ?"
-
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1419
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Information requestedâ?¦"
 msgstr "è³?è¨?å·²è«?æ±?â?¦"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "ç??æ?¬ï¼?"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "ç¾£çµ?"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "è«?é?¸æ??é??å??è?¯çµ¡äººè¦?é¡¯ç?¾å?¨å?ªå??ç¾£çµ?ã??æ³¨æ??ä½ å?¯ä»¥é?¸æ??ä¸?å??ä»¥ä¸?ç??ç¾£çµ?æ??ä¸?é?¸æ??ç¾£çµ?ã??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Version:"
-msgstr "ç??æ?¬ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:603
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgid "Select"
+msgstr "é?¸æ??"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1231
+msgid "Group"
+msgstr "ç¾£çµ?"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "å??æ¶?é?£çµ?(_U)"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+msgid "Linked Contacts"
+msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:252
+msgid "Select contacts to link"
+msgstr "é?¸å??è¦?é?£çµ?ç??è?¯çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:303
+msgid "New contact preview"
+msgstr "æ?°å¢?è?¯çµ¡äººé ?è¦½"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:108
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:799
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:829
+msgctxt "Link individual (contextual menu)"
+msgid "_Linkâ?¦"
+msgstr "é?£çµ?(_L)â?¦"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "å¾?è¨è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?ä¼ºæ??å?¨"
@@ -1654,28 +1788,48 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../libempathy-gtk/empathy-linking-dialog.c:92
+msgid "Link Contacts"
+msgstr "é?£çµ?è?¯çµ¡äºº"
+
+#. Add button
+#: ../libempathy-gtk/empathy-linking-dialog.c:102
+msgid "_Link"
+msgstr "é?£çµ?(_L)"
+
+#: ../libempathy-gtk/empathy-log-window.c:646
 #: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "å¸³è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:649
+#: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "è«?è©±"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find next"
+msgstr "å°?æ?¾ä¸?ä¸?å??"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Find previous"
+msgstr "å°?æ?¾ä¸?ä¸?å??"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "ä½?è??(_F)ï¼?"
 
@@ -1694,18 +1848,17 @@ msgid "New Conversation"
 msgstr "æ?°å¢?è«?è©±"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:190
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
 msgid "Send _Video"
 msgstr "å?³é??è¦?å??(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:198
-#: ../src/empathy-call-window.ui.h:22
-msgid "_Call"
-msgstr "é??è©±(_C)"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "é??è©±(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:208
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "New Call"
 msgstr "æ?°å¢?é??è©±"
 
@@ -1830,15 +1983,15 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1696
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1791
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
@@ -2027,15 +2180,15 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:474
+#: ../src/empathy.c:414
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:478
+#: ../src/empathy.c:418
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?é¡¯ç¤ºè?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?è©±çª?"
 
-#: ../src/empathy.c:490
+#: ../src/empathy.c:435
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
@@ -2071,7 +2224,7 @@ msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
 "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯é??ä¼?æ??ç?¡å¿«å??è¦?ä½ ï¼?\n"
-"zh-l10n lists linux org tw\n"
+"chinese-l10n googlegroups com\n"
 "\n"
 "Cheng-Chia Tseng <pswo10680 gmail com>, 2009, 10\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2003, 05\n"
@@ -2106,7 +2259,7 @@ msgid ""
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??æ¬¡è¼¸å?¥å¸³è??ç??è©³ç´°è³?æ??æ??çµ?æ??æ¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??ç·¨è¼¯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1311
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2186,7 +2339,7 @@ msgstr "æ?¯"
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??æ¨£"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1125
 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 "
@@ -2194,16 +2347,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢è??ä½ é?£ç·?å?°ç?¸å??ç¶²çµ¡ä¸?ç??äººå??ï¼?ä¸¦ä¸?å??ä»?å??è??å¤©ã??å¦?æ??ä½ æ?³è¦?ä½¿ç?¨æ¤å??è?½ï¼?è«?æª¢æ?¥ä¸?å??è©³ç´°è³?æ??æ?¯å?¦æ£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯ç?¨ã??å¸³è??ã??å°?è©±çª?ä¾?å??ç?¨æ¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1131
+#: ../src/empathy-account-assistant.c:1187
 msgid "Edit->Accounts"
 msgstr "ç·¨è¼¯ -> å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1151
+#: ../src/empathy-account-assistant.c:1147
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1183
 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 "
@@ -2211,23 +2364,23 @@ msgid ""
 "the Accounts dialog"
 msgstr "ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?ç¶²çµ¡ç??äººå??è??å¤©ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??å¦?æ??ä½ æ?³è¦?å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1189
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut å°?æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1235
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1269
 msgid "Welcome to Empathy"
 msgstr "æ¡è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1278
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1296
 msgid "Please enter personal details"
 msgstr "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2244,7 +2397,7 @@ msgstr "æ??è??ä½ ç?? %s å¸³è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:799
+#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
 msgid "Connectingâ?¦"
 msgstr "é?£ç·?ä¸â?¦"
 
@@ -2337,101 +2490,121 @@ msgstr "- Empathy é?³è¨?è¦?å??ç?¨æ?¶ç«¯"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy é?³è¨?è¦?å??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-call-window.c:470
+#: ../src/empathy-call-window.c:479
 msgid "Contrast"
 msgstr "å°?æ¯?"
 
-#: ../src/empathy-call-window.c:473
+#: ../src/empathy-call-window.c:482
 msgid "Brightness"
 msgstr "äº®åº¦"
 
-#: ../src/empathy-call-window.c:476
+#: ../src/empathy-call-window.c:485
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:581
+#: ../src/empathy-call-window.c:590
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1146
+#: ../src/empathy-call-window.c:1163
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1165
+#: ../src/empathy-call-window.c:1182
 msgid "Audio input"
 msgstr "é?³æ??è¼¸å?¥"
 
-#: ../src/empathy-call-window.c:1169
+#: ../src/empathy-call-window.c:1186
 msgid "Video input"
 msgstr "è¦?å??è¼¸å?¥"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1190
 msgid "Dialpad"
 msgstr "æ?è??ç?¤"
 
-#: ../src/empathy-call-window.c:1178
+#: ../src/empathy-call-window.c:1195
 msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-call-window.c:1263
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??è©±ä¸"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1342
 msgid "Call"
 msgstr "é??è©±"
 
+#: ../src/empathy-call-window.c:1496
+msgid "The IP address as seen by the machine"
+msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1498
+msgid "The IP address as seen by a server on the Internet"
+msgstr "äº?è?¯ç¶²ä¸?ç??ä¼ºæ??å?¨ç??è¦?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1500
+msgid "The IP address of the peer as seen by the other side"
+msgstr "å?¶ä»?ç«¯ç??è¦?ç??é»?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1502
+msgid "The IP address of a relay server"
+msgstr "ä¸ç¹¼ä¼ºæ??å?¨ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1504
+msgid "The IP address of the multicast group"
+msgstr "å¤?é»?å»£æ?ç¾£çµ?ç?? IP ä½?å??"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2237
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2298
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-call-window.c:2336
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?ä»¶ä¸?ç?è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2221
+#: ../src/empathy-call-window.c:2341
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?ä»¶ä¸?ç?è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?å??æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2227
+#: ../src/empathy-call-window.c:2347
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s å»ºç«?é?£ç·?ã??ä½ å??å?¶ä¸ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??è¨±ç?´æ?¥é?£ç·?ç??ç¶²çµ¡ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2233
+#: ../src/empathy-call-window.c:2353
 msgid "There was a failure on the network"
 msgstr "é??å??ç¶²çµ¡ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2357
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ¤é??è©±æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2240
+#: ../src/empathy-call-window.c:2360
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ¤é??è©±æ??å¿?è¦?ç??è¦?å??æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-call-window.c:2370
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2439,15 +2612,19 @@ msgid ""
 "the Help menu."
 msgstr "å?¨ Telepathy å??ä»¶ä¸ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>ä¸¦é??ä¸?å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?ä¸æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2258
+#: ../src/empathy-call-window.c:2378
 msgid "There was a failure in the call engine"
 msgstr "é??è©±å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2297
+#: ../src/empathy-call-window.c:2381
+msgid "The end of the stream was reached"
+msgstr "å·²é??ä¸²æµ?æ?«ç«¯"
+
+#: ../src/empathy-call-window.c:2421
 msgid "Can't establish audio stream"
 msgstr "ç?¡æ³?å»ºç«?é?³è¨?ä¸²æµ?"
 
-#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-call-window.c:2431
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?å»ºç«?è¦?å??ä¸²æµ?"
 
@@ -2496,42 +2673,54 @@ msgid "Hang up current call"
 msgstr "æ??æ?·ç?®å??é??è©±"
 
 #: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "æ?¬æ©?å??é?¸ï¼?"
+
+#: ../src/empathy-call-window.ui.h:13
 msgid "Preview"
 msgstr "é ?è¦½"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
 msgstr "é??æ?¥"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "é? ç«¯å??é?¸ï¼?"
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "å?³é??é?³è¨?"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "å??æ??é?³è¨?å?³æ?"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "V_ideo"
 msgstr "è¦?å??(_I)"
 
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Video"
 msgstr "è¦?å??"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Video Off"
 msgstr "è¦?å??é??é??"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Video On"
 msgstr "è¦?å??é??å??"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video Preview"
 msgstr "è¦?å??é ?è¦½"
 
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "é??è©±(_C)"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
@@ -2655,81 +2844,86 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "ç®¡ç??å??å¥½ç??è??å¤©å®¤"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?å??é??è©±"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:477
+#: ../src/empathy-event-manager.c:472
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?è¦?å??é??è©±ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:473
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?é??è©±ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:501
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:507
 msgid "_Answer"
 msgstr "æ?¥è?½(_A)"
 
-#: ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?å??é?»è©±"
 
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "è??å¤©é??è«?"
 
-#: ../src/empathy-event-manager.c:702
+#: ../src/empathy-event-manager.c:697
 #, c-format
 msgid "Invitation to join %s"
 msgstr "é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:722
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:743
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "ä½ è¢«é??è«?å? å?¥ %s"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:988
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:992
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -2738,12 +2932,12 @@ msgstr ""
 "\n"
 "è¨?æ?¯ï¼?%s"
 
-#: ../src/empathy-event-manager.c:1035
+#: ../src/empathy-event-manager.c:1052
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#: ../src/empathy-event-manager.c:1055
+#: ../src/empathy-event-manager.c:1072
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -2839,15 +3033,15 @@ msgstr "æ£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 msgid "Hashing \"%s\""
 msgstr "æ£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:990
+#: ../src/empathy-ft-manager.c:996
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1002
+#: ../src/empathy-ft-manager.c:1008
 msgid "File"
 msgstr "æª?æ¡?"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1030
 msgid "Remaining"
 msgstr "å?©é¤?"
 
@@ -2882,27 +3076,32 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../src/empathy-main-window.c:476
+#. Labels for empty contact list
+#: ../src/empathy-main-window.c:95
+msgid "No match found"
+msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
+
+#: ../src/empathy-main-window.c:519
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:482
+#: ../src/empathy-main-window.c:525
 msgid "Edit Account"
 msgstr "ç·¨è¼¯å¸³è??"
 
-#: ../src/empathy-main-window.c:488
+#: ../src/empathy-main-window.c:531
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1177
+#: ../src/empathy-main-window.c:1213
 msgid "Contact"
 msgstr "è?¯çµ¡äºº"
 
-#: ../src/empathy-main-window.c:1501
+#: ../src/empathy-main-window.c:1538
 msgid "Contact List"
 msgstr "è?¯çµ¡äººæ¸?å?®"
 
-#: ../src/empathy-main-window.c:1608
+#: ../src/empathy-main-window.c:1647
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3049,39 +3248,39 @@ msgstr "è??å¤©å®¤æ¸?å?®"
 msgid "_Room:"
 msgstr "è??å¤©å®¤(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:136
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "è¨?æ?¯å·²æ?¶å?°"
 
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "æ?°å¢?è«?è©±"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "è?¯çµ¡äººä¸?ç·?"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "è?¯çµ¡äººé?¢ç·?"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "å¸³è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "å¸³è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:437
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../src/empathy-preferences.c:873
+#: ../src/empathy-preferences.c:882
 msgid "Preferences"
 msgstr "å??å¥½è¨å®?"
 
@@ -3134,83 +3333,88 @@ msgid "Location sources:"
 msgstr "ä½?ç½®ä¾?æº?ï¼?"
 
 #: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "ç´?é??è«?è©±"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "æ?æ?¾äº?ä»¶é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "ç§?é?±"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "é??ä½?ä½?ç½®æº?ç¢ºåº¦æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??å®¶æ??è¢«å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??GPS ç??åº§æ¨?æº?ç¢ºåº¦å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "å°?è¡¨æ??ç¬¦è??ä»¥å??ç??é¡¯ç¤º(_S)"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??å¤©å®¤é¡¯ç¤ºè?¯çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºä½ å·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "ä½?æ?¯ä¸»é¡?"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Automatically connect on startup"
 msgstr "å??å??æ??è?ªå??é?£ç·?(_A)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Cellphone"
 msgstr "æ??æ©?(_C)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Network (IP, Wi-Fi)"
 msgstr "ç¶²çµ¡ (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??å¤©(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "å°?æ??ç??è?¯çµ¡äººå?¬é??ä½?ç½®(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?ç¢ºåº¦(_R)"
 
@@ -3242,7 +3446,7 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??æª¢è¦?"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a56341b..19b2236 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.5\n"
+"Project-Id-Version: empathy 2.31.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-24 19:59+0800\n"
-"PO-Revision-Date: 2010-07-22 13:31+0800\n"
+"POT-Creation-Date: 2010-08-23 20:02+0800\n"
+"PO-Revision-Date: 2010-08-22 12:43+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -434,77 +434,77 @@ msgstr "ç®¡ç??è¨?æ?¯è?? VoIP å¸³è??"
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??"
 
-#: ../libempathy/empathy-ft-handler.c:843
+#: ../libempathy/empathy-ft-handler.c:851
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?ç¬¦"
 
-#: ../libempathy/empathy-ft-handler.c:1103
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "é? ç«¯é?£çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1161
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1170
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-file.c:281
+#: ../libempathy/empathy-tp-file.c:283
 msgid "Socket type not supported"
 msgstr "Socket é¡?å??ä¸?æ?¯æ?´"
 
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-tp-file.c:402
 msgid "No reason was specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-tp-file.c:405
 msgid "The change in state was requested"
 msgstr "å·²è¦?æ±?è®?æ?´ç??æ??"
 
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-tp-file.c:408
 msgid "You canceled the file transfer"
 msgstr "æ?¨å·²å??æ¶?æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-tp-file.c:411
 msgid "The other participant canceled the file transfer"
 msgstr "å?¶ä»?ç??å??è??è??å??æ¶?äº?æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-tp-file.c:414
 msgid "Error while trying to transfer the file"
 msgstr "å??è©¦å?³è¼¸æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-tp-file.c:417
 msgid "The other participant is unable to transfer the file"
 msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:320
 msgid "Unknown reason"
 msgstr "ä¸?æ??å??å? "
 
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:242
 msgid "Available"
 msgstr "æ??ç©º"
 
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgid "Busy"
 msgstr "å¿?ç¢?"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:247
 msgid "Away"
 msgstr "é?¢é??"
 
-#: ../libempathy/empathy-utils.c:250
+#: ../libempathy/empathy-utils.c:249
 msgid "Invisible"
 msgstr "é?±è??"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-utils.c:251
 msgid "Offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy/empathy-utils.c:254 ../src/empathy-call-window.c:1763
-#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
-#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+#: ../libempathy/empathy-utils.c:253 ../src/empathy-call-window.c:1883
+#: ../src/empathy-call-window.c:1884 ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:1886 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -512,19 +512,19 @@ msgstr "ä¸?æ??"
 msgid "No reason specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:350
 msgid "Status is set to offline"
 msgstr "ç??æ??è¨ç?ºé?¢ç·?"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:330
 msgid "Network error"
 msgstr "ç¶²è·¯é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:332
 msgid "Authentication failed"
 msgstr "é©?è?å¤±æ??"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
 msgid "Encryption error"
 msgstr "å? å¯?ç?¼ç??é?¯èª¤"
 
@@ -532,31 +532,31 @@ msgstr "å? å¯?ç?¼ç??é?¯èª¤"
 msgid "Name in use"
 msgstr "ä½¿ç?¨ä¸ç??å??ç¨±"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate not provided"
 msgstr "æ²?æ??æ??ä¾?æ??è?"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate untrusted"
 msgstr "æ??è?ä¸?è¢«ä¿¡ä»»"
 
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate expired"
 msgstr "æ??è?å·²é?¾æ??"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
 msgid "Certificate not activated"
 msgstr "æ??è?å°?æ?ªä½¿ç?¨"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
 msgid "Certificate hostname mismatch"
 msgstr "æ??è?ä¸»æ©?å??ç¨±ä¸?ç¬¦"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
 msgid "Certificate fingerprint mismatch"
 msgstr "æ??è?æ??ç´?æª?ä¸?ç¬¦"
 
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
 msgid "Certificate self-signed"
 msgstr "æ??è?ç?ºè?ªæ??ç°½ç½²"
 
@@ -564,15 +564,67 @@ msgstr "æ??è?ç?ºè?ªæ??ç°½ç½²"
 msgid "Certificate error"
 msgstr "æ??è?é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:352
+msgid "Encryption is not available"
+msgstr "å? å¯?ç?¡æ³?ä½¿ç?¨"
+
+#: ../libempathy/empathy-utils.c:354
+msgid "Certificate is invalid"
+msgstr "æ??è?ç?¡æ??"
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Connection has been refused"
+msgstr "é?£ç·?é?æ??"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Connection can't be established"
+msgstr "ç?¡æ³?å»ºç«?é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been lost"
+msgstr "å·²å¤±å?»é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "This resource is already connected to the server"
+msgstr "æ¤è³?æº?å·²é?£æ?¥è?³è©²ä¼ºæ??å?¨"
+
+#: ../libempathy/empathy-utils.c:364
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "é?£ç·?å·²è¢«ä½¿ç?¨ç?¸å??è³?æº?ç??æ?°é?£ç·?å??ä»£"
+
+#: ../libempathy/empathy-utils.c:367
+msgid "The account already exists on the server"
+msgstr "è©²å¸³è??å·²ç¶?å?å?¨æ?¼ä¼ºæ??å?¨ä¸?"
+
+#: ../libempathy/empathy-utils.c:369
+msgid "Server is currently too busy to handle the connection"
+msgstr "ä¼ºæ??å?¨ç?®å??é??æ?¼å¿?ç¢?ä»¥è?´æ?¼ç?¡æ³?è??ç??è©²é?£ç·?"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "Certificate has been revoked"
+msgstr "å·²æ?¤é?·æ??è?"
+
+#: ../libempathy/empathy-utils.c:373
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "æ??è?ä½¿ç?¨ä¸?å®?å?¨ç??å¯?ç¢¼æ¼?ç®?æ³?ï¼?æ??æ?¯å¯?ç¢¼è??ç??ä¸?è¼?å¼±"
+
+#: ../libempathy/empathy-utils.c:376
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain exceed the limits imposed by the crypto library"
+msgstr "ä¼ºæ??å?¨æ??è?ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨æ??è?é??ç??æ·±åº¦è¶?é??å¯?ç¢¼å?½å¼?åº«æ??è?½è??ç??ç??é??å?¶ã??"
+
+#: ../libempathy/empathy-utils.c:529
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "Yahoo! æ?¥æ?¬"
 
-#: ../libempathy/empathy-utils.c:441
+#: ../libempathy/empathy-utils.c:535
 msgid "Facebook Chat"
 msgstr "Facebook è??å¤©"
 
@@ -621,36 +673,38 @@ msgid "All"
 msgstr "å?¨é?¨"
 
 #: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:606
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1137
 msgid "Username:"
 msgstr "ä½¿ç?¨è??å??ç¨±ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1480
 msgid "L_og in"
 msgstr "ç?»å?¥(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1548
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1390
 #: ../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:1558
+#: ../libempathy-gtk/empathy-account-widget.c:1559
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1624
 msgid "This account already exists on the server"
 msgstr "æ¤å¸³è??å·²ç¶?å?å?¨é??å??ä¼ºæ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1627
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 
@@ -659,19 +713,19 @@ msgstr "å?¨é??å??ä¼ºæ??å?¨ä¸?å»ºç«?æ?°ç??å¸³è??"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1995
+#: ../libempathy-gtk/empathy-account-widget.c:1996
 #, 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:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2022
 #, c-format
 msgid "%s Account"
 msgstr "%s å¸³è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2026
 msgid "New account"
 msgstr "æ?°å¢?å¸³è??"
 
@@ -772,7 +826,7 @@ msgstr "æ?¨ç?? ICQ å¯?ç¢¼æ?¯ï¼?"
 msgid "_Character set:"
 msgstr "å?é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:246
 msgid "New Network"
 msgstr "æ?°å¢?ç¶²è·¯"
 
@@ -1075,55 +1129,55 @@ msgstr "å??ç??"
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:323
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£¡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:645
+#: ../libempathy-gtk/empathy-chat.c:639
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?äººå°?è©±å¤±æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:679
 msgid "Topic not supported on this conversation"
 msgstr "æ¤è«?è©±ç??ä¸»é¡?ä¸?è¢«æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:685
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?è¢«å??è¨±è®?æ?´é??å??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:819
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?è©±ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:822
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ä¸»é¡?>ï¼?è¨ç½®ç?®å??è«?è©±ç??ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:825
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:828
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <è??å¤©å®¤ ID>ï¼?å? å?¥æ?°ç??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:833
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:836
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?äººå°?è©±"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:840
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??ä¼ºæ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:843
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?è©±ä¸"
 
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:846
 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 "
@@ -1132,7 +1186,7 @@ msgstr ""
 "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?è©±ä¸ã??é??ç?¨æ?¼å?³é??ä»¥ã??/ã??é??é ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "èªªï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??å¤©å®¤ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:851
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1140,84 +1194,84 @@ msgstr ""
 "/help [<å?½ä»¤>]ï¼?é¡¯ç¤ºæ??æ??æ?¯æ?´ç??æ??ä»¤ã??å¦?æ??æ??å®?ç¾©é??å?? <å?½ä»¤> ç??è©±ï¼?ä¾¿é¡¯ç¤ºå®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:861
 #, c-format
 msgid "Usage: %s"
 msgstr "ç?¨æ³?ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:890
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1011
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??ä»¤ï¼?è«?å??è¦? /help ä»¥å??å¾?å?¯ç?¨ç??æ??ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "offline"
 msgstr "é?¢ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "permission denied"
 msgstr "æ¬?é??è¢«æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "too long message"
 msgstr "å¤ªé?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "not implemented"
 msgstr "æ?ªå¯¦ä½?"
 
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1165
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1169
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1279 ../src/empathy-chat-window.c:691
 msgid "Topic:"
 msgstr "ä¸»é¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1291
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ä¸»é¡?è¨å®?ç?º: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1293
 msgid "No topic defined"
 msgstr "å°?æ?ªå®?ç¾©ä¸»é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:1777
+#: ../libempathy-gtk/empathy-chat.c:1772
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??å»ºè°)"
 
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1826
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??ç¬¦è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1849
-#: ../libempathy-gtk/empathy-ui-utils.c:1799
+#: ../libempathy-gtk/empathy-chat.c:1844
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1883
+#: ../libempathy-gtk/empathy-chat.c:1878
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å?å»ºè°(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:1955
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2061
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?·ç·?"
@@ -1225,12 +1279,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:2073
+#: ../libempathy-gtk/empathy-chat.c:2068
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?ºå?»"
 
-#: ../libempathy-gtk/empathy-chat.c:2076
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -1238,17 +1292,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:2084
+#: ../libempathy-gtk/empathy-chat.c:2079
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s è¢« %2$s è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«è¨ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2091
+#: ../libempathy-gtk/empathy-chat.c:2086
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
@@ -1258,59 +1312,59 @@ msgstr "%s å·²ç¶?é?¢é??æ¤è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2095
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2120
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ¤è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:2150
+#: ../libempathy-gtk/empathy-chat.c:2145
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ç?¾å?¨è¢«ç¨±ç?º %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
+#: ../libempathy-gtk/empathy-chat.c:2284 ../src/empathy-call-window.c:1922
 msgid "Disconnected"
 msgstr "å·²æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2927
+#: ../libempathy-gtk/empathy-chat.c:2922
 msgid "Wrong password; please try again:"
 msgstr "å¯?ç¢¼é?¯èª¤ï¼?è«?å??è©¦ä¸?æ¬¡ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2923
 msgid "Retry"
 msgstr "é??è©¦"
 
-#: ../libempathy-gtk/empathy-chat.c:2933
+#: ../libempathy-gtk/empathy-chat.c:2928
 msgid "This room is protected by a password:"
 msgstr "æ¤è??å¤©å®¤å·²è¢«å¯?ç¢¼ä¿?è·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2929
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3074
+#: ../libempathy-gtk/empathy-chat.c:3069
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3127
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "è«?è©±"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:785
+#: ../libempathy-gtk/empathy-theme-adium.c:791
 msgid "_Copy Link Address"
 msgstr "è¤?è£½é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:331
-#: ../libempathy-gtk/empathy-theme-adium.c:792
+#: ../libempathy-gtk/empathy-theme-adium.c:798
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
@@ -1321,6 +1375,7 @@ msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:249
 msgid "Edit Contact Information"
 msgstr "ç·¨è¼¯é?£çµ¡äººè³?è¨?"
 
@@ -1341,101 +1396,102 @@ msgstr "ç¨?å¾?å??æ±ºå®?"
 msgid "Subscription Request"
 msgstr "è¨?é?±è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1984
-#: ../libempathy-gtk/empathy-individual-view.c:1948
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2083
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:1951
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2086
 msgid "Removing group"
 msgstr "æ£å?¨ç§»é?¤ç¾¤çµ?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2035
-#: ../libempathy-gtk/empathy-contact-list-view.c:2112
-#: ../libempathy-gtk/empathy-individual-view.c:2005
-#: ../libempathy-gtk/empathy-individual-view.c:2090
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2225
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "ç§»é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2065
-#: ../libempathy-gtk/empathy-individual-view.c:2036
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2171
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?ç§»é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2038
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2173
 msgid "Removing contact"
 msgstr "æ£å?¨ç§»é?¤é?£çµ¡äºº"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:223
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "æ?°å¢?è?¯çµ¡äºº(_A)â?¦"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../libempathy-gtk/empathy-individual-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:463
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??å¤©(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:306
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:504
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??è©±(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:291
-#: ../libempathy-gtk/empathy-individual-menu.c:351
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:546
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??è©±(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:331
-#: ../libempathy-gtk/empathy-individual-menu.c:403
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:604
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:444
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:645
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:486
+#: ../libempathy-gtk/empathy-contact-menu.c:375
+#: ../libempathy-gtk/empathy-individual-menu.c:687
 msgid "Share My Desktop"
 msgstr "å??äº«æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:416
-#: ../libempathy-gtk/empathy-contact-widget.c:1801
-#: ../libempathy-gtk/empathy-individual-menu.c:515
+#: ../libempathy-gtk/empathy-contact-menu.c:415
+#: ../libempathy-gtk/empathy-contact-widget.c:1537
+#: ../libempathy-gtk/empathy-individual-menu.c:721
+#: ../libempathy-gtk/empathy-individual-widget.c:1283
 msgid "Favorite"
 msgstr "å??å¥½"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:445
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-contact-menu.c:444
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Infor_mation"
 msgstr "è³?è¨?(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:491
+#: ../libempathy-gtk/empathy-contact-menu.c:490
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:545
-#: ../libempathy-gtk/empathy-individual-menu.c:664
+#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-individual-menu.c:934
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:576
-#: ../libempathy-gtk/empathy-individual-menu.c:702
+#: ../libempathy-gtk/empathy-contact-menu.c:575
+#: ../libempathy-gtk/empathy-individual-menu.c:981
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 
@@ -1443,149 +1499,174 @@ msgstr "é??è«?å?°è??å¤©å®¤(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-contact-widget.c:217
+#: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-contact-widget.c:218
+#: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "Phone number:"
 msgstr "é?»è©±è??ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+#: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "E-mail address:"
 msgstr "é?»å?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:222
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+#: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Website:"
 msgstr "ç¶²ç«?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:223
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+#: ../libempathy-gtk/empathy-individual-widget.c:152
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
-msgid "Select"
-msgstr "é?¸æ??"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../src/empathy-main-window.c:1195
-msgid "Group"
-msgstr "ç¾¤çµ?"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:579
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "Country ISO Code:"
 msgstr "å??å®¶ ISO ç¢¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:843
+#: ../libempathy-gtk/empathy-contact-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country:"
 msgstr "å??å®¶ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "City:"
 msgstr "å¸?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:849
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:851
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:853
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Building:"
 msgstr "å»ºç¯?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:857
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Floor:"
 msgstr "æ¨?å±¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:859
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Room:"
 msgstr "å®¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Text:"
 msgstr "æ??å?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Accuracy Level:"
 msgstr "æº?ç¢ºåº¦ç?ç´?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:869
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Error:"
 msgstr "é?¯èª¤ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (å?¬å°º)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:873
+#: ../libempathy-gtk/empathy-contact-widget.c:611
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Horizontal Error (meters):"
 msgstr "æ°´å¹³èª¤å·® (å?¬å°º)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../libempathy-gtk/empathy-contact-widget.c:613
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Speed:"
 msgstr "é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:877
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Bearing:"
 msgstr "æ?¹ä½?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:879
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:881
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Last Updated on:"
 msgstr "ä¸?æ¬¡æ?´æ?°æ?¼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:883
+#: ../libempathy-gtk/empathy-contact-widget.c:621
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Longitude:"
 msgstr "ç¶?åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:885
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Latitude:"
 msgstr "ç·¯åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:887
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Altitude:"
 msgstr "ç·¯åº¦ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:950
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-individual-widget.c:578
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:966
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../libempathy-gtk/empathy-individual-widget.c:594
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:642
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1100
+#: ../libempathy-gtk/empathy-contact-widget.c:838
+#: ../libempathy-gtk/empathy-individual-widget.c:832
 msgid "Save Avatar"
 msgstr "å?²å?å¤§é è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1156
+#: ../libempathy-gtk/empathy-contact-widget.c:894
+#: ../libempathy-gtk/empathy-individual-widget.c:890
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 
@@ -1593,7 +1674,9 @@ msgstr "ç?¡æ³?å?²å?å¤§é è²¼"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1218
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1606,46 +1689,97 @@ msgid "Client:"
 msgstr "ç?¨æ?¶ç«¯ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-msgid "Groups"
-msgstr "ç¾¤çµ?"
-
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1419
 msgid "Identifier:"
 msgstr "è?å?¥èº«å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Information requestedâ?¦"
 msgstr "è³?è¨?å·²è«?æ±?â?¦"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "ç??æ?¬ï¼?"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
+msgid "Groups"
+msgstr "ç¾¤çµ?"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "è«?é?¸æ??é??å??é?£çµ¡äººè¦?é¡¯ç?¾å?¨å?ªå??ç¾¤çµ?ã??æ³¨æ??æ?¨å?¯ä»¥é?¸æ??ä¸?å??ä»¥ä¸?ç??ç¾¤çµ?æ??ä¸?é?¸æ??ç¾¤çµ?ã??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Version:"
-msgstr "ç??æ?¬ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:603
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgid "Select"
+msgstr "é?¸æ??"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1231
+msgid "Group"
+msgstr "ç¾¤çµ?"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:253
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "å??æ¶?é?£çµ?(_U)"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:143
+msgid "Linked Contacts"
+msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:252
+msgid "Select contacts to link"
+msgstr "é?¸å??è¦?é?£çµ?ç??é?£çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:303
+msgid "New contact preview"
+msgstr "æ?°å¢?é?£çµ¡äººé ?è¦½"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:108
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:799
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ç·¨è¼¯(_E)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:829
+msgctxt "Link individual (contextual menu)"
+msgid "_Linkâ?¦"
+msgstr "é?£çµ?(_L)â?¦"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1552
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "å¾?è¨è?¯çµ¡äººå??å?« %u ä½?è?¯çµ¡äºº"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>ä½?ç½®</b> æ?¼ (æ?¥æ??)"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?ä¼ºæ??å?¨"
@@ -1662,28 +1796,48 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../libempathy-gtk/empathy-linking-dialog.c:92
+msgid "Link Contacts"
+msgstr "é?£çµ?è?¯çµ¡äºº"
+
+#. Add button
+#: ../libempathy-gtk/empathy-linking-dialog.c:102
+msgid "_Link"
+msgstr "é?£çµ?(_L)"
+
+#: ../libempathy-gtk/empathy-log-window.c:646
 #: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "å¸³è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:649
+#: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "è«?è©±"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Find next"
+msgstr "å°?æ?¾ä¸?ä¸?å??"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Find previous"
+msgstr "å°?æ?¾ä¸?ä¸?å??"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "ä¸?ä¸?æ¬¡è«?è©±"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "æ??å°?"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "ä½?è??(_F)ï¼?"
 
@@ -1702,18 +1856,17 @@ msgid "New Conversation"
 msgstr "æ?°å¢?è«?è©±"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:190
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
 msgid "Send _Video"
 msgstr "å?³é??è¦?è¨?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:198
-#: ../src/empathy-call-window.ui.h:22
-msgid "_Call"
-msgstr "é??è©±(_C)"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "é??è©±(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:208
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "New Call"
 msgstr "æ?°å¢?é??è©±"
 
@@ -1838,15 +1991,15 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1696
+#: ../libempathy-gtk/empathy-ui-utils.c:1698
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1791
+#: ../libempathy-gtk/empathy-ui-utils.c:1793
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1862
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
@@ -2035,15 +2188,15 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:474
+#: ../src/empathy.c:414
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:478
+#: ../src/empathy.c:418
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?é¡¯ç¤ºé?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?è©±çª?"
 
-#: ../src/empathy.c:490
+#: ../src/empathy.c:435
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
@@ -2087,7 +2240,7 @@ msgid "translator-credits"
 msgstr ""
 "å¦?å°?ç¿»è¯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å?é?µä»¶çµ¦\n"
 "ä»¥ä¸?å?°å??ï¼?GNOME ç¿»è¯å??é??æ??ç?¡å¿«å??è¦?æ?¨ï¼?\n"
-"zh-l10n lists linux org tw\n"
+"chinese-l10n googlegroups com\n"
 "\n"
 "Cheng-Chia Tseng <pswo10680 gmail com>, 2009, 10\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2003, 05\n"
@@ -2124,7 +2277,7 @@ msgstr ""
 "è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1311
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2207,7 +2360,7 @@ msgstr "æ?¯"
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??æ¨£"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1125
 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 "
@@ -2218,16 +2371,16 @@ msgstr ""
 "ç?¨æ¤å??è?½ï¼?è«?æª¢æ?¥ä¸?å??è©³ç´°è³?æ??æ?¯å?¦æ£ç¢ºã??æ?¨ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°è®?æ?´é??äº?ç´°ç¯?ï¼?æ??æ?¯"
 "ç?¨ã??å¸³è??ã??å°?è©±çª?ä¾?å??ç?¨æ¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1131
+#: ../src/empathy-account-assistant.c:1187
 msgid "Edit->Accounts"
 msgstr "ç·¨è¼¯ -> å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1151
+#: ../src/empathy-account-assistant.c:1147
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1183
 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 "
@@ -2238,23 +2391,23 @@ msgstr ""
 "å??ç?¨æ¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?ä»¶ï¼?ä¸¦å¾?ã??å¸³è??ã??å°?è©±çª?å»ºç«?ã??é??è¿?ç??äººã??å¸³"
 "è??"
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1189
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut å°?æ?ªå®?è£?"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1235
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP å¸³è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1269
 msgid "Welcome to Empathy"
 msgstr "æ¡è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1278
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??å¸³è??"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1296
 msgid "Please enter personal details"
 msgstr "è«?è¼¸å?¥å??äººè©³ç´°è³?æ??"
 
@@ -2271,7 +2424,7 @@ msgstr "æ??è??æ?¨ç?? %s å¸³è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:799
+#: ../src/empathy-accounts-dialog.c:271 ../src/empathy-call-window.c:808
 msgid "Connectingâ?¦"
 msgstr "é?£ç·?ä¸â?¦"
 
@@ -2364,101 +2517,121 @@ msgstr "- Empathy é?³è¨?è¦?è¨?ç?¨æ?¶ç«¯"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy é?³è¨?è¦?è¨?ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-call-window.c:470
+#: ../src/empathy-call-window.c:479
 msgid "Contrast"
 msgstr "å°?æ¯?"
 
-#: ../src/empathy-call-window.c:473
+#: ../src/empathy-call-window.c:482
 msgid "Brightness"
 msgstr "äº®åº¦"
 
-#: ../src/empathy-call-window.c:476
+#: ../src/empathy-call-window.c:485
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:581
+#: ../src/empathy-call-window.c:590
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1146
+#: ../src/empathy-call-window.c:1163
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1165
+#: ../src/empathy-call-window.c:1182
 msgid "Audio input"
 msgstr "é?³æ??è¼¸å?¥"
 
-#: ../src/empathy-call-window.c:1169
+#: ../src/empathy-call-window.c:1186
 msgid "Video input"
 msgstr "è¦?è¨?è¼¸å?¥"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1190
 msgid "Dialpad"
 msgstr "æ?è??ç?¤"
 
-#: ../src/empathy-call-window.c:1178
+#: ../src/empathy-call-window.c:1195
 msgid "Details"
 msgstr "è©³ç´°è³?æ??"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-call-window.c:1263
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??è©±ä¸"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1342
 msgid "Call"
 msgstr "é??è©±"
 
+#: ../src/empathy-call-window.c:1496
+msgid "The IP address as seen by the machine"
+msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1498
+msgid "The IP address as seen by a server on the Internet"
+msgstr "ç¶²é??ç¶²è·¯ä¸?ç??ä¼ºæ??å?¨ç??è¦?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1500
+msgid "The IP address of the peer as seen by the other side"
+msgstr "å?¶ä»?ç«¯ç??è¦?ç??é»?ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1502
+msgid "The IP address of a relay server"
+msgstr "ä¸ç¹¼ä¼ºæ??å?¨ç?? IP ä½?å??"
+
+#: ../src/empathy-call-window.c:1504
+msgid "The IP address of the multicast group"
+msgstr "å¤?é»?å»£æ?ç¾¤çµ?ç?? IP ä½?å??"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2237
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2298
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-call-window.c:2336
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2221
+#: ../src/empathy-call-window.c:2341
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2227
+#: ../src/empathy-call-window.c:2347
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s å»ºç«?é?£ç·?ã??æ?¨å??å?¶ä¸ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??è¨±ç?´æ?¥é?£ç·?ç??ç¶²è·¯ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2233
+#: ../src/empathy-call-window.c:2353
 msgid "There was a failure on the network"
 msgstr "é??å??ç¶²è·¯ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2357
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ¤é??è©±æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2240
+#: ../src/empathy-call-window.c:2360
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ¤é??è©±æ??å¿?è¦?ç??è¦?è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-call-window.c:2370
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2468,15 +2641,19 @@ msgstr ""
 "å?¨ Telepathy å??ä»¶ä¸ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å??å ±é??å??é?¯èª¤</a>ä¸¦é??ä¸?"
 "å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?ä¸æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2258
+#: ../src/empathy-call-window.c:2378
 msgid "There was a failure in the call engine"
 msgstr "é??è©±å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2297
+#: ../src/empathy-call-window.c:2381
+msgid "The end of the stream was reached"
+msgstr "å·²é??ä¸²æµ?æ?«ç«¯"
+
+#: ../src/empathy-call-window.c:2421
 msgid "Can't establish audio stream"
 msgstr "ç?¡æ³?å»ºç«?é?³è¨?ä¸²æµ?"
 
-#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-call-window.c:2431
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?å»ºç«?è¦?è¨?ä¸²æµ?"
 
@@ -2525,42 +2702,54 @@ msgid "Hang up current call"
 msgstr "æ??æ?·ç?®å??é??è©±"
 
 #: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "æ?¬æ©?å??é?¸ï¼?"
+
+#: ../src/empathy-call-window.ui.h:13
 msgid "Preview"
 msgstr "é ?è¦½"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
 msgstr "é??æ?¥"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "é? ç«¯å??é?¸ï¼?"
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "å?³é??é?³è¨?"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "å??æ??é?³è¨?å?³æ?"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "V_ideo"
 msgstr "è¦?è¨?(_I)"
 
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Video"
 msgstr "è¦?è¨?"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Video Off"
 msgstr "è¦?è¨?é??é??"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Video On"
 msgstr "è¦?è¨?é??å??"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video Preview"
 msgstr "è¦?è¨?é ?è¦½"
 
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:24
+msgid "_Call"
+msgstr "é??è©±(_C)"
+
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "æª¢è¦?(_V)"
 
@@ -2684,81 +2873,86 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "ç®¡ç??å??å¥½ç??è??å¤©å®¤"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?è¨?é??è©±"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:477
+#: ../src/empathy-event-manager.c:472
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?è¦?è¨?é??è©±ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:473
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?é??è©±ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:501
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:507
 msgid "_Answer"
 msgstr "æ?¥è?½(_A)"
 
-#: ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?è¨?é?»è©±"
 
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "è??å¤©é??è«?"
 
-#: ../src/empathy-event-manager.c:702
+#: ../src/empathy-event-manager.c:697
 #, c-format
 msgid "Invitation to join %s"
 msgstr "é??è«?å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:722
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:743
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "æ?¨è¢«é??è«?å? å?¥ %s"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:988
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:992
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -2767,12 +2961,12 @@ msgstr ""
 "\n"
 "è¨?æ?¯ï¼?%s"
 
-#: ../src/empathy-event-manager.c:1035
+#: ../src/empathy-event-manager.c:1052
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#: ../src/empathy-event-manager.c:1055
+#: ../src/empathy-event-manager.c:1072
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -2868,15 +3062,15 @@ msgstr "æ£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 msgid "Hashing \"%s\""
 msgstr "æ£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:990
+#: ../src/empathy-ft-manager.c:996
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1002
+#: ../src/empathy-ft-manager.c:1008
 msgid "File"
 msgstr "æª?æ¡?"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1030
 msgid "Remaining"
 msgstr "å?©é¤?"
 
@@ -2911,27 +3105,32 @@ msgstr "é??è¨?å??å®?"
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../src/empathy-main-window.c:476
+#. Labels for empty contact list
+#: ../src/empathy-main-window.c:95
+msgid "No match found"
+msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
+
+#: ../src/empathy-main-window.c:519
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:482
+#: ../src/empathy-main-window.c:525
 msgid "Edit Account"
 msgstr "ç·¨è¼¯å¸³è??"
 
-#: ../src/empathy-main-window.c:488
+#: ../src/empathy-main-window.c:531
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1177
+#: ../src/empathy-main-window.c:1213
 msgid "Contact"
 msgstr "é?£çµ¡äºº"
 
-#: ../src/empathy-main-window.c:1501
+#: ../src/empathy-main-window.c:1538
 msgid "Contact List"
 msgstr "é?£çµ¡äººæ¸?å?®"
 
-#: ../src/empathy-main-window.c:1608
+#: ../src/empathy-main-window.c:1647
 msgid "Show and edit accounts"
 msgstr "é¡¯ç¤ºä¸¦ç·¨è¼¯å¸³è??"
 
@@ -3079,39 +3278,39 @@ msgstr "è??å¤©å®¤æ¸?å?®"
 msgid "_Room:"
 msgstr "è??å¤©å®¤(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:136
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "è¨?æ?¯å·²æ?¶å?°"
 
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "æ?°å¢?è«?è©±"
 
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "é?£çµ¡äººä¸?ç·?"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "é?£çµ¡äººé?¢ç·?"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "å¸³è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "å¸³è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:437
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "èª?è¨?"
 
-#: ../src/empathy-preferences.c:873
+#: ../src/empathy-preferences.c:882
 msgid "Preferences"
 msgstr "å??å¥½è¨å®?"
 
@@ -3164,18 +3363,22 @@ msgid "Location sources:"
 msgstr "ä½?ç½®ä¾?æº?ï¼?"
 
 #: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "ç´?é??è«?è©±"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "æ?æ?¾äº?ä»¶é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "é?±ç§?"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3184,65 +3387,66 @@ msgstr ""
 "é??ä½?ä½?ç½®æº?ç¢ºåº¦æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??å®¶æ??è¢«å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??"
 "GPS ç??åº§æ¨?æº?ç¢ºåº¦å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "å°?è¡¨æ??ç¬¦è??ä»¥å??ç??é¡¯ç¤º(_S)"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??å¤©å®¤é¡¯ç¤ºé?£çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "æ?¼å?æª¢æ?¥"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£¡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºæ?¨å·²ç¶?å®?è£?å?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "ä½?æ?¯ä¸»é¡?"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Automatically connect on startup"
 msgstr "å??å??æ??è?ªå??é?£ç·?(_A)"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Cellphone"
 msgstr "æ??æ©?(_C)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Network (IP, Wi-Fi)"
 msgstr "ç¶²è·¯ (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??å¤©(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "å°?æ??ç??é?£çµ¡äººå?¬é??ä½?ç½®(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?ç¢ºåº¦(_R)"
 
@@ -3274,7 +3478,7 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??æª¢è¦?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]