[empathy] Update simplified Chinese translation.
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Update simplified Chinese translation.
- Date: Wed, 15 Sep 2010 07:14:07 +0000 (UTC)
commit 1f396fd4a78ff0c77beb69d4c1b5ce38985feb8a
Author: Aron Xu <aronxu gnome org>
Date: Wed Sep 15 15:13:45 2010 +0800
Update simplified Chinese translation.
po/zh_CN.po | 1314 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 839 insertions(+), 475 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d416613..6811511 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,15 +14,16 @@
# Tao Wei <weitao1979 gmail com>, 2009.
# Tao Wang <dancefire gmail com>, 2010.
# Aron Xu <happyaron xu gmail com>, 2009, 2010.
+# Dean Lee <xslidian gmail com>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-07-26 16:00+0000\n"
-"PO-Revision-Date: 2010-07-23 02:01+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2010-09-13 14:30+0000\n"
+"PO-Revision-Date: 2010-09-15 15:13+0800\n"
+"Last-Translator: Dean Lee <xslidian lidian info>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +31,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
msgstr "使ç?¨ Google Talkã??Facebookã??MSN 以å??许å¤?å?¶å®?è??天æ??å?¡"
#: ../data/empathy.desktop.in.in.h:2
@@ -39,7 +40,7 @@ msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
msgid "Empathy Internet Messaging"
-msgstr "Empathy äº?è??ç½?é??讯"
+msgstr "Empathy å?³æ?¶é??讯ç¨?åº?"
#: ../data/empathy.desktop.in.in.h:4
msgid "IM Client"
@@ -94,8 +95,8 @@ msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?件ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
msgstr "å?¨ç?¶æ??æ ?æ?¾ç¤ºå?¼å?¥äº?件ã??å¦?æ??为 false å??ç«?å?³æ?¾ç¤ºç»?ç?¨æ?·ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
@@ -123,8 +124,9 @@ msgid "Empathy has asked about importing accounts"
msgstr "Empathy 已�询�导�账�"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#, fuzzy
msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy 已�移 telepathy-butterfly ��"
+msgstr "Empathy å·²ç»?è¿?移ç¼?å?ç??æ?¥å¿?"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
@@ -295,16 +297,18 @@ msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?ä¸å¯¼å?¥è´¦æ?·ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#, fuzzy
msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy æ?¯å?¦è¿?移 telepathy-butterfly æ?¥å¿?ã??"
+msgstr "Empathy æ?¯å?¦å·²ç»?è¿?移ç¼?å?æ?¥å¿?ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr "Empathy æ?¯å?¦å?¨ç©ºé?²æ?¶è?ªå?¨è¿?å?¥ç¦»å¼?ç?¶æ??"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy æ?¯å?¦åº?å?¨ç?¨æ?·ç©ºé?²æ?¶è?ªå?¨è¿?å?¥ç¦»å¼?模å¼?ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
@@ -385,7 +389,7 @@ msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
-msgstr "å½?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºæ??示ï¼?å?³ä½¿è??天çª?å?£å·²æ??å¼?ï¼?ä½?æ?¯ä¸?å?¨ç?¦ç?¹ä¸?ã??"
+msgstr "å¦?æ??è??天çª?å?£å·²å¼?å?¯ï¼?ä½?ä¸?æ?¯å½?å??çª?å?£ï¼?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ??示ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
@@ -420,7 +424,7 @@ msgstr "æ?¯å?¦ä»¥ç´§å??模å¼?æ?¾ç¤ºè??系人å??表ã??"
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
-msgstr "æ?¯å?¦å¯¹ä½¿ç?¨æ ?é¢?æ ?ä¸ç??â??Xâ??æ??é?®å?³é?主çª?å?£æ?¾ç¤ºæ¶?æ?¯å¯¹è¯?æ¡?ã??"
+msgstr "å½?使ç?¨æ ?é¢?æ ?ä¸ç??â??Xâ??æ??é?®å?³é?主çª?å?£æ?¶æ?¯å?¦æ?¾ç¤ºæ??示对è¯?æ¡?ã??"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
@@ -432,8 +436,8 @@ msgid ""
"the contact's name with the value \"name\". A value of \"state\" will sort "
"the contact list by state."
msgstr ""
-"使ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼â??nameâ??以æ??è??系人å§?å??æ??åº?ã??å??å?¼"
-"为â??stateâ??æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
+"使ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??系人å??表ã??é»?认æ??å?µä¸?使ç?¨å?¼â??å§?å??â??以æ??è??系人å§?å??æ??åº?ã??å??å?¼"
+"为â??ç?¶æ??â??æ?¶å°?æ??ç?¶æ??æ??åº?è??系人å??表ã??"
#: ../data/empathy-accounts.desktop.in.in.h:1
msgid "Manage Messaging and VoIP accounts"
@@ -441,149 +445,203 @@ msgstr "管ç??æ¶?æ?¯å?? VoIP å¸?æ?·"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2092
+#: ../src/empathy-accounts-dialog.c:2157
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:324
msgid "Unknown reason"
msgstr "æ?ªç?¥å??å? "
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "�线"
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "��"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "离�"
-#: ../libempathy/empathy-utils.c:250
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "é??身"
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-utils.c:255
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:257 ../src/empathy-call-window.c:1893
+#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
+#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "��"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:296
msgid "No reason specified"
msgstr "æ?ªæ??å®?å??å? "
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
msgid "Status is set to offline"
msgstr "ç?¶æ??已设置为离线"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
msgid "Network error"
msgstr "ç½?ç»?é??误"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
msgid "Authentication failed"
msgstr "��失败"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
msgid "Encryption error"
msgstr "å? å¯?é??误"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:306
msgid "Name in use"
msgstr "ç?¨æ?·å??å·²ç»?被å? ç?¨"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
msgid "Certificate not provided"
msgstr "æ?ªæ??ä¾?è¯?书"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
msgid "Certificate untrusted"
msgstr "�书�被信任"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
msgid "Certificate expired"
msgstr "è¯?书已è¿?æ??"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
msgid "Certificate not activated"
msgstr "�书���活"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
msgid "Certificate hostname mismatch"
msgstr "è¯?书主æ?ºå??ä¸?å?¹é??"
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
msgid "Certificate fingerprint mismatch"
msgstr "è¯?书æ??纹ä¸?å?¹é??"
-#: ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
msgid "Certificate self-signed"
msgstr "è¯?书æ?¯è?ªç¾å±?ç??"
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:322
msgid "Certificate error"
msgstr "è¯?书é??误"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "å? å¯?ä¸?å?¯ç?¨"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "è¯?书æ? æ??"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "è¿?æ?¥è¢«æ??ç»?"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "æ? æ³?建ç«?è¿?æ?¥"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "��已丢失"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "该èµ?æº?已被è¿?æ?¥è?³æ??å?¡å?¨"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "è¿?æ?¥å·²è¢«ä½¿ç?¨ç?¸å??èµ?æº?ç??æ?°è¿?æ?¥å??代"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "æ??å?¡å?¨å¤ªå¿?ï¼?æ? æ³?å¤?ç??å½?å??è¿?æ?¥"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "è¯?书已被å??é??"
+
+# lainmeï¼?è¯?书使ç?¨ä¸?å®?å?¨ç??å? å¯?ç®?æ³?æ??æ?¯å¼±å? å¯?ç??
+# xslidianï¼?è¯?书使ç?¨ç??å? å¯?ç®?æ³?ä¸?å®?å?¨æ??è??æ??è¢«ç ´è§£
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "æ??å?¡å?¨è¯?书ç??é?¿åº¦â??â??æ??æ??å?¡å?¨è¯?书é?¾ç??深度â??â??è¶?å?ºäº?å? å¯?åº?ç??硬æ?§é??å?¶"
+
+#: ../libempathy/empathy-utils.c:544
msgid "People Nearby"
msgstr "é??è¿?ç??人"
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! ��"
-#: ../libempathy/empathy-utils.c:441
+#: ../libempathy/empathy-utils.c:550
msgid "Facebook Chat"
msgstr "Facebook è??天"
@@ -631,58 +689,88 @@ msgstr "å°?æ?¥"
msgid "All"
msgstr "��"
-#: ../libempathy-gtk/empathy-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:312
+msgid "Account"
+msgstr "账�"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "å¯?ç ?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "æ??å?¡å?¨"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "端�"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
#, c-format
msgid "%s:"
msgstr "%sï¼?"
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../libempathy-gtk/empathy-account-widget.c:1192
msgid "Username:"
msgstr "ç?¨æ?·å??ï¼?"
-#: ../libempathy-gtk/empathy-account-widget.c:1479
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "��(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
msgid "L_og in"
msgstr "��(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1547
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1401
#: ../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
-msgid "Enabled"
-msgstr "��"
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "已��(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1693
msgid "This account already exists on the server"
msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1696
msgid "Create a new account on the server"
msgstr "å?¨æ??å?¡å?¨ä¸?å??建æ?°ç??å¸?æ?·"
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "å??æ¶?(_N)"
+
#. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1995
+#: ../libempathy-gtk/empathy-account-widget.c:2077
#, 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:2103
#, c-format
msgid "%s Account"
msgstr "%s 账�"
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2107
msgid "New account"
msgstr "�建账�"
@@ -704,11 +792,11 @@ msgstr "�级"
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "å¯?ç ?(_W)ï¼?"
@@ -729,7 +817,7 @@ msgstr "æ?¨ç?? AIM å±?å¹?å??称æ?¯ä»?ä¹?ï¼?"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Port:"
msgstr "端�(_P)�"
@@ -738,7 +826,7 @@ msgstr "端�(_P)�"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "æ??å?¡å?¨(_S)ï¼?"
@@ -749,7 +837,7 @@ msgid "<b>Example:</b> username"
msgstr "<b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??"
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "�� I_D�"
@@ -767,26 +855,22 @@ msgid "<b>Example:</b> 123456789"
msgstr "<b>���</b>123456789"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "å?符é??(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
msgid "ICQ _UIN:"
msgstr "ICQ _UINï¼?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
msgid "What is your ICQ UIN?"
msgstr "æ?¨ç?? ICQ UIN æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
msgid "What is your ICQ password?"
msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "å?符é??(_C)ï¼?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "�建��"
-
#: ../libempathy-gtk/empathy-account-widget-sip.c:183
#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
@@ -852,6 +936,14 @@ msgstr "ç??å??ï¼?"
msgid "Servers"
msgstr "æ??å?¡å?¨"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "æ?¨ç?? IRC æ?µç§°æ?¯ä»?ä¹??"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "�个 IRC ��?"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
msgid "<b>Example:</b> user gmail com"
msgstr "<b>���</b>user gmail com"
@@ -860,75 +952,75 @@ msgstr "<b>���</b>user gmail com"
msgid "<b>Example:</b> user jabber org"
msgstr "<b>���</b>user jabber org"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "é??è¦?å? å¯?(TLS/SSL)(_Y)"
+
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "忽ç?¥ SSL è¯?书é??误(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Override server settings"
msgstr "è¦?ç??æ??å?¡å?¨è®¾ç½®"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "ä¼?å??级(_O)ï¼?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "ä¼?å??级(_T):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
msgid "Reso_urce:"
msgstr "��(_U)�"
#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
msgid ""
"This is your username, not your normal Facebook login.\n"
"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
"Facebook username if you don't have one."
msgstr ""
-"è¿?æ?¯æ?¨ç??ç?¨æ?·å??ï¼?è??ä¸?æ?¯æ?¨æ£å¸¸ç?? Facebook ç?»å½?å??ã??\n"
+"è¿?æ?¯æ?¨ç??ç?¨æ?·å??ï¼?è??ä¸?æ?¯æ?¨é??常ç?»é?? Facebook ç??å??称ã??\n"
"å¦?æ??æ?¨æ?¯ facebook.com/<b>badger</b>ï¼?è¾?å?¥\n"
-"<b>badger</b>ã??å¦?æ??æ?¨æ²¡æ?? Facebook ç?¨æ?·å??ç??è¯?ï¼?使ç?¨<a href=\"http://www.";
-"facebook.com/username/\">æ¤é¡µé?¢</a> æ?¥é??æ?©ä¸?个ã??"
+"<b>badger</b>ã??å¦?æ??æ?¨è¿?没æ?? Facebook ç?¨æ?·å??ç??è¯?ï¼?使ç?¨<a href=\"http://www.";
+"facebook.com/username/\">è¿?个页é?¢</a> æ?¥é??æ?©ä¸?个ã??"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
msgid "Use old SS_L"
msgstr "使ç?¨æ?§ç?? SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
msgid "What is your Facebook password?"
msgstr "æ?¨ç?? Facebook å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
msgid "What is your Facebook username?"
msgstr "æ?¨ç?? Facebook ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
msgid "What is your Google ID?"
msgstr "æ?¨ç?? Google ID æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
msgid "What is your Google password?"
msgstr "æ?¨ç?? Google å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
msgid "What is your Jabber ID?"
msgstr "æ?¨ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
msgid "What is your Jabber password?"
msgstr "æ?¨ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
msgid "What is your desired Jabber ID?"
msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
msgid "What is your desired Jabber password?"
msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "é??è¦?å? å¯?(TLS/SSL)(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "忽ç?¥ SSL è¯?书é??误(_I)"
-
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
msgid "<b>Example:</b> user hotmail com"
msgstr "<b>���</b>user hotmail com"
@@ -942,25 +1034,25 @@ msgid "What is your Windows Live password?"
msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_E-mail address:"
-msgstr "ç?µå?é?®ä»¶(_E)ï¼?"
+msgid "E-_mail address:"
+msgstr "ç?µå?é?®ä»¶å?°å??(_M):"
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "�称(_K):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_First Name:"
msgstr "å??(_F)"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Jabber ID:"
msgstr "_Jabber IDï¼?"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Last Name:"
msgstr "�(_L)�"
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "�称(_N)�"
-
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "å?¬å¼?ç??å??å?(_P)ï¼?"
@@ -979,7 +1071,7 @@ msgstr "å??ç?°ç»?å®?"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Discover the STUN server automatically"
-msgstr "è?ªå?¨ç??å??ç?° STUN æ??å?¡å?¨"
+msgstr "è?ªå?¨å??ç?° STUN æ??å?¡å?¨"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "Interval (seconds)"
@@ -1038,26 +1130,22 @@ msgid "_Username:"
msgstr "ç?¨æ?·å??(_U)ï¼?"
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "使� _Yahoo ��"
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽ç?¥ä¼?è®®å??è??天室é??请(_G)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
msgid "What is your Yahoo! ID?"
msgstr "æ?¨ç?? Yahoo! ID æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "What is your Yahoo! password?"
msgstr "æ?¨ç?? Yahoo! å¯?ç ?æ?¯ä»?ä¹?ï¼?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "Yahoo! I_D:"
msgstr "Yahoo I_Dï¼?"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "忽ç?¥ä¼?è®®å??è??天室é??请(_I)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Room List locale:"
msgstr "è??天室å??表 locale(_R)ï¼?"
@@ -1086,55 +1174,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:642
msgid "Failed to open private chat"
msgstr "建��人对�失败"
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:682
msgid "Topic not supported on this conversation"
msgstr "ä¸?æ?¯æ??å?¨æ¤ä¼?è¯?ä¸?设置主é¢?"
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:688
msgid "You are not allowed to change the topic"
msgstr "�����主�"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:822
msgid "/clear: clear all messages from the current conversation"
msgstr "/clearï¼?æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主é¢?>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:836
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?个ç§?人è??天"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:843
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??对è¯?ä¸å??é??ä¸?个å?¨ä½?æ¶?æ?¯"
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:849
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 "
@@ -1143,91 +1231,91 @@ msgstr ""
"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
"say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:854
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:864
#, c-format
msgid "Usage: %s"
msgstr "���%s"
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:893
msgid "Unknown command"
msgstr "���令"
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1014
msgid "Unknown command; see /help for the available commands"
msgstr "æ?ªç?¥å?½ä»¤ï¼?请使ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1152
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "invalid contact"
msgstr "æ? æ??è??系人"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "permission denied"
msgstr "æ??é??ä¸?足"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "too long message"
msgstr "��太�"
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "not implemented"
msgstr "����"
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1168
msgid "unknown"
msgstr "��"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1172
#, 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:1282 ../src/empathy-chat-window.c:691
msgid "Topic:"
msgstr "���"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1294
#, c-format
msgid "Topic set to: %s"
msgstr "��被设置为�%s"
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1296
msgid "No topic defined"
msgstr "�设置��"
-#: ../libempathy-gtk/empathy-chat.c:1777
+#: ../libempathy-gtk/empathy-chat.c:1775
msgid "(No Suggestions)"
msgstr "(没æ??建议)"
-#: ../libempathy-gtk/empathy-chat.c:1831
+#: ../libempathy-gtk/empathy-chat.c:1829
msgid "Insert Smiley"
msgstr "æ??å?¥è¡¨æ??"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1849
-#: ../libempathy-gtk/empathy-ui-utils.c:1799
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1801
msgid "_Send"
msgstr "å??é??(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1883
+#: ../libempathy-gtk/empathy-chat.c:1881
msgid "_Spelling Suggestions"
msgstr "æ?¼å??建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:1958
msgid "Failed to retrieve recent logs"
msgstr "è?·å??æ??è¿?æ?¥å¿?失败"
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2064
#, c-format
msgid "%s has disconnected"
msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -1235,12 +1323,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:2071
#, 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:2074
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢�"
@@ -1248,17 +1336,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:2082
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s ç¦?æ¢"
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2085
#, c-format
msgid "%s was banned"
msgstr "%s 被ç¦?æ¢"
-#: ../libempathy-gtk/empathy-chat.c:2091
+#: ../libempathy-gtk/empathy-chat.c:2089
#, c-format
msgid "%s has left the room"
msgstr "%s 离å¼?äº?è??天室"
@@ -1268,59 +1356,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:2098
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2123
#, c-format
msgid "%s has joined the room"
msgstr "%s å? å?¥äº?è??天室"
-#: ../libempathy-gtk/empathy-chat.c:2150
+#: ../libempathy-gtk/empathy-chat.c:2148
#, 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:2287 ../src/empathy-call-window.c:1932
msgid "Disconnected"
msgstr "å·²æ?å¼?è¿?æ?¥"
-#: ../libempathy-gtk/empathy-chat.c:2927
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Wrong password; please try again:"
msgstr "å¯?ç ?é??误ï¼?请é??è¯?ï¼?"
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:2935
msgid "Retry"
msgstr "é??è¯?"
-#: ../libempathy-gtk/empathy-chat.c:2933
+#: ../libempathy-gtk/empathy-chat.c:2940
msgid "This room is protected by a password:"
msgstr "è¿?个æ?¿é?´æ?¯ç?±ä¸?个å¯?ç ?ä¿?æ?¤ç??ï¼?"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2941
msgid "Join"
msgstr "å? å?¥"
-#: ../libempathy-gtk/empathy-chat.c:3074
+#: ../libempathy-gtk/empathy-chat.c:3081
msgid "Connected"
msgstr "已��"
-#: ../libempathy-gtk/empathy-chat.c:3127
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../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)"
@@ -1331,6 +1419,7 @@ msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
#: ../libempathy-gtk/empathy-contact-dialogs.c:243
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
msgid "Edit Contact Information"
msgstr "ç¼?è¾?è??系人信æ?¯"
@@ -1351,101 +1440,101 @@ msgstr "以å??å??å?³å®?(_L)"
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:2232
#, 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:2235
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
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
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:2320
#, 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:2322
msgid "Removing contact"
msgstr "å? é?¤è??系人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../libempathy-gtk/empathy-individual-menu.c:223
#: ../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:514
#: ../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:557
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:599
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:642
#: ../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:683
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:725
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:1541
+#: ../libempathy-gtk/empathy-individual-menu.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
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:786
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:970
#: ../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:1017
msgid "_Invite to Chat Room"
msgstr "é??请å?°è??天室(_I)"
@@ -1453,149 +1542,178 @@ 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 "E-mail å?°å??ï¼?"
+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:454
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:456
msgid "Country:"
msgstr "�家�"
-#: ../libempathy-gtk/empathy-contact-widget.c:845
+#: ../libempathy-gtk/empathy-contact-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:458
msgid "State:"
msgstr "ç??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:585
+#: ../libempathy-gtk/empathy-individual-widget.c:460
msgid "City:"
msgstr "å??å¸?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:849
+#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-individual-widget.c:462
msgid "Area:"
msgstr "���"
-#: ../libempathy-gtk/empathy-contact-widget.c:851
+#: ../libempathy-gtk/empathy-contact-widget.c:589
+#: ../libempathy-gtk/empathy-individual-widget.c:464
msgid "Postal Code:"
msgstr "é?®æ?¿ç¼?ç ?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:853
+#: ../libempathy-gtk/empathy-contact-widget.c:591
+#: ../libempathy-gtk/empathy-individual-widget.c:466
msgid "Street:"
msgstr "è¡?é??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:855
+#: ../libempathy-gtk/empathy-contact-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:468
msgid "Building:"
msgstr "建ç?ç?©ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:857
+#: ../libempathy-gtk/empathy-contact-widget.c:595
+#: ../libempathy-gtk/empathy-individual-widget.c:470
msgid "Floor:"
msgstr "楼��"
-#: ../libempathy-gtk/empathy-contact-widget.c:859
+#: ../libempathy-gtk/empathy-contact-widget.c:597
+#: ../libempathy-gtk/empathy-individual-widget.c:472
msgid "Room:"
msgstr "æ?¿é?´ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:599
+#: ../libempathy-gtk/empathy-individual-widget.c:474
msgid "Text:"
msgstr "æ??æ?¬ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:601
+#: ../libempathy-gtk/empathy-individual-widget.c:476
msgid "Description:"
msgstr "æ??è¿°ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-individual-widget.c:478
msgid "URI:"
msgstr "URIï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:605
+#: ../libempathy-gtk/empathy-individual-widget.c:480
msgid "Accuracy Level:"
msgstr "å??ç¡®ç¨?度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:869
+#: ../libempathy-gtk/empathy-contact-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:482
msgid "Error:"
msgstr "é??误ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-contact-widget.c:609
+#: ../libempathy-gtk/empathy-individual-widget.c:484
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:486
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:488
msgid "Speed:"
msgstr "é??度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:877
+#: ../libempathy-gtk/empathy-contact-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:490
msgid "Bearing:"
msgstr "æ?¹ä½?æ??å??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:879
+#: ../libempathy-gtk/empathy-contact-widget.c:617
+#: ../libempathy-gtk/empathy-individual-widget.c:492
msgid "Climb Speed:"
msgstr "ç?¬å??é??度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:881
+#: ../libempathy-gtk/empathy-contact-widget.c:619
+#: ../libempathy-gtk/empathy-individual-widget.c:494
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:496
msgid "Longitude:"
msgstr "�度�"
-#: ../libempathy-gtk/empathy-contact-widget.c:885
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:498
msgid "Latitude:"
msgstr "纬度�"
-#: ../libempathy-gtk/empathy-contact-widget.c:887
+#: ../libempathy-gtk/empathy-contact-widget.c:625
+#: ../libempathy-gtk/empathy-individual-widget.c:500
msgid "Altitude:"
msgstr "æµ·æ??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:950
+#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-contact-widget.c:705
+#: ../libempathy-gtk/empathy-individual-widget.c:582
+#: ../libempathy-gtk/empathy-individual-widget.c:599
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ä½?ç½®"
-#: ../libempathy-gtk/empathy-contact-widget.c:966
-msgid "<b>Location</b>, "
-msgstr "<b>ä½?ç½®</b>ï¼?"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:707
+#: ../libempathy-gtk/empathy-individual-widget.c:601
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:650
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:842
+#: ../libempathy-gtk/empathy-individual-widget.c:841
msgid "Save Avatar"
msgstr "ä¿?å?头å??"
-#: ../libempathy-gtk/empathy-contact-widget.c:1156
+#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-individual-widget.c:899
msgid "Unable to save avatar"
msgstr "æ? æ³?ä¿?å?头å??"
@@ -1603,7 +1721,9 @@ msgstr "æ? æ³?ä¿?å?头å??"
msgid "<b>Location</b> at (date)\t"
msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
+#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1227
msgid "Alias:"
msgstr "å?«å??ï¼?"
@@ -1616,83 +1736,186 @@ 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:1431
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 "æ??ä½?ç³»ç»?ï¼?"
-#: ../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 "æ·»å? 群ç»?(_A)"
-#: ../libempathy-gtk/empathy-individual-menu.c:603
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+msgid "Select"
+msgstr "é??æ?©"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-main-window.c:1247
+msgid "Group"
+msgstr "群�"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+msgid "Linked Contacts"
+msgstr "å·²ç»?å®?ç??è??系人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "é??æ?©è¦?ç»?å®?ç??è??系人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "æ?°è??系人é¢?è§?"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "å?¨å·¦ä¾§å??表ä¸é??ä¸ç??è??系人å°?被ç»?å®?å?¨ä¸?èµ·ã??"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo jabber org) and the second is one
+#. * of the user's account IDs (e.g. me hotmail com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contactsâ?¦"
+msgstr "ç»?å®?è??系人(_L)â?¦"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#, 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-chooser-dialog.c:328
+msgid "New Network"
+msgstr "�建��"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "é??æ?©ä¸?个 IRC ç½?ç»?"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "æ?°å»ºæ??å?¡å?¨"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "æ??å?¡å?¨"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "端�"
-
#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:632
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "账�"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:116
+msgid "Link Contacts"
+msgstr "ç»?å®?è??系人"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgctxt "Unlink individual (button)"
+msgid "_Unlinkâ?¦"
+msgstr "解���(_U)�"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:122
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "å°?æ?¾ç¤ºç??å??è??系人æ??å??å?«ç??è??系人å®?å?¨å??å¼?ã??"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:137
+msgid "_Link"
+msgstr "ç»?å®?(_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "解é?¤ç»?å®?å??è??系人 '%s'?"
-#: ../libempathy-gtk/empathy-log-window.c:649
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr "æ?¯å?¦å¸?æ??解é?¤ç»?å®?该å??è??系人? è¿?å°?å°?该å??è??系人æ??å??å?«ç??è??系人å®?å?¨å??å¼?ã??"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:191
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "解���(_U)"
+
+#: ../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)ï¼?"
@@ -1711,18 +1934,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 "æ?°å»ºé??è¯?"
@@ -1847,18 +2069,91 @@ msgstr "��"
msgid "Blue"
msgstr "è??è?²"
-#: ../libempathy-gtk/empathy-ui-utils.c:1696
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified.\n"
+msgstr "è??天æ??å?¡å?¨æ??æ??ä¾?ç??身份æ? æ³?éª?è¯?ã??\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:156
+#| msgid "The certrificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority"
+msgstr "è¯?书并é??ç?± CA ç¾å??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:160
+msgid "The certificate has expired"
+msgstr "è¯?书已è¿?æ??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:163
+msgid "The certificate hasn't yet been activated"
+msgstr "�书��被�活"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:166
+msgid "The certificate does not have the expected fingerprint"
+msgstr "è¯?书缺é¢?æ??ç??æ??纹"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:169
+msgid "The hostname verified by the certificate doesn't match the server name"
+msgstr "è¯?书æ??éª?è¯?ç??主æ?ºå??ä¸?æ??å?¡å?¨å??ä¸?å?¹é??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:173
+msgid "The certificate is self-signed"
+msgstr "è¯?书æ?¯è?ªç¾å±?ç??"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:176
+msgid "The certificate has been revoked by the issuing Certification Authority"
+msgstr "è¯?书被è¯?书ç¾å??æ?ºæ??å??é??"
+
+# lainmeï¼?è¯?书æ?¯å¼±å? å¯?ç??
+# xslidianï¼?è¯?书æ??è¢«ç ´è§£
+#: ../libempathy-gtk/empathy-tls-dialog.c:180
+msgid "The certificate is cryptographically weak"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:183
+msgid "The certificate length exceeds verifiable limits"
+msgstr "è¯?书é?¿åº¦è¶?å?ºå?¯éª?è¯?é??å?¶"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:187
+msgid "The certificate is malformed"
+msgstr "�书�常"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "é¢?æ??主æ?ºå??: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "è¯?书主æ?ºå??: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:263
+msgid "Continue"
+msgstr "继ç»"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:269
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "è¿?æ?¥ä¸?å??ä¿¡ä»»ã??æ?¯å?¦ä»?è¦?继ç»?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:286
+msgid "Remember this choice for future connections"
+msgstr "为å°?æ?¥ç??è¿?æ?¥è®°ä½?æ?¬æ¬¡é??æ?©"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Certificate Details"
+msgstr "è¯?书详æ??"
+
+#: ../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 ä¼ é??æ?¥æ??件"
+msgstr "ä»? %s ä¼ æ?¥ç??æ??件"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2039,20 +2334,19 @@ msgstr "é??æ?©ç??è??系人离线ã??"
msgid "No error message"
msgstr "æ? é??误信æ?¯"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
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 IM 客�端"
@@ -2143,7 +2437,7 @@ msgstr ""
"æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??ä¸å? å?¥è´¦æ?·ã??"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1316
msgid "An error occurred"
msgstr "å??ç??é??误"
@@ -2152,36 +2446,36 @@ msgstr "å??ç??é??误"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:604
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:614
#, c-format
msgid "New %s account"
msgstr "�建 %s 账�"
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:515
msgid "What kind of chat account do you have?"
msgstr "æ?¨å·²ç»?æ?¥æ??å?ªä¸ªç±»å??ç??å¸?æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:521
msgid "Do you have any other chat accounts you want to set up?"
msgstr "æ?¨è¿?è¦?设置å?¶å®?è??天账æ?·å??ï¼?"
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:527
msgid "Enter your account details"
msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:532
msgid "What kind of chat account do you want to create?"
msgstr "æ?¨æ?³å??建é?£ç§?ç±»å??ç??å¸?æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:538
msgid "Do you want to create other chat accounts?"
msgstr "æ?¨æ?³è¦?å??建å?¶å®?ç??è??天账æ?·å??ã??"
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:545
msgid "Enter the details for the new account"
msgstr "è¾?å?¥æ?°è´¦æ?·ç??详ç»?èµ?æ??"
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:660
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2192,61 +2486,61 @@ msgstr ""
"Live å??许å¤?å?¶å®?è??天软件ç??æ??å??å??å??äº?è??天ã??使ç?¨éº¦å??é£?æ??æ??å??头ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
"å??è§?é¢?é??è¯?ã??"
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:677
msgid "Do you have an account you've been using with another chat program?"
msgstr "æ?¨æ??没æ??å?¶å®?è??天软件ç??è´¦æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:700
msgid "Yes, import my account details from "
msgstr "æ??ï¼?请导å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:721
msgid "Yes, I'll enter my account details now"
msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:743
msgid "No, I want a new account"
msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?个æ?°ç??è´¦æ?·"
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:753
msgid "No, I just want to see people online nearby for now"
msgstr "没æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:774
msgid "Select the accounts you want to import:"
msgstr "é??æ?©æ?¨è¦?导å?¥ç??è´¦æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "æ?¯"
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:865
msgid "No, that's all for now"
msgstr "没æ??ï¼?å°±è¿?æ ·å?§"
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1130
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 "
"details below are correct. You can easily change these details later or "
"disable this feature by using the 'Accounts' dialog"
msgstr ""
-"Empathy å?¯ä»¥è?ªå?¨å??ç?°å??æ?¨ä¸?æ ·è¿?æ?¥å?°å??æ ·ç??ç½?ç»?ä¸ç??人们ï¼?并ä¸?å?¯ä»¥å??ä»?们è??天ã??å¦?"
-"æ??æ?¨æ?³ä½¿ç?¨è¿?个å??è?½ï¼?请ä»?ç»?æ?¥ç??ä¸?å??ä¿¡æ?¯æ?¯å?¦æ£ç¡®ã??æ?¨ä¹?å??ä¹?å?¯ä»¥é??è¿?â??è´¦æ?·â??对è¯?æ¡?"
-"è½»æ?¾ç??ä¿®æ?¹è¿?äº?ä¿¡æ?¯æ??å?³é?è¿?个å??è?½ã??"
+"Empathy å?¯ä»¥è?ªå?¨å??ç?°å??æ?¨è¿?æ?¥å?°å??ä¸?个ç½?ç»?ä¸ç??人们ï¼?并ä¸?å?¯ä»¥å??ä»?们è??天ã??å¦?æ??æ?¨"
+"æ?³ä½¿ç?¨è¿?个å??è?½ï¼?请ä»?ç»?æ?¥ç??ä¸?å??ä¿¡æ?¯æ?¯å?¦æ£ç¡®ã??æ?¨ä¹?å??ä¹?å?¯ä»¥é??è¿?â??è´¦æ?·â??对è¯?æ¡?è½»æ?¾"
+"ç??ä¿®æ?¹è¿?äº?ä¿¡æ?¯æ??å?³é?è¿?个å??è?½"
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1136
+#: ../src/empathy-account-assistant.c:1192
msgid "Edit->Accounts"
msgstr "��->账�"
-#: ../src/empathy-account-assistant.c:1151
+#: ../src/empathy-account-assistant.c:1152
msgid "I don't want to enable this feature for now"
msgstr "æ??ä¸?å?¯ç?¨æ¤ç?¹æ?§"
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1188
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 "
@@ -2255,25 +2549,25 @@ msgid ""
msgstr ""
"æ?¨æ? æ³?å??è¿?æ?¥å?°æ?¨å±?å??ç½?ä¸ç??ç?¨æ?·è??天ï¼?å? 为没æ??å®?è£? telepathy-salutã??å¦?æ??æ?¨æ?³å?¯"
"ç?¨è¯¥å??è?½ï¼?请å®?è£? telepathy-salut å??ï¼?并ä¸?å?¨è´¦æ?·å¯¹è¯?æ¡?ä¸å??建é??è¿?ç??人(People "
-"Nearby) è´¦æ?·ã??"
+"Nearby)账�"
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1194
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ���"
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1240
msgid "Messaging and VoIP Accounts Assistant"
msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1274
msgid "Welcome to Empathy"
msgstr "欢�使� Empathy"
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1283
msgid "Import your existing accounts"
msgstr "导å?¥ç?°æ??å¸?æ?·"
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1301
msgid "Please enter personal details"
msgstr "请��个人信�"
@@ -2290,82 +2584,94 @@ 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:281 ../src/empathy-call-window.c:818
msgid "Connectingâ?¦"
msgstr "æ£å?¨è¿?æ?¥..."
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:322
#, c-format
msgid "Offline â?? %s"
msgstr "离线 - %s"
-#: ../src/empathy-accounts-dialog.c:324
+#: ../src/empathy-accounts-dialog.c:334
#, c-format
msgid "Disconnected â?? %s"
msgstr "å·²æ?å¼? - %s"
-#: ../src/empathy-accounts-dialog.c:335
+#: ../src/empathy-accounts-dialog.c:345
msgid "Offline â?? No Network Connection"
msgstr "离线 - æ? å?¯ç?¨ç½?ç»?"
-#: ../src/empathy-accounts-dialog.c:342
+#: ../src/empathy-accounts-dialog.c:352
msgid "Unknown Status"
msgstr "æ?ªç?¥ç?¶æ??"
-#: ../src/empathy-accounts-dialog.c:354
+#: ../src/empathy-accounts-dialog.c:364
msgid "Offline â?? Account Disabled"
msgstr "离线 - ��被��"
-#: ../src/empathy-accounts-dialog.c:795
+#: ../src/empathy-accounts-dialog.c:811
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "æ?¨å°?è¦?å??建ä¸?个æ?°è´¦æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继ç»å??ï¼?"
-#: ../src/empathy-accounts-dialog.c:1142
+#: ../src/empathy-accounts-dialog.c:1158
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "æ?¨è¦?ä»?ç?µè??ä¸ç§»é?¤ %s å??ï¼?"
-#: ../src/empathy-accounts-dialog.c:1146
+#: ../src/empathy-accounts-dialog.c:1162
msgid "This will not remove your account on the server."
msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
-#: ../src/empathy-accounts-dialog.c:1383
+#: ../src/empathy-accounts-dialog.c:1400
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "æ?¨å°?è¦?é??æ?©å?¦ä¸?个账æ?·ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继ç»å??ï¼?"
-#: ../src/empathy-accounts-dialog.c:1960
+#: ../src/empathy-accounts-dialog.c:2003
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "æ?¨å°?è¦?å?³é?æ¤çª?å?£ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?继ç»å??ï¼?"
#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "æ£å?¨å? 载账å?·ä¿¡æ?¯"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "No protocol installed"
msgstr "å°?æ?ªå®?è£?å??è®®"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Protocol:"
msgstr "å??è®®ï¼?"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "è¦?æ·»å? ä¸?个æ?°è´¦æ?·ï¼?æ?¨é¦?å??é??è¦?为æ?¨æ?³è¦?使ç?¨ç??æ¯?个å??è®®å®?è£?å??端ã??"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid "_Addâ?¦"
msgstr "æ·»å? (_A)..."
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Importâ?¦"
msgstr "导�(_I)..."
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr " - Empathy 认�客�端"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy 认�客�端"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
msgid "People nearby"
msgstr "é??è¿?ç??人"
@@ -2377,101 +2683,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 "伽马"
-#: ../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:1173
msgid "_Sidebar"
msgstr "侧边æ ?(_S)"
-#: ../src/empathy-call-window.c:1165
+#: ../src/empathy-call-window.c:1192
msgid "Audio input"
msgstr "����"
-#: ../src/empathy-call-window.c:1169
+#: ../src/empathy-call-window.c:1196
msgid "Video input"
msgstr "����"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1200
msgid "Dialpad"
msgstr "ç?µè¯?é?®ç??"
-#: ../src/empathy-call-window.c:1178
+#: ../src/empathy-call-window.c:1205
msgid "Details"
msgstr "详�信�"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-call-window.c:1273
#, 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:1352
msgid "Call"
msgstr "é??è¯?"
+#: ../src/empathy-call-window.c:1506
+msgid "The IP address as seen by the machine"
+msgstr "æ?ºå?¨æ??è§?ç?? IP å?°å??"
+
+#: ../src/empathy-call-window.c:1508
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Internet ä¸?æ??å?¡å?¨æ??è§?ç?? IP å?°å??"
+
+#: ../src/empathy-call-window.c:1510
+msgid "The IP address of the peer as seen by the other side"
+msgstr "å?¦ä¸?æ?¹æ??è§?ç?? IP å?°å??"
+
+#: ../src/empathy-call-window.c:1512
+msgid "The IP address of a relay server"
+msgstr "ä¸è½¬æ??å?¡å?¨ IP å?°å??"
+
+#: ../src/empathy-call-window.c:1514
+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:2247
#, c-format
msgid "Connected â?? %d:%02dm"
msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2308
msgid "Technical Details"
msgstr "æ??æ?¯ç»?è??"
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-call-window.c:2346
#, 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:2351
#, 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:2357
#, 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:2363
msgid "There was a failure on the network"
msgstr "ç½?ç»?å?ºç?°ä¸?个é??误"
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-call-window.c:2367
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:2370
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:2380
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2481,15 +2807,19 @@ msgstr ""
"Telepathy ç»?件å?ºç?°äº?ä¸?äº?æ??å¤?ã??请<a href=\"%s\">æ±?æ?¥è¿?个é??误</a>ï¼?并é??ä¸?帮å?©è??"
"å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
-#: ../src/empathy-call-window.c:2258
+#: ../src/empathy-call-window.c:2388
msgid "There was a failure in the call engine"
msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?个æ??é??"
-#: ../src/empathy-call-window.c:2297
+#: ../src/empathy-call-window.c:2391
+msgid "The end of the stream was reached"
+msgstr "å·²å?°è¾¾æµ?ç??æ?«å°¾"
+
+#: ../src/empathy-call-window.c:2431
msgid "Can't establish audio stream"
msgstr "��建����"
-#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-call-window.c:2441
msgid "Can't establish video stream"
msgstr "��建����"
@@ -2537,43 +2867,59 @@ msgstr "æ??èµ·"
msgid "Hang up current call"
msgstr "æ??èµ·å½?å??å?¼å?«"
+# TCP candidate pair
+# lainmeï¼?æ?¬å?°å??é??ï¼?
#: ../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
+# TCP candidate pair
+# lainmeï¼?è¿?ç¨?å??é??ï¼?
+#: ../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)"
@@ -2623,7 +2969,7 @@ msgstr "æ??å?¥è¡¨æ??(_S)"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participantâ?¦"
-msgstr "é??请å??ä¸?人(_P)..."
+msgstr "é??请å??ä¸?è??(_P)â?¦"
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
@@ -2697,81 +3043,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 æ??ä¸?个è§?é¢?å?¼å?«ç»?æ?¨ã??æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+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"
@@ -2780,12 +3131,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 å½?å??å?¨çº¿ã??"
@@ -2881,15 +3232,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 "å?©ä½?"
@@ -2924,27 +3275,31 @@ msgstr "å??è®®"
msgid "Source"
msgstr "�"
-#: ../src/empathy-main-window.c:476
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "没æ??æ?¾å?°å?¹é??项"
+
+#: ../src/empathy-main-window.c:535
msgid "Reconnect"
msgstr "é??æ?°è¿?æ?¥"
-#: ../src/empathy-main-window.c:482
+#: ../src/empathy-main-window.c:541
msgid "Edit Account"
msgstr "��账�"
-#: ../src/empathy-main-window.c:488
+#: ../src/empathy-main-window.c:547
msgid "Close"
msgstr "å?³é?"
-#: ../src/empathy-main-window.c:1177
+#: ../src/empathy-main-window.c:1229
msgid "Contact"
msgstr "è??系人"
-#: ../src/empathy-main-window.c:1501
+#: ../src/empathy-main-window.c:1554
msgid "Contact List"
msgstr "è??系人å??表"
-#: ../src/empathy-main-window.c:1608
+#: ../src/empathy-main-window.c:1663
msgid "Show and edit accounts"
msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
@@ -3038,29 +3393,29 @@ msgstr "æ??å??"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:605
+#: ../src/empathy-new-chatroom-dialog.c:607
#, c-format
msgid ""
-"<b>%s</b>\n"
+"%s\n"
"Invite required: %s\n"
"Password required: %s\n"
"Members: %s"
msgstr ""
-"<b>%s</b>\n"
-"é??è¦?é??请ï¼?%s\n"
-"é??è¦?å¯?ç ?ï¼?%s\n"
-"æ??å??ï¼?%s"
+"%s\n"
+"é??è¦?é??请: %s\n"
+"é??è¦?å¯?ç ?: %s\n"
+"æ??å??: %s"
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
msgid "No"
msgstr "å?¦"
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:638
msgid "Could not start room listing"
msgstr "æ? æ³?å¼?å§?è??天室å??表"
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:648
msgid "Could not stop room listing"
msgstr "æ? æ³?å??æ¢è??天室å??表"
@@ -3091,39 +3446,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 "é¦?é??项"
@@ -3176,18 +3531,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 "
@@ -3196,65 +3555,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 "ç½?ç»?(_N)(IPï¼?Wi-Fi)"
-#: ../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)"
@@ -3286,7 +3646,7 @@ msgstr "ç?¶æ??"
msgid "_Quit"
msgstr "é??å?º(_Q)"
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
msgid "Contact Map View"
msgstr "è??ç³»å?°å?¾è§?å?¾"
@@ -3355,7 +3715,7 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
msgid "Invite Participant"
-msgstr "é??请å??ä¸?人"
+msgstr "é??请å??ä¸?è??"
#: ../src/empathy-invite-participant-dialog.c:35
msgid "Choose a contact to invite into the conversation:"
@@ -3367,15 +3727,16 @@ msgstr "é??请"
#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?ï¼?æ?§è¡?ä»»å?¡(å¦?ï¼?导å?¥)ç?¶å??é??å?º"
+msgstr "ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?ï¼?å®?æ??æ??æ??å·¥ä½?ï¼?å¦?导å?¥ï¼?ç?¶å??é??å?º"
#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "å¦?æ??æ??ä»»ä½? non-salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?"
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "å¦?æ??æ??ä»»ä½?é?? salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?"
+# lainmeï¼?å??次é??æ?©ç»?å®?ç??è´¦æ?·(æ¯?å¦? gabble/jabber/foo_40example_2eorg0)
#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?· (å¦?ï¼?gabble/jabber/foo_40example_2eorg0)"
+msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?·(å¦? gabble/jabber/foo_40example_2eorg0)"
#: ../src/empathy-accounts.c:192
msgid "<account-id>"
@@ -3393,6 +3754,21 @@ msgstr "Empathy 账�"
msgid "Empathy Debugger"
msgstr "Empathy ���"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "使� _Yahoo ��"
+
+#~ msgid "_Character set:"
+#~ msgstr "å?符é??(_C)ï¼?"
+
+#~ msgid "_E-mail address:"
+#~ msgstr "ç?µå?é?®ä»¶(_E)ï¼?"
+
+#~ msgid "_Nickname:"
+#~ msgstr "�称(_N)�"
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>ä½?ç½®</b>ï¼?"
+
#~ msgid "Send and receive messages"
#~ msgstr "å??é??æ?¥æ?¶å?³æ?¶æ¶?æ?¯"
@@ -3434,9 +3810,6 @@ msgstr "Empathy ���"
#~ msgid "Email:"
#~ msgstr "ç?µå?é?®ä»¶ï¼?"
-#~ msgid "C_all"
-#~ msgstr "é??è¯?(_A)"
-
#~ msgid "Custom Message..."
#~ msgstr "è?ªå®?ä¹?ç?¶æ??..."
@@ -3617,9 +3990,6 @@ msgstr "Empathy ���"
#~ msgid "<b>Servers</b>"
#~ msgstr "<b>æ??å?¡å?¨</b>"
-#~ msgid "Create a new IRC network"
-#~ msgstr "å??建æ?°ç?? IRC ç½?ç»?"
-
#~ msgid "Edit the selected IRC network"
#~ msgstr "ç¼?è¾?é??ä¸ç?? IRC ç½?ç»?"
@@ -3657,9 +4027,6 @@ msgstr "Empathy ���"
#~ msgid "<b>Groups</b>"
#~ msgstr "<b>群�</b>"
-#~ msgid "Contact information"
-#~ msgstr "è??系人信æ?¯"
-
#~ msgid "Message:"
#~ msgstr "���"
@@ -3693,9 +4060,6 @@ msgstr "Empathy ���"
#~ msgid "Invitation _message:"
#~ msgstr "é??请æ¶?æ?¯(_M)ï¼?"
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "æ?¨è¢«é??请å? å?¥ä¸?个è??天ä¼?è®®ã??"
-
#~ msgid "Edit Favorite Room"
#~ msgstr "ç¼?è¾?è??天室æ?¶è??"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
