[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, 27 Oct 2010 16:02:31 +0000 (UTC)
commit f8f79bf5b2597b0239fb12c426907cf2b918bddc
Author: Aron Xu <aronxu gnome org>
Date: Wed Oct 27 16:01:02 2010 +0000
Update Simplified Chinese translation.
po/zh_CN.po | 1004 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 533 insertions(+), 471 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9d700bf..1e6da00 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,15 +15,16 @@
# Tao Wang <dancefire gmail com>, 2010.
# Dean Lee <xslidian gmail com>, 2010.
# Aron Xu <happyaron xu gmail com>, 2009, 2010.
+# Yinghua Wang <wantinghard gmail com>, 2010
#
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-09-24 07:49+0000\n"
-"PO-Revision-Date: 2010-09-23 14:48+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2010-10-25 23:29+0000\n"
+"PO-Revision-Date: 2010-10-27 16:00+0000\n"
+"Last-Translator: Yinghua Wang <wantinghard gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -120,315 +121,307 @@ msgid "Empathy default download folder"
msgstr "Empathy é»?认ä¸?è½½æ??件夹"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已�询�导�账�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已��移� telepathy-butterfly ��"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空������离�"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-connect on startup"
msgstr "Empathy ���������"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should reduce the location's accuracy"
msgstr "é??ä½? Emapthy ä½?置信æ?¯ç??å??确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy æ?¯å?¦ä½¿ç?¨è??系人头å??ä½?为è??天çª?å?£å?¾æ ?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Enable WebKit Developer Tools"
msgstr "å?¯ç?¨ WebKit å¼?å??å·¥å?·"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable popup notifications for new messages"
msgstr "å?¯ç?¨æ?°æ¶?æ?¯å¼¹å?ºæ??示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable spell checker"
msgstr "å?¯ç?¨æ?¼å??æ£?æ?¥å?¨"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Hide main window"
msgstr "é??è??主çª?å?£"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide the main window."
msgstr "é??è??主çª?å?£ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Nick completed character"
msgstr "æ?µç§°è¡¥å?¨å?符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Open new chats in separate windows"
msgstr "å?¨å??ç?¬çª?å?£ä¸æ??å¼?æ?°è??天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Path of the Adium theme to use"
msgstr "Adium 主é¢?ç??è·¯å¾?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "å¦?æ??è??天使ç?¨ Adium 主é¢?ï¼?使ç?¨ Adium 主é¢?ç??è·¯å¾?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Play a sound for incoming messages"
msgstr "æ?¶å?°æ¶?æ?¯æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for new conversations"
msgstr "æ?°å¯¹è¯?æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for outgoing messages"
msgstr "å??å?ºæ¶?æ?¯æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound when a contact logs in"
msgstr "è??系人ç?»å½?æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs out"
msgstr "è??系人注é??æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when we log in"
msgstr "ç?»å½?æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log out"
msgstr "注é??æ?¶æ?æ?¾å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Pop up notifications if the chat isn't focused"
msgstr "å¦?æ??è??天çª?å?£ä¸?æ?¯ç?¦ç?¹å??å¼¹å?ºæ¶?æ?¯é??ç?¥"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications when a contact logs in"
msgstr "å½?è??系人ç?»å½?æ?¶å¼¹å?ºé??ç?¥"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs out"
msgstr "å½?è??系人注é??æ?¶å¼¹å?ºé??ç?¥"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Show avatars"
msgstr "æ?¾ç¤ºå¤´å??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show contact list in rooms"
msgstr "å?¨è??天室æ?¾ç¤ºè??系人å??表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show hint about closing the main window"
msgstr "å?³é?主çª?å?£æ?¶æ?¾ç¤ºæ??示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show offline contacts"
msgstr "æ?¾ç¤ºç¦»çº¿è??系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show protocols"
msgstr "æ?¾ç¤ºå??è®®"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Spell checking languages"
msgstr "æ?¼å??æ£?æ?¥å?¨è¯è¨?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "The default folder to save file transfers in."
msgstr "ä¿?å?ä¼ é??æ??件ç??é»?认æ??件夹ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The last directory that an avatar image was chosen from."
msgstr "ä¸?次é??å??头å??å?¾ç??ç??ç?®å½?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The position for the chat window side pane"
msgstr "è??天çª?å?£è¾¹æ ?ç??ä½?ç½®"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "è??天çª?å?£è¾¹æ ?ä¿?å?ç??ä½?ç½®(å??ç´ )ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The theme that is used to display the conversation in chat windows."
msgstr "ç?¨äº?å?¨è??天çª?å?£ä¸æ?¾ç¤ºä¼?è¯?ç??主é¢?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Use graphical smileys"
msgstr "使ç?¨è¡¨æ??å?¾æ ?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use notification sounds"
msgstr "使ç?¨é??ç?¥å£°é?³"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use theme for chat rooms"
msgstr "为è??天室使ç?¨ä¸»é¢?"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "æ?¯å?¦å??许 Empathy å°?ç?¨æ?·ç??ä½?ç½®å?±äº«ç»?è??系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "æ?¯å?¦å??许 Empathy é??è¿? GPS 估计ä½?ç½®"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "æ?¯å?¦å??许 Empathy é??è¿?æ??æ?ºç½?ç»?估计ä½?ç½®"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the network to guess the location."
msgstr "æ?¯å?¦å??许 Empathy é??è¿?ç½?ç»?估计ä½?ç½®"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?ä¸å¯¼å?¥è´¦æ?·ã??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy æ?¯å?¦å·²ç»?è¿?移è?³ telepathy-butterfly æ?¥å¿?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy æ?¯å?¦å?¨å?¯å?¨æ?¶è?ªå?¨ç?»å?¥æ?¨ç??è´¦æ?·ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
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
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "æ?¯å?¦å?ºäº?é??ç§?å??å? é??ä½? Empathy ä½?置信æ?¯ç??å??确度ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "æ?¯å?¦ä½¿ç?¨è??系人ç??头å??ä½?为è??天çª?å?£ç??å?¾æ ?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit å¼?å??å·¥å?·ï¼?ä¾?å¦? Web Inspector æ?¯å?¦åº?该å?¯ç?¨ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?å¼?è¿?æ?¥æ??é??æ?°è¿?æ?¥ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "æ?¯å?¦å¯¹æ?¨æ?³è¦?ä½?æ?¼å??æ£?æ?¥ç??å??è¯?ä½?æ?¼å??æ£?æ?¥ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对è¯?æ?¶æ?¯å?¦å°?表æ??符å?·è½¬æ?¢ä¸ºè¡¨æ??å?¾æ ?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "æ?¯å?¦é??è¦?è??系人ä¸?线æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of events."
msgstr "æ?¯å?¦é??è¦?äº?件æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of incoming messages."
msgstr "æ?¯å?¦é??è¦?æ¶?æ?¯å?°è¾¾æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of new conversations."
msgstr "æ?¯å?¦é??è¦?æ?°ä¼?è¯?æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "æ?¯å?¦ä¸ºå¤?å?ºæ¶?æ?¯ä½¿ç?¨å£°é?³æ??示ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound when logging into a network."
msgstr "å½?è??ç½?ç?»å½?æ?¶æ?¯å?¦æ?æ?¾æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound when logging out of a network."
msgstr "å½?ç½?ç»?æ?å¼?æ?¶æ?¯å?¦æ?æ?¾æ??示é?³ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play sound notifications when away or busy."
msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦ä½¿ç?¨å£°é?³æ??示ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "å½?è??系人离线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to show a popup notification when a contact goes online."
msgstr "å½?è??系人ä¸?线æ?¶æ?¯å?¦æ?¾ç¤ºå¼¹å?ºé??ç?¥"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "å¦?æ??è??天çª?å?£å·²å¼?å?¯ï¼?ä½?ä¸?æ?¯å½?å??çª?å?£ï¼?æ?¥æ?¶æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ??示ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when receiving a new message."
msgstr "å½?æ?¶å?°æ?°æ¶?æ?¯æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸æ?¾ç¤ºå¤´å??ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show contacts that are offline in the contact list."
msgstr "æ?¯å?¦æ?¾ç¤ºè??系人æ¸?å??ä¸ç¦»çº¿ç??è??系人ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show popup notifications when away or busy."
msgstr "å½?离å¼?æ??å¿?ç¢?æ?¶æ?¯å?¦å¼¹å?ºæ?¾ç¤ºæ??示æ¡?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show protocols for contacts in the contact list."
msgstr "æ?¯å?¦å?¨è??系人å??表å??è??天çª?å?£ä¸æ?¾ç¤ºå??è®®ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show the contact list in chat rooms."
msgstr "æ?¯å?¦å?¨è??天室æ?¾ç¤ºè??系人å??表ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show the contact list in compact mode."
msgstr "æ?¯å?¦ä»¥ç´§å??模å¼?æ?¾ç¤ºè??系人å??表ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "å½?使ç?¨æ ?é¢?æ ?ä¸ç??â??Xâ??æ??é?®å?³é?主çª?å?£æ?¶æ?¯å?¦æ?¾ç¤ºæ??示对è¯?æ¡?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to use the theme for chat rooms."
msgstr "æ?¯å?¦å¯¹è??天室使ç?¨ä¸»é¢?ã??"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -443,23 +436,23 @@ msgstr "管ç??æ¶?æ?¯å?? VoIP å¸?æ?·"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
msgid "Messaging and VoIP Accounts"
msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·"
-#: ../libempathy/empathy-ft-handler.c:851
+#: ../libempathy/empathy-ft-handler.c:830
msgid "The hash of the received file and the sent one do not match"
msgstr "æ?¥æ?¶å?°ç??æ??件å??å??é??ç??é?£ä¸ªæ??件å??å¸?å?¼ä¸?å?¹é??"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1122
msgid "File transfer not supported by remote contact"
msgstr "æ??ä»¶ä¼ è¾?ä¸?æ?¯æ??è¿?ç¨?è¿?æ?¥"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1178
msgid "The selected file is not a regular file"
msgstr "æ??é??æ??件æ?¯é??æ£å¸¸ç??æ??件"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1187
msgid "The selected file is empty"
msgstr "æ??é??æ??件æ?¯ç©ºç??"
@@ -515,9 +508,9 @@ msgstr "é??身"
msgid "Offline"
msgstr "离线"
-#: ../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
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
msgid "Unknown"
msgstr "��"
@@ -631,16 +624,20 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "æ??å?¡å?¨è¯?书ç??é?¿åº¦â??â??æ??æ??å?¡å?¨è¯?书é?¾ç??深度â??â??è¶?å?ºäº?å? å¯?åº?ç??硬æ?§é??å?¶"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "é??è¿?ç??人"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
msgid "Yahoo! Japan"
msgstr "Yahoo! ��"
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:578
msgid "Facebook Chat"
msgstr "Facebook è??天"
@@ -688,67 +685,81 @@ msgstr "å°?æ?¥"
msgid "All"
msgstr "��"
-#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-account-widget.c:617
#: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "账�"
-#: ../libempathy-gtk/empathy-account-widget.c:515
+#: ../libempathy-gtk/empathy-account-widget.c:618
msgid "Password"
msgstr "å¯?ç ?"
-#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-account-widget.c:619
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "æ??å?¡å?¨"
-#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-account-widget.c:620
#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:749
#, c-format
msgid "%s:"
msgstr "%sï¼?"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1074
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s è´¦æ?·é??è¿?æ??ç??ç½?ç»?è´¦æ?·è¿?è¡?äº?ç¼?è¾?ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1080
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s è´¦æ?·æ? æ³?å?¨ Empathy ä¸ç¼?è¾?ã??"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1100
+msgid "Launch My Web Accounts"
+msgstr "å?¯å?¨æ??ç??ç½?ç»?è´¦æ?·"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1398
msgid "Username:"
msgstr "ç?¨æ?·å??ï¼?"
-#: ../libempathy-gtk/empathy-account-widget.c:1521
+#: ../libempathy-gtk/empathy-account-widget.c:1733
msgid "A_pply"
msgstr "��(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1551
+#: ../libempathy-gtk/empathy-account-widget.c:1763
msgid "L_og in"
msgstr "��(_O)"
#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-account-widget.c:1829
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1400
#: ../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:1628
+#: ../libempathy-gtk/empathy-account-widget.c:1840
msgid "_Enabled"
msgstr "已��(_E)"
-#: ../libempathy-gtk/empathy-account-widget.c:1693
+#: ../libempathy-gtk/empathy-account-widget.c:1905
msgid "This account already exists on the server"
msgstr "æ??å?¡å?¨ä¸?å·²å?å?¨è¯¥è´¦æ?·"
-#: ../libempathy-gtk/empathy-account-widget.c:1696
+#: ../libempathy-gtk/empathy-account-widget.c:1908
msgid "Create a new account on the server"
msgstr "å?¨æ??å?¡å?¨ä¸?å??建æ?°ç??å¸?æ?·"
-#: ../libempathy-gtk/empathy-account-widget.c:1789
+#: ../libempathy-gtk/empathy-account-widget.c:2022
msgid "Ca_ncel"
msgstr "å??æ¶?(_N)"
@@ -757,19 +768,19 @@ msgstr "å??æ¶?(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2077
+#: ../libempathy-gtk/empathy-account-widget.c:2314
#, 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:2103
+#: ../libempathy-gtk/empathy-account-widget.c:2340
#, c-format
msgid "%s Account"
msgstr "%s 账�"
-#: ../libempathy-gtk/empathy-account-widget.c:2107
+#: ../libempathy-gtk/empathy-account-widget.c:2344
msgid "New account"
msgstr "�建账�"
@@ -1177,51 +1188,51 @@ msgstr "æ??æ??æ??件"
msgid "Click to enlarge"
msgstr "å??å?»ä»¥æ?¾å¤§"
-#: ../libempathy-gtk/empathy-chat.c:642
+#: ../libempathy-gtk/empathy-chat.c:644
msgid "Failed to open private chat"
msgstr "建��人对�失败"
-#: ../libempathy-gtk/empathy-chat.c:682
+#: ../libempathy-gtk/empathy-chat.c:684
msgid "Topic not supported on this conversation"
msgstr "ä¸?æ?¯æ??å?¨æ¤ä¼?è¯?ä¸?设置主é¢?"
-#: ../libempathy-gtk/empathy-chat.c:688
+#: ../libempathy-gtk/empathy-chat.c:690
msgid "You are not allowed to change the topic"
msgstr "�����主�"
-#: ../libempathy-gtk/empathy-chat.c:822
+#: ../libempathy-gtk/empathy-chat.c:824
msgid "/clear: clear all messages from the current conversation"
msgstr "/clearï¼?æ¸?空å½?å??ä¼?è¯?ç??æ??æ??æ¶?æ?¯"
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:827
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主é¢?>ï¼?设å®?å½?å??对è¯?ç??主é¢?"
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:830
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:833
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <è??天室å??>ï¼?å? å?¥ä¸?个æ?°ç??è??天室"
-#: ../libempathy-gtk/empathy-chat.c:836
+#: ../libempathy-gtk/empathy-chat.c:838
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <æ?µç§°> [<æ¶?æ?¯>]ï¼?æ??å¼?ä¸?个ç§?人è??天"
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:841
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <æ?µç§°> <æ¶?æ?¯>ï¼?æ??å¼?ä¸?个ç§?人è??天"
-#: ../libempathy-gtk/empathy-chat.c:843
+#: ../libempathy-gtk/empathy-chat.c:845
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <æ?µç§°>ï¼?å?¨å½?å??æ??å?¡å?¨ä¸?æ?¹å??æ?¨ç??æ?µç§°"
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:848
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <å?¨ä½?æ¶?æ?¯>ï¼?å??å½?å??对è¯?ä¸å??é??ä¸?个å?¨ä½?æ¶?æ?¯"
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:851
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 "
@@ -1230,91 +1241,105 @@ msgstr ""
"/say <æ¶?æ?¯>ï¼?å??é?? <æ¶?æ?¯> å?°å½?å??对è¯?ã??è¿?æ?¯ç?¨æ?¥å??é??ä¸?个â??/â??å¼?å§?ç??ä¿¡æ?¯ã??ä¾?å¦?ï¼?â??/"
"say /join æ?¯ç?¨æ?¥å? å?¥ä¸?个æ?°ç??è??天室â??"
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:856
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<å?½ä»¤>]ï¼?æ?¾ç¤ºæ??æ??æ?¯æ??ç??å?½ä»¤ã??å¦?æ?? <å?½ä»¤> æ?¯æ??å®?ä¹?ç??ï¼?å??æ?¾ç¤ºå®?ç??ç?¨æ³?ã??"
-#: ../libempathy-gtk/empathy-chat.c:864
+#: ../libempathy-gtk/empathy-chat.c:866
#, c-format
msgid "Usage: %s"
msgstr "���%s"
-#: ../libempathy-gtk/empathy-chat.c:893
+#: ../libempathy-gtk/empathy-chat.c:895
msgid "Unknown command"
msgstr "���令"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1016
msgid "Unknown command; see /help for the available commands"
msgstr "æ?ªç?¥å?½ä»¤ï¼?请使ç?¨ /help æ?¥é??å?¯ç?¨å?½ä»¤"
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1154
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1157
msgid "invalid contact"
msgstr "æ? æ??è??系人"
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1160
msgid "permission denied"
msgstr "æ??é??ä¸?足"
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1163
msgid "too long message"
msgstr "��太�"
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1166
msgid "not implemented"
msgstr "����"
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1170
msgid "unknown"
msgstr "��"
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1174
#, c-format
msgid "Error sending message '%s': %s"
msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:705
msgid "Topic:"
msgstr "���"
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1296
#, c-format
msgid "Topic set to: %s"
msgstr "��被设置为�%s"
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1298
msgid "No topic defined"
msgstr "�设置��"
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1831
msgid "(No Suggestions)"
msgstr "(没æ??建议)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1899
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr ""
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:1936
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1995
msgid "Insert Smiley"
msgstr "æ??å?¥è¡¨æ??"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-chat.c:2013
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
msgid "_Send"
msgstr "å??é??(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1881
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2048
msgid "_Spelling Suggestions"
msgstr "æ?¼å??建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1958
+#: ../libempathy-gtk/empathy-chat.c:2136
msgid "Failed to retrieve recent logs"
msgstr "è?·å??æ??è¿?æ?¥å¿?失败"
-#: ../libempathy-gtk/empathy-chat.c:2064
+#: ../libempathy-gtk/empathy-chat.c:2242
#, c-format
msgid "%s has disconnected"
msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -1322,12 +1347,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:2071
+#: ../libempathy-gtk/empathy-chat.c:2249
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢�"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2252
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢�"
@@ -1335,17 +1360,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:2082
+#: ../libempathy-gtk/empathy-chat.c:2260
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s ç¦?æ¢"
-#: ../libempathy-gtk/empathy-chat.c:2085
+#: ../libempathy-gtk/empathy-chat.c:2263
#, c-format
msgid "%s was banned"
msgstr "%s 被ç¦?æ¢"
-#: ../libempathy-gtk/empathy-chat.c:2089
+#: ../libempathy-gtk/empathy-chat.c:2267
#, c-format
msgid "%s has left the room"
msgstr "%s 离å¼?äº?è??天室"
@@ -1355,46 +1380,46 @@ msgstr "%s 离å¼?äº?è??天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2098
+#: ../libempathy-gtk/empathy-chat.c:2276
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2123
+#: ../libempathy-gtk/empathy-chat.c:2301
#, c-format
msgid "%s has joined the room"
msgstr "%s å? å?¥äº?è??天室"
-#: ../libempathy-gtk/empathy-chat.c:2148
+#: ../libempathy-gtk/empathy-chat.c:2326
#, c-format
msgid "%s is now known as %s"
msgstr "%s ç?°å?¨å?«å?? %s"
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2465 ../src/empathy-call-window.c:1938
msgid "Disconnected"
msgstr "å·²æ?å¼?è¿?æ?¥"
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:3088
msgid "Wrong password; please try again:"
msgstr "å¯?ç ?é??误ï¼?请é??è¯?ï¼?"
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:3089
msgid "Retry"
msgstr "é??è¯?"
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:3094
msgid "This room is protected by a password:"
msgstr "è¿?个æ?¿é?´æ?¯ç?±ä¸?个å¯?ç ?ä¿?æ?¤ç??ï¼?"
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:3095
msgid "Join"
msgstr "å? å?¥"
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3235
msgid "Connected"
msgstr "已��"
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3288
#: ../libempathy-gtk/empathy-log-window.c:653
msgid "Conversation"
msgstr "对�"
@@ -1417,17 +1442,17 @@ msgstr "æ??å¼?é?¾æ?¥(_O)"
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
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "ç¼?è¾?è??系人信æ?¯"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
msgid "Personal Information"
msgstr "个人信�"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:110
msgid "New Contact"
msgstr "æ?°å»ºè??系人"
@@ -1448,100 +1473,100 @@ msgid "Favorite People"
msgstr "æ?¶è??夹"
#: ../libempathy-gtk/empathy-contact-list-view.c:2004
-#: ../libempathy-gtk/empathy-individual-view.c:2232
+#: ../libempathy-gtk/empathy-individual-view.c:2206
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2006
-#: ../libempathy-gtk/empathy-individual-view.c:2235
+#: ../libempathy-gtk/empathy-individual-view.c:2209
msgid "Removing group"
msgstr "å? é?¤ç¾¤ç»?"
#. Remove
#: ../libempathy-gtk/empathy-contact-list-view.c:2055
#: ../libempathy-gtk/empathy-contact-list-view.c:2132
-#: ../libempathy-gtk/empathy-individual-view.c:2289
-#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../libempathy-gtk/empathy-individual-view.c:2263
+#: ../libempathy-gtk/empathy-individual-view.c:2377
#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Remove"
msgstr "å? é?¤(_R)"
#: ../libempathy-gtk/empathy-contact-list-view.c:2085
-#: ../libempathy-gtk/empathy-individual-view.c:2320
+#: ../libempathy-gtk/empathy-individual-view.c:2294
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??系人â??%sâ??å??ï¼?"
#: ../libempathy-gtk/empathy-contact-list-view.c:2087
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-individual-view.c:2296
msgid "Removing contact"
msgstr "å? é?¤è??系人"
#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contactâ?¦"
msgstr "æ·»å? è??系人(_A)..."
#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:15
msgid "_Chat"
msgstr "è??天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-contact-menu.c:261
+#: ../libempathy-gtk/empathy-individual-menu.c:559
msgctxt "menu item"
msgid "_Audio Call"
msgstr "����(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-contact-menu.c:292
+#: ../libempathy-gtk/empathy-individual-menu.c:601
msgctxt "menu item"
msgid "_Video Call"
msgstr "����(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
-#: ../src/empathy-main-window.ui.h:25
+#: ../libempathy-gtk/empathy-contact-menu.c:333
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:26
msgid "_Previous Conversations"
msgstr "æ??è¿?ä¼?è¯?(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-contact-menu.c:355
+#: ../libempathy-gtk/empathy-individual-menu.c:685
msgid "Send File"
msgstr "å??é??æ??件"
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:727
msgid "Share My Desktop"
msgstr "å?±äº«æ??ç??æ¡?é?¢"
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:418
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1291
msgid "Favorite"
msgstr "æ?¶è??"
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:447
+#: ../libempathy-gtk/empathy-individual-menu.c:788
msgid "Infor_mation"
msgstr "ä¿¡æ?¯(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:493
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:969
+#: ../src/empathy-chat-window.c:917
msgid "Inviting you to this room"
msgstr "é??请å?°æ¤è??天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:578
+#: ../libempathy-gtk/empathy-individual-menu.c:1016
msgid "_Invite to Chat Room"
msgstr "é??请å?°è??天室(_I)"
@@ -1549,178 +1574,178 @@ msgstr "é??请å?°è??天室(_I)"
msgid "Select a contact"
msgstr "é??æ?©ä¸?个è??ç³»"
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
msgid "Full name:"
msgstr "�称�"
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
msgid "Phone number:"
msgstr "ç?µè¯?å?·ç ?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
msgid "E-mail address:"
msgstr "ç?µå?é?®ä»¶å?°å??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
msgid "Website:"
msgstr "ç½?ç«?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
msgid "Birthday:"
msgstr "ç??æ?¥ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Country ISO Code:"
msgstr "å??æ?¬ ISO ç¼?ç ?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country:"
msgstr "�家�"
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "State:"
msgstr "ç??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "City:"
msgstr "å??å¸?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Area:"
msgstr "���"
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Postal Code:"
msgstr "é?®æ?¿ç¼?ç ?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Street:"
msgstr "è¡?é??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Building:"
msgstr "建ç?ç?©ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Floor:"
msgstr "楼��"
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Room:"
msgstr "æ?¿é?´ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Text:"
msgstr "æ??æ?¬ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Description:"
msgstr "æ??è¿°ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "URI:"
msgstr "URIï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Accuracy Level:"
msgstr "å??ç¡®ç¨?度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Error:"
msgstr "é??误ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Vertical Error (meters):"
msgstr "å??ç?´è¯¯å·®(ç±³)ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Horizontal Error (meters):"
msgstr "水平误差(米)�"
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Speed:"
msgstr "é??度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Bearing:"
msgstr "æ?¹ä½?æ??å??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Climb Speed:"
msgstr "ç?¬å??é??度ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Last Updated on:"
msgstr "æ??è¿?æ?´æ?°äº?ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Longitude:"
msgstr "�度�"
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Latitude:"
msgstr "纬度�"
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Altitude:"
msgstr "æµ·æ??ï¼?"
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "ä½?ç½®"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y � %R UTC ��"
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
msgid "Save Avatar"
msgstr "ä¿?å?头å??"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
msgid "Unable to save avatar"
msgstr "æ? æ³?ä¿?å?头å??"
@@ -1730,7 +1755,7 @@ msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
msgid "Alias:"
msgstr "å?«å??ï¼?"
@@ -1750,7 +1775,7 @@ msgstr "è??系人详æ??"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1430
msgid "Identifier:"
msgstr "æ ?è¯?符ï¼?"
@@ -1781,18 +1806,18 @@ msgstr "é??æ?©æ?¨æ?³å°?该è??系人å? å?¥ç??群ç»?ã??注æ??æ?¨å?¯ä»¥é??æ?©å¤?个
msgid "_Add Group"
msgstr "æ·»å? 群ç»?(_A)"
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "é??æ?©"
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1261
msgid "Group"
msgstr "群�"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
msgid "Linked Contacts"
msgstr "å·²ç»?å®?ç??è??系人"
@@ -1816,19 +1841,19 @@ msgstr "å?¨å·¦ä¾§å??表ä¸é??ä¸ç??è??系人å°?被ç»?å®?å?¨ä¸?èµ·ã??"
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:836
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:862
msgctxt "Link individual (contextual menu)"
msgid "_Link Contactsâ?¦"
msgstr "ç»?å®?è??系人(_L)â?¦"
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1568
#, c-format
msgid "Meta-contact containing %u contact"
msgid_plural "Meta-contact containing %u contacts"
@@ -1846,6 +1871,11 @@ msgstr "�建��"
msgid "Choose an IRC network"
msgstr "é??æ?©ä¸?个 IRC ç½?ç»?"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "é??æ?©"
+
#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
msgid "new server"
msgstr "æ?°å»ºæ??å?¡å?¨"
@@ -1857,16 +1887,16 @@ msgstr "SSL"
#. 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
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
msgid "Link Contacts"
msgstr "ç»?å®?è??系人"
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
msgctxt "Unlink individual (button)"
msgid "_Unlinkâ?¦"
msgstr "解���(_U)�"
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
msgid ""
"Completely split the displayed meta-contact into the contacts it contains."
msgstr "å°?æ?¾ç¤ºç??å??è??系人æ??å??å?«ç??è??系人å®?å?¨å??å¼?ã??"
@@ -1875,22 +1905,22 @@ msgstr "å°?æ?¾ç¤ºç??å??è??系人æ??å??å?«ç??è??系人å®?å?¨å??å¼?ã??"
#. 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
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
msgid "_Link"
msgstr "ç»?å®?(_L)"
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
#, c-format
msgid "Unlink meta-contact '%s'?"
msgstr "解é?¤ç»?å®?å??è??系人 '%s'?"
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
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
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解���(_U)"
@@ -1963,37 +1993,46 @@ msgstr "æ?°å»ºé??è¯?"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
msgid "Custom Messageâ?¦"
msgstr "�����..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
msgid "Edit Custom Messagesâ?¦"
msgstr "�������"
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
msgid "Click to remove this status as a favorite"
msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
msgid "Click to make this status a favorite"
msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
msgid "Set status"
msgstr "设置ç?¶æ??"
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
msgid "Set your presence and current status"
msgstr "è®¾ç½®ä½ ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
msgid "Custom messagesâ?¦"
msgstr "�����..."
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "�建 %s 账�"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "���"
@@ -2079,84 +2118,85 @@ msgid "Blue"
msgstr "è??è?²"
#: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
-msgstr "è??天æ??å?¡å?¨æ??æ??ä¾?ç??身份æ? æ³?éª?è¯?ã??\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "è??天æ??å?¡å?¨æ??æ??ä¾?ç??身份æ? æ³?éª?è¯?ã??"
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
-msgstr "è¯?书并é??ç?± CA ç¾å??"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+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:161
+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:164
+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:167
+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:170
+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:174
+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 "è¯?书被è¯?书ç¾å??æ?ºæ??å??é??"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "è¯?书被è¯?书ç¾å??æ?ºæ??å??é??ã??"
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
-msgstr "è¯?书æ?¯å¼±å? å¯?ç??"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+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:184
+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:188
+msgid "The certificate is malformed."
+msgstr "è¯?书æ??å??ã??"
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Expected hostname: %s"
msgstr "é¢?æ??主æ?ºå??: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
#, c-format
msgid "Certificate hostname: %s"
msgstr "è¯?书主æ?ºå??: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
msgid "Continue"
msgstr "继ç»"
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "è¿?æ?¥ä¸?å??ä¿¡ä»»ã??æ?¯å?¦ä»?è¦?继ç»?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
msgid "Remember this choice for future connections"
msgstr "为å°?æ?¥ç??è¿?æ?¥è®°ä½?æ?¬æ¬¡é??æ?©"
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
msgid "Certificate Details"
msgstr "è¯?书详æ??"
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
msgid "Unable to open URI"
msgstr "æ? æ³?æ??å¼? URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
msgid "Select a file"
msgstr "é??æ?©æ??件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
#, c-format
msgid "Incoming file from %s"
msgstr "ä»? %s ä¼ æ?¥ç??æ??件"
@@ -2344,19 +2384,35 @@ msgstr "æ? é??误信æ?¯"
msgid "Instant Message (Empathy)"
msgstr "����(Empathy)"
-#: ../src/empathy.c:414
+#: ../src/empathy.c:420
+msgid "Error contacting the Account Manager"
+msgstr "è??系账æ?·ç®¡ç??å?¨å?ºé??"
+
+#: ../src/empathy.c:422
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"å?¨è¯?å?¾è¿?æ?¥å?° Telepathy è´¦æ?·ç®¡ç??å?¨æ?¶å?ºé??ã??é??误æ?¯ï¼?\n"
+"\n"
+"%s"
+
+#: ../src/empathy.c:649
msgid "Don't connect on startup"
msgstr "��������"
-#: ../src/empathy.c:418
+#: ../src/empathy.c:653
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??系人å??表"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:670
msgid "- Empathy IM Client"
msgstr " - Empathy IM 客�端"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -2366,7 +2422,7 @@ msgstr ""
"Empathy æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?ä¸?é??æ?°å??å¸?"
"æ??ä¿®æ?¹å®?ï¼?许å?¯è¯?å?¯ä½¿ç?¨ç¬¬äº?ç??æ??æ?¨æ?³é??æ?©ç??æ?´æ?°ç??ç??æ?¬ã??"
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
msgid ""
"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2376,7 +2432,7 @@ msgstr ""
"Empathy å??å¸?ç??ç?®ç??æ?¯å¸?æ??å®?对æ?¨æ??ç?¨ï¼?ä½?æ?¯æ²¡æ??ä»»ä½?æ??ä¿?ï¼?å?³ä½¿æ?¯å¯¹å??ä¸?åº?ç?¨ä»¥å??å?¶"
"å®?ç?¹å®?ç?®ç??ã??æ?¥é?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?以è?·å??æ?´å¤?ç»?è??ã??"
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
msgid ""
"You should have received a copy of the GNU General Public License along with "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2386,11 +2442,11 @@ msgstr ""
"ç»?è?ªç?±è½¯ä»¶å?ºé??ä¼?å??ä¿¡ã??å?°å??æ?¯ï¼?51 Franklin Street, Fifth Floor, Boston, MA "
"02110-130159 USA"
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
msgid "An Instant Messaging client for GNOME"
msgstr "�个 GNOME ����客�端"
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
msgid "translator-credits"
msgstr ""
"Abel Cheung <maddog linux org hk>, 2003\n"
@@ -2443,45 +2499,35 @@ msgstr ""
"æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??ä¸å? å?¥è´¦æ?·ã??"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
msgid "An error occurred"
msgstr "å??ç??é??误"
-#. To translator: %s is the protocol name
-#. Create account
-#. 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:614
-#, c-format
-msgid "New %s account"
-msgstr "�建 %s 账�"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
msgid "What kind of chat account do you have?"
msgstr "æ?¨å·²ç»?æ?¥æ??å?ªä¸ªç±»å??ç??å¸?æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
msgid "Do you have any other chat accounts you want to set up?"
msgstr "æ?¨è¿?è¦?设置å?¶å®?è??天账æ?·å??ï¼?"
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
msgid "Enter your account details"
msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
msgid "What kind of chat account do you want to create?"
msgstr "æ?¨æ?³å??建é?£ç§?ç±»å??ç??å¸?æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
msgid "Do you want to create other chat accounts?"
msgstr "æ?¨æ?³è¦?å??建å?¶å®?ç??è??天账æ?·å??ã??"
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
msgid "Enter the details for the new account"
msgstr "è¾?å?¥æ?°è´¦æ?·ç??详ç»?èµ?æ??"
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
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 "
@@ -2492,41 +2538,41 @@ msgstr ""
"Live å??许å¤?å?¶å®?è??天软件ç??æ??å??å??å??äº?è??天ã??使ç?¨éº¦å??é£?æ??æ??å??头ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
"å??è§?é¢?é??è¯?ã??"
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
msgid "Do you have an account you've been using with another chat program?"
msgstr "æ?¨æ??没æ??å?¶å®?è??天软件ç??è´¦æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
msgid "Yes, import my account details from "
msgstr "æ??ï¼?请导å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
msgid "Yes, I'll enter my account details now"
msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
msgid "No, I want a new account"
msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?个æ?°ç??è´¦æ?·"
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
msgid "No, I just want to see people online nearby for now"
msgstr "没æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
msgid "Select the accounts you want to import:"
msgstr "é??æ?©æ?¨è¦?导å?¥ç??è´¦æ?·ï¼?"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
#: ../src/empathy-new-chatroom-dialog.c:609
#: ../src/empathy-new-chatroom-dialog.c:610
msgid "Yes"
msgstr "æ?¯"
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
msgid "No, that's all for now"
msgstr "没æ??ï¼?å°±è¿?æ ·å?§"
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1082
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 "
@@ -2537,16 +2583,16 @@ msgstr ""
"æ?³ä½¿ç?¨è¿?个å??è?½ï¼?请ä»?ç»?æ?¥ç??ä¸?å??ä¿¡æ?¯æ?¯å?¦æ£ç¡®ã??æ?¨ä¹?å??ä¹?å?¯ä»¥é??è¿?â??è´¦æ?·â??对è¯?æ¡?è½»æ?¾"
"ç??ä¿®æ?¹è¿?äº?ä¿¡æ?¯æ??å?³é?è¿?个å??è?½"
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
msgid "Edit->Accounts"
msgstr "��->账�"
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
msgid "I don't want to enable this feature for now"
msgstr "æ??ä¸?å?¯ç?¨æ¤ç?¹æ?§"
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1140
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 "
@@ -2557,87 +2603,87 @@ msgstr ""
"ç?¨è¯¥å??è?½ï¼?请å®?è£? telepathy-salut å??ï¼?并ä¸?å?¨è´¦æ?·å¯¹è¯?æ¡?ä¸å??建é??è¿?ç??人(People "
"Nearby)账�"
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
msgid "telepathy-salut not installed"
msgstr "telepathy-salut ���"
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
msgid "Messaging and VoIP Accounts Assistant"
msgstr "æ¶?æ?¯å?? VoIP å¸?æ?·å?©æ??"
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
msgid "Welcome to Empathy"
msgstr "欢�使� Empathy"
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
msgid "Import your existing accounts"
msgstr "导å?¥ç?°æ??å¸?æ?·"
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
msgid "Please enter personal details"
msgstr "请��个人信�"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å?ç??ä¿®æ?¹ã??"
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
msgid "Your new account has not been saved yet."
msgstr "æ?¨ç??æ?°å¸?æ?·è¿?没æ??ä¿?å?ã??"
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
msgid "Connectingâ?¦"
msgstr "æ£å?¨è¿?æ?¥..."
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
#, c-format
msgid "Offline â?? %s"
msgstr "离线 - %s"
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
#, c-format
msgid "Disconnected â?? %s"
msgstr "å·²æ?å¼? - %s"
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
msgid "Offline â?? No Network Connection"
msgstr "离线 - æ? å?¯ç?¨ç½?ç»?"
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
msgid "Unknown Status"
msgstr "æ?ªç?¥ç?¶æ??"
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
msgid "Offline â?? Account Disabled"
msgstr "离线 - ��被��"
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
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:1158
+#: ../src/empathy-accounts-dialog.c:1106
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "æ?¨è¦?ä»?ç?µè??ä¸ç§»é?¤ %s å??ï¼?"
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
msgid "This will not remove your account on the server."
msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
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:2003
+#: ../src/empathy-accounts-dialog.c:1951
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2681,11 +2727,11 @@ msgstr "Empathy 认�客�端"
msgid "People nearby"
msgstr "é??è¿?ç??人"
-#: ../src/empathy-av.c:133
+#: ../src/empathy-av.c:122
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy è¯é?³/è§?é¢?客æ?·ç«¯"
-#: ../src/empathy-av.c:149
+#: ../src/empathy-av.c:138
msgid "Empathy Audio/Video Client"
msgstr "Empathy è¯é?³/è§?é¢?客æ?·ç«¯"
@@ -2705,105 +2751,105 @@ msgstr "伽马"
msgid "Volume"
msgstr "é?³é??"
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
msgid "_Sidebar"
msgstr "侧边æ ?(_S)"
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
msgid "Audio input"
msgstr "����"
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
msgid "Video input"
msgstr "����"
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
msgid "Dialpad"
msgstr "ç?µè¯?é?®ç??"
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
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:1273
+#: ../src/empathy-call-window.c:1266
#, 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:1352
+#: ../src/empathy-call-window.c:1345
msgid "Call"
msgstr "é??è¯?"
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
msgid "The IP address as seen by the machine"
msgstr "æ?ºå?¨æ??è§?ç?? IP å?°å??"
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet ä¸?æ??å?¡å?¨æ??è§?ç?? IP å?°å??"
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
msgid "The IP address of the peer as seen by the other side"
msgstr "å?¦ä¸?æ?¹æ??è§?ç?? IP å?°å??"
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
msgid "The IP address of a relay server"
msgstr "ä¸è½¬æ??å?¡å?¨ IP å?°å??"
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
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:2247
+#: ../src/empathy-call-window.c:2254
#, c-format
msgid "Connected â?? %d:%02dm"
msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
msgid "Technical Details"
msgstr "æ??æ?¯ç»?è??"
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
#, 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:2351
+#: ../src/empathy-call-window.c:2358
#, 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:2357
+#: ../src/empathy-call-window.c:2364
#, 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:2363
+#: ../src/empathy-call-window.c:2370
msgid "There was a failure on the network"
msgstr "ç½?ç»?å?ºç?°ä¸?个é??误"
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "å?¼å?«æ??é??è¦?ç??é?³é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "å?¼å?«æ??é??è¦?ç??è§?é¢?æ ¼å¼?è¿?没æ??å?¨æ?¨ç??ç?µè??ä¸?å®?è£?"
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2813,19 +2859,19 @@ msgstr ""
"Telepathy ç»?件å?ºç?°äº?ä¸?äº?æ??å¤?ã??请<a href=\"%s\">æ±?æ?¥è¿?个é??误</a>ï¼?并é??ä¸?帮å?©è??"
"å??é??â??è°?è¯?â??çª?å?£æ?¶é??å?°ç??æ?¥å¿?ã??"
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
msgid "There was a failure in the call engine"
msgstr "å?¼å?«å¼?æ??é??å?ºç?°äº?ä¸?个æ??é??"
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
msgid "The end of the stream was reached"
msgstr "å·²å?°è¾¾æµ?ç??æ?«å°¾"
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
msgid "Can't establish audio stream"
msgstr "��建����"
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
msgid "Can't establish video stream"
msgstr "��建����"
@@ -2921,35 +2967,35 @@ msgstr "����"
msgid "_Call"
msgstr "é??è¯?(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
msgid "_View"
msgstr "æ?¥ç??(_V)"
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d �读)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (å?? %u å?¶å®?)"
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d ���读)"
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d ���读)"
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
msgid "Typing a message."
msgstr "è¾?å?¥æ¶?æ?¯ã??"
@@ -2985,7 +3031,7 @@ msgstr "å?³ç§»æ ?ç¾(_R)"
msgid "Notify for All Messages"
msgstr "æ??示æ??æ??æ¶?æ?¯"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
msgid "_Contents"
msgstr "å??容(_C)"
@@ -2997,7 +3043,7 @@ msgstr "对�(_C)"
msgid "_Detach Tab"
msgstr "æ¼?移æ ?ç¾(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
@@ -3005,7 +3051,7 @@ msgstr "ç¼?è¾?(_E)"
msgid "_Favorite Chat Room"
msgstr "æ?¶è??è??天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
msgid "_Help"
msgstr "帮�(_H)"
@@ -3265,43 +3311,43 @@ msgid "Import Accounts"
msgstr "导�账�"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "导�"
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "å??è®®"
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "�"
-#: ../src/empathy-main-window.c:383
+#: ../src/empathy-main-window.c:384
msgid "No match found"
msgstr "没æ??æ?¾å?°å?¹é??项"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:539
msgid "Reconnect"
msgstr "é??æ?°è¿?æ?¥"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:545
msgid "Edit Account"
msgstr "��账�"
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:551
msgid "Close"
msgstr "å?³é?"
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1243
msgid "Contact"
msgstr "è??系人"
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1567
msgid "Contact List"
msgstr "è??系人å??表"
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1677
msgid "Show and edit accounts"
msgstr "æ?¾ç¤ºå??ç¼?è¾?è´¦æ?·"
@@ -3314,74 +3360,80 @@ msgid "Context"
msgstr "ä¸?ä¸?æ??"
#: ../src/empathy-main-window.ui.h:3
+#, fuzzy
+#| msgid "Contact List"
+msgid "Find in Contact _List"
+msgstr "è??系人å??表"
+
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "å? å?¥å·²æ?¶è??ç??è??天室(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管ç??æ?¶è??夹"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "常���(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Callâ?¦"
msgstr "�建��(_C)..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "����(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "é¦?é??项(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "æ?¾ç¤ºå??è®®(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "æ??å§?å??æ??åº?(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "æ??ç?¶æ??æ??åº?(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "账�(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:16
msgid "_Compact Size"
msgstr "ç´§å??è§?å?¾(_C)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:18
msgid "_Debug"
msgstr "��(_D)"
-#: ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-main-window.ui.h:20
msgid "_File Transfers"
msgstr "æ??ä»¶ä¼ è¾?(_F)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:22
msgid "_Joinâ?¦"
msgstr "å? å?¥(_J)..."
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversationâ?¦"
msgstr "�建对�(_N)..."
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window.ui.h:24
msgid "_Offline Contacts"
msgstr "离线è??系人(_O)"
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Personal Information"
msgstr "个人信�(_P)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window.ui.h:27
msgid "_Room"
msgstr "è??天室(_R)"
@@ -3448,39 +3500,39 @@ msgstr "è??天室å??表"
msgid "_Room:"
msgstr "è??天室(_R)ï¼?"
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:139
msgid "Message received"
msgstr "�����"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:140
msgid "Message sent"
msgstr "å??å?ºäº?æ¶?æ?¯"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:141
msgid "New conversation"
msgstr "�对�"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:142
msgid "Contact goes online"
msgstr "离线人�线"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:143
msgid "Contact goes offline"
msgstr "è??系人离线"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:144
msgid "Account connected"
msgstr "账�已��"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:145
msgid "Account disconnected"
msgstr "è´¦æ?·å·²æ?å¼?"
-#: ../src/empathy-preferences.c:445
+#: ../src/empathy-preferences.c:446
msgid "Language"
msgstr "è¯è¨?"
-#: ../src/empathy-preferences.c:882
+#: ../src/empathy-preferences.c:875
msgid "Preferences"
msgstr "é¦?é??项"
@@ -3727,35 +3779,45 @@ msgstr "é??æ?©ä¸?个è??系人以å? å?¥è¯¥ä¼?è¯?ï¼?"
msgid "Invite"
msgstr "é??请"
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:163
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?ï¼?å®?æ??æ??æ??å·¥ä½?ï¼?å¦?导å?¥ï¼?ç?¶å??é??å?º"
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-Salut accounts"
+#: ../src/empathy-accounts.c:167
+#, fuzzy
+#| msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "å¦?æ??æ??ä»»ä½?é?? salut è´¦æ?·ç??è¯?ï¼?ä¸?æ?¾ç¤ºä»»ä½?对è¯?æ¡?"
# lainmeï¼?å??次é??æ?©ç»?å®?ç??è´¦æ?·(æ¯?å¦? gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:171
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "é¦?å??é??æ?©ç»?å®?è´¦æ?·(å¦? gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:173
msgid "<account-id>"
msgstr "<账� ID>"
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:181
msgid "- Empathy Accounts"
msgstr "- Empathy 账�"
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:197
msgid "Empathy Accounts"
msgstr "Empathy 账�"
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:45
msgid "Empathy Debugger"
msgstr "Empathy ���"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已�询�导�账�"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy æ?¯å?¦åº?该已ç»?询é?®è¿?è¦?ä»?å?¶å®?ç¨?åº?ä¸å¯¼å?¥è´¦æ?·ã??"
+
#~ msgid "Use _Yahoo! Japan"
#~ msgstr "使� _Yahoo ��"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
