[PATCH 04/11] Updated Chinese (simplified) translation

From: Rob Bradford <rob linux intel com>
Subject: [PATCH 04/11] Updated Chinese (simplified) translation
Date: Fri, 16 Oct 2009 15:08:44 +0100
Translator: Yun Nie <yun nie ptiglobal net>
Originally-transmitted-via: Transifex (translate.moblin.org)
---
 po/zh_CN.po |  597 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 361 insertions(+), 236 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 70d8f33..408bb37 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 19:26+0800\n"
-"PO-Revision-Date: 2009-07-25 21:28+0000\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"POT-Creation-Date: 2009-10-16 14:31+0100\n"
+"PO-Revision-Date: 2009-10-09 17:06-0800\n"
+"Last-Translator: Yun Nie <yun nie ptiglobal net>\n"
 "Language-Team: Simplified Chinese <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,10 +25,18 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy IM Client"
 msgstr "Empathy IM å®¢æ?·ç«¯"
 
-#: ../data/empathy.desktop.in.in.h:2
+#: ../data/empathy.desktop.in.in.h:3
+msgid "IM Client"
+msgstr "IM å®¢æ?·ç«¯"
+
+#: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
 msgstr "å??é??æ?¥æ?¶å?³æ?¶æ¶?æ?¯"
 
@@ -56,13 +64,13 @@ msgid "Compact contact list"
 msgstr "ç´§å??æ?¾ç¤ºè??ç³»äººå??è¡¨"
 
 #: ../data/empathy.schemas.in.h:6
-#, fuzzy
 msgid "Connection managers should be used"
-msgstr "æ?¯å?¦ä½¿ç?¨ NetworkManager"
+msgstr "åº?è¯¥ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨"
 
 #: ../data/empathy.schemas.in.h:7
+#, fuzzy
 msgid "Contact list sort criterium"
-msgstr "è??ç³»äººå??è¡¨æ??åº?è§?å??"
+msgstr "è??ç³»äººå??è¡¨æ??åº?æ?¡ä»¶"
 
 #: ../data/empathy.schemas.in.h:8
 msgid "Default directory to select an avatar image from"
@@ -134,11 +142,11 @@ msgstr "é??è??ä¸»çª?å?£ã??"
 
 #: ../data/empathy.schemas.in.h:25
 msgid "MC 4 accounts have been imported"
-msgstr ""
+msgstr "MC 4 è´¦æ?·å·²è¢«å¯¼å?¥"
 
 #: ../data/empathy.schemas.in.h:26
 msgid "MC 4 accounts have been imported."
-msgstr ""
+msgstr "MC 4 accounts have been importedã??"
 
 #: ../data/empathy.schemas.in.h:27
 msgid "Nick completed character"
@@ -291,11 +299,10 @@ msgid ""
 msgstr "æ?¯å?¦ä½¿ç?¨è??ç³»äººç??å¤´å??ä½?ä¸ºè??å¤©çª?å?£ç??å?¾æ ?ã??"
 
 #: ../data/empathy.schemas.in.h:62
-#, fuzzy
 msgid ""
 "Whether or not connectivity managers should be used to automatically "
 "disconnect/reconnect."
-msgstr "æ?¯å?¦ä½¿ç?¨ NetworkManager(ç½?ç»?ç®¡ç??å?¨) è?ªå?¨æ?å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
+msgstr "æ?¯å?¦ä½¿ç?¨è¿?æ?¥ç®¡ç??å?¨è?ªå?¨æ?å¼?è¿?æ?¥/é??æ?°è¿?æ?¥ã??"
 
 #: ../data/empathy.schemas.in.h:63
 msgid ""
@@ -405,17 +412,18 @@ msgid "Whether to use the theme for chat rooms or not."
 msgstr "æ?¯å?¦å¯¹è??å¤©å®¤ä½¿ç?¨ä¸»é¢?ã??"
 
 #: ../data/empathy.schemas.in.h:86
+#, fuzzy
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
-"ä½¿ç?¨ä½?ç§?å??å??æ?¥æ??åº?è??ç³»äººå??è¡¨ã??é»?è®¤æ??å?µä¸?ä½¿ç?¨å?¼\"name\"ä»¥æ??è??ç³»äººå§?å??\n"
+"ä½¿ç?¨ä½?ç§?æ?¡ä»¶æ?¥æ??åº?è??ç³»äººå??è¡¨ã??é»?è®¤æ??å?µä¸?ä½¿ç?¨å?¼\"name\"ä»¥æ??è??ç³»äººå§?å??\n"
 "æ??åº?ã??å??å?¼ä¸º\"state\"æ?¶å°?æ??ç?¶æ??æ??åº?è??ç³»äººå??è¡¨ã??"
 
-#: ../libempathy/empathy-account.c:1086
+#: ../libempathy/empathy-account.c:1158
 msgid "Can't set an empty display name"
-msgstr ""
+msgstr "æ? æ³?è®¾ç½®ä¸ºç©ºæ?¾ç¤ºå??ç§°"
 
 #: ../libempathy/empathy-ft-handler.c:839
 msgid "The hash of the received file and the sent one do not match"
@@ -433,7 +441,7 @@ msgstr "æ??é??æ??ä»¶æ?¯é??æ£å¸¸ç??æ??ä»¶"
 msgid "The selected file is empty"
 msgstr "æ??é??æ??ä»¶æ?¯ç©ºç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:288
 msgid "People nearby"
 msgstr "é??è¿?ç??äºº"
 
@@ -489,10 +497,18 @@ msgstr "é??èº«"
 msgid "Offline"
 msgstr "ç¦»çº¿"
 
-#: ../libempathy/empathy-utils.c:378 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "é??è¿?ç??äºº"
 
+#: ../libempathy/empathy-utils.c:385
+msgid "Yahoo! Japan"
+msgstr "Yahoo! æ?¥æ?¬"
+
+#: ../libempathy/empathy-utils.c:386
+msgid "Facebook Chat"
+msgstr "Facebook è??å¤©"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -537,25 +553,38 @@ msgstr "å°?æ?¥"
 msgid "All"
 msgstr "å?¨é?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:448
-#: ../libempathy-gtk/empathy-account-widget.c:504
+#: ../libempathy-gtk/empathy-account-widget.c:433
+#: ../libempathy-gtk/empathy-account-widget.c:489
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1224
+#: ../libempathy-gtk/empathy-account-widget.c:1252
+msgid "L_og in"
+msgstr "ç?»å½?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1302
 msgid "Enabled"
 msgstr "å?¯ç?¨"
 
+#. Â Translators:Â thisÂ isÂ usedÂ onlyÂ whenÂ builtÂ onÂ aÂ moblinÂ platformÂ 
+#: ../libempathy-gtk/empathy-account-widget.c:1308
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-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-aim.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> æ??ç??å±?å¹?å??ç§°</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
@@ -566,7 +595,7 @@ 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:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -579,16 +608,16 @@ msgstr "ç?¨æ?·å??(_N)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 msgid "What is your AIM password?"
-msgstr ""
+msgstr "æ?¨ç?? AIM å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "What is your AIM screen name?"
-msgstr ""
+msgstr "æ?¨ç?? AIM å±?å¹?å??ç§°æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -597,7 +626,7 @@ msgstr "ç«¯å?£(_P)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -607,25 +636,25 @@ msgstr "æ??å?¡å?¨(_S)ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b>ç?¨æ?·å??</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "ç?»å½? I_Dï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 msgid "What is your GroupWise User ID?"
-msgstr ""
+msgstr "æ?¨ç?? GroupWise ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 msgid "What is your GroupWise password?"
-msgstr ""
+msgstr "æ?¨ç?? GroupWise å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b>123456789</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -633,11 +662,11 @@ msgstr "ICQ _UINï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 msgid "What is your ICQ UIN?"
-msgstr ""
+msgstr "æ?¨ç?? ICQ UIN æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
 msgid "What is your ICQ password?"
-msgstr ""
+msgstr "æ?¨ç?? ICQ å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
@@ -681,60 +710,72 @@ msgid "Servers"
 msgstr "æ??å?¡å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> user gmail com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> user jabber org</span>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
 msgstr "è¦?ç??æ??å?¡å?¨è®¾ç½®"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "ä¼?å??çº§(_O)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "èµ?æº?(_U)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Use old SS_L"
 msgstr "ä½¿ç?¨æ?§ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google ID?"
+msgstr "æ?¨ç?? Google ID æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your Google password?"
+msgstr "æ?¨ç?? Google å¯?ç ?æ?¯ä»?ä¹?ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "What is your Jabber ID?"
-msgstr ""
+msgstr "æ?¨ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "What is your Jabber password?"
-msgstr ""
+msgstr "æ?¨ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your desired Jabber ID?"
-msgstr ""
+msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your desired Jabber password?"
-msgstr ""
+msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "é??è¦?å? å¯?(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "å¿½ç?¥ SSL è¯?ä¹¦é??è¯¯(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> user hotmail com</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
 msgid "What is your Windows Live password?"
-msgstr ""
+msgstr "æ?¨ç?? Windows Live å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 msgid "What is your Windows Live user name?"
-msgstr ""
+msgstr "æ?¨ç?? Windows Live ç?¨æ?·å??æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_Email:"
@@ -762,7 +803,7 @@ msgstr "å?¬å¼?ç??å??å?(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr ""
+msgstr "<span size=\"small\"><b>ä¾?å¦?ï¼?</b> user my sip server</span>"
 
 #. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
@@ -779,11 +820,11 @@ msgstr "STUN ç«¯å?£ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "What is your SIP account password?"
-msgstr ""
+msgstr "æ?¨ç?? SIP è´¦æ?·å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "What is your SIP login ID?"
-msgstr ""
+msgstr "æ?¨ç?? SIP ç?»å½? ID æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "_Username:"
@@ -795,11 +836,11 @@ msgstr "ä½¿ç?¨ _Yahoo æ?¥æ?¬"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "What is your Yahoo! ID?"
-msgstr ""
+msgstr "æ?¨ç?? Yahoo ID æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "What is your Yahoo! password?"
-msgstr ""
+msgstr "æ?¨ç?? Yahooï¼?å¯?ç ?æ?¯ä»?ä¹?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Yahoo I_D:"
@@ -822,19 +863,19 @@ msgstr "æ? æ³?è½¬æ?¢å?¾å??"
 msgid "None of the accepted image formats is supported on your system"
 msgstr "æ²¡æ??ä¸?ä¸ªå?¬è®¤ç??å?¾ç??æ ¼å¼?è?½è¢«æ?¨ç??ç³»ç»?æ?¯æ??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:913
 msgid "Select Your Avatar Image"
 msgstr "é??æ?©æ?¨ç??å¤´å??å?¾ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:916
 msgid "No Image"
 msgstr "æ? å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:978
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:982
 msgid "All Files"
 msgstr "æ??æ??æ??ä»¶"
 
@@ -846,67 +887,67 @@ msgstr "å??å?»ä»¥æ?¾å¤§"
 msgid "Failed to reconnect this chat"
 msgstr "é??æ?°è¿?æ?¥å?°å¯¹è¯?å¤±è´¥"
 
-#: ../libempathy-gtk/empathy-chat.c:413
+#: ../libempathy-gtk/empathy-chat.c:403
 msgid "Unsupported command"
 msgstr "ä¸?æ?¯æ??ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:549
+#: ../libempathy-gtk/empathy-chat.c:535
 msgid "offline"
 msgstr "ç¦»çº¿"
 
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:538
 msgid "invalid contact"
 msgstr "æ? æ??è??ç³»äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:541
 msgid "permission denied"
 msgstr "æ??é??ä¸?è¶³"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:544
 msgid "too long message"
 msgstr "æ¶?æ?¯å¤ªé?¿"
 
-#: ../libempathy-gtk/empathy-chat.c:561
+#: ../libempathy-gtk/empathy-chat.c:547
 msgid "not implemented"
 msgstr "å°?æ?ªå®?ç?°"
 
-#: ../libempathy-gtk/empathy-chat.c:564
+#: ../libempathy-gtk/empathy-chat.c:550
 msgid "unknown"
 msgstr "æ?ªç?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:568
+#: ../libempathy-gtk/empathy-chat.c:554
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å??é??æ¶?æ?¯â??%sâ??å?ºé??ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:598
+#: ../libempathy-gtk/empathy-chat.c:584
 #, c-format
 msgid "Topic set to: %s"
 msgstr "è¯?é¢?è¢«è®¾ç½®ä¸ºï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:600
+#: ../libempathy-gtk/empathy-chat.c:586
 msgid "No topic defined"
 msgstr "æ?ªè®¾ç½®è¯?é¢?"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:956
 msgid "(No Suggestions)"
 msgstr "(æ²¡æ??å»ºè®®)"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
+#: ../libempathy-gtk/empathy-chat.c:1010
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1042
-#: ../libempathy-gtk/empathy-ui-utils.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-ui-utils.c:1492
 msgid "_Send"
 msgstr "å??é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1062
 msgid "_Spelling Suggestions"
 msgstr "æ?¼å??å»ºè®®(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1177
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s å·²æ?å¼?è¿?æ?¥"
@@ -914,12 +955,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:1198
+#: ../libempathy-gtk/empathy-chat.c:1184
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è¢« %2$s è¸¢å?º"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1187
 #, c-format
 msgid "%s was kicked"
 msgstr "%s è¢«è¸¢å?º"
@@ -927,17 +968,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:1209
+#: ../libempathy-gtk/empathy-chat.c:1195
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s å·²è¢« %s ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:1198
 #, c-format
 msgid "%s was banned"
 msgstr "%s è¢«ç¦?æ¢"
 
-#: ../libempathy-gtk/empathy-chat.c:1216
+#: ../libempathy-gtk/empathy-chat.c:1202
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
@@ -947,42 +988,42 @@ msgstr "%s ç¦»å¼?äº?è??å¤©å®¤"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1211
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:1234
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å? å?¥äº?è??å¤©å®¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:1367 ../src/empathy-call-window.c:1295
 msgid "Disconnected"
 msgstr "å·²æ?å¼?è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:1817
+#: ../libempathy-gtk/empathy-chat.c:1803
 msgid "Connected"
 msgstr "å·²è¿?æ?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:1867
+#: ../libempathy-gtk/empathy-chat.c:1853
 #: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 msgstr "å¯¹è¯?"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:477
 msgid "Topic:"
 msgstr "è¯?é¢?ï¼?"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:266
+#: ../libempathy-gtk/empathy-theme-adium.c:276
 msgid "_Copy Link Address"
 msgstr "å¤?å?¶é?¾æ?¥å?°å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:274
+#: ../libempathy-gtk/empathy-theme-adium.c:284
 msgid "_Open Link"
 msgstr "æ??å¼?é?¾æ?¥(_O)"
 
@@ -1013,27 +1054,27 @@ msgstr "ä»¥å??å??å?³å®?(_L)"
 msgid "Subscription Request"
 msgstr "è®¢é??è¯·æ±?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¨ç??ç??è¦?å? é?¤ç¾¤ç»?â??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1416
 msgid "Removing group"
 msgstr "å? é?¤ç¾¤ç»?"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:1463
+#: ../libempathy-gtk/empathy-contact-list-view.c:1540
 msgid "_Remove"
 msgstr "å? é?¤(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??ç³»äººâ??%sâ??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:1495
 msgid "Removing contact"
 msgstr "å? é?¤è??ç³»äºº"
 
@@ -1219,13 +1260,6 @@ msgstr "%B %e,%Y äº? %R UTC æ?¶é?´"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b>äº?(æ?¥æ??ï¼?\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-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-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "å?«å??ï¼?"
@@ -1311,7 +1345,7 @@ msgid "SSL"
 msgstr "SSL"
 
 #: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
+#: ../src/empathy-import-widget.c:302
 msgid "Account"
 msgstr "è´¦æ?·"
 
@@ -1357,34 +1391,34 @@ msgstr "æ?°å»ºå¯¹è¯?"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
+#: ../libempathy-gtk/empathy-presence-chooser.c:177
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Custom Message..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
+#: ../libempathy-gtk/empathy-presence-chooser.c:230
+#: ../libempathy-gtk/empathy-presence-chooser.c:232
 msgid "Edit Custom Messages..."
 msgstr "ç¼?è¾?è?ªå®?ä¹?ç?¶æ??..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:331
 msgid "Click to remove this status as a favorite"
 msgstr "ç?¹å?»ç§»é?¤è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:340
 msgid "Click to make this status a favorite"
 msgstr "ç?¹å?»è®¾ç½®è?ªå®?ä¹?ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:374
 msgid "Set status"
 msgstr "è®¾ç½®ç?¶æ??"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:845
 msgid "Set your presence and current status"
 msgstr "è®¾ç½®ä½ ç??ç?¶æ??ä¿¡æ?¯å??ç?°å?¨ç??ç?¶æ??"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
+#: ../libempathy-gtk/empathy-presence-chooser.c:1093
 msgid "Custom messages..."
 msgstr "è?ªå®?ä¹?ç?¶æ??..."
 
@@ -1460,15 +1494,15 @@ msgstr "æ¸?ç?½"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1373
+#: ../libempathy-gtk/empathy-ui-utils.c:1394
 msgid "Unable to open URI"
 msgstr "æ? æ³?æ??å¼? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1463
+#: ../libempathy-gtk/empathy-ui-utils.c:1484
 msgid "Select a file"
 msgstr "é??æ?©æ??ä»¶"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1523
+#: ../libempathy-gtk/empathy-ui-utils.c:1544
 msgid "Select a destination"
 msgstr "é??æ?©ç?®ç??å?°"
 
@@ -1656,7 +1690,7 @@ msgid "Megaphone"
 msgstr "è¯?ç?"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
+#: ../megaphone/src/megaphone-applet.c:522
 msgid "Talk!"
 msgstr "è¯´å?§ï¼?"
 
@@ -1691,19 +1725,19 @@ msgstr "ç?¶æ??"
 msgid "Set your own presence"
 msgstr "è®¾ç½®æ?¨ç??ç?¶æ??"
 
-#: ../src/empathy.c:588
+#: ../src/empathy.c:808
 msgid "Don't connect on startup"
 msgstr "å?¯å?¨æ?¶ä¸?è?ªå?¨ç?»å½?"
 
-#: ../src/empathy.c:592
+#: ../src/empathy.c:812
 msgid "Don't show the contact list on startup"
 msgstr "å?¯å?¨æ?¶ä¸?æ?¾ç¤ºè??ç³»äººå??è¡¨"
 
-#: ../src/empathy.c:596
+#: ../src/empathy.c:816
 msgid "Show the accounts dialog"
 msgstr "æ?¾ç¤ºè´¦æ?·å¯¹è¯?æ¡?"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:828
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM å®¢æ?·ç«¯"
 
@@ -1755,131 +1789,162 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr ""
+#: ../src/empathy-account-assistant.c:118
+msgid "There has been an error while importing the accounts."
+msgstr "å¯¼å?¥è´¦æ?·æ?¶å?ºç?°é??è¯¯ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr ""
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error while parsing the account details."
+msgstr "å?¨è§£æ??è´¦æ?·ä¿¡æ?¯æ?¶å?ºç?°é??è¯¯ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr ""
+#: ../src/empathy-account-assistant.c:124
+msgid "There has been an error while creating the account."
+msgstr "å?¨å??å»ºè´¦æ?·æ?¯å?ºç?°é??è¯¯ã??"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr ""
+#: ../src/empathy-account-assistant.c:126
+msgid "There has been an error."
+msgstr "å??ç??é??è¯¯ã??"
 
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:141
 #, c-format
 msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr ""
+msgstr "é??è¯¯ä¿¡æ?¯æ?¯ï¼?<span style=\"italic\">%s</span>"
 
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:149
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
 msgstr ""
+"æ?¨å?¯ä»¥è¿?å??å°?è¯?é??æ?°è¾?å?¥æ?¨ç??è´¦æ?·ä¿¡æ?¯ï¼?æ??è??é??å?ºå?©ç??ï¼?ç?¶å??ä»?ç¼?è¾?è??å??ä¸å? å?¥è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:184
 msgid "An error occurred"
-msgstr ""
+msgstr "å??ç??é??è¯¯"
 
 #. Create account
 #. To translator: %s is the protocol name
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1094
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:321
+#: ../src/empathy-accounts-dialog.c:1428
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å»º %s è´¦æ?·"
 
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:393
 msgid "What kind of chat account do you have?"
-msgstr ""
+msgstr "æ?¨æ??ä»?ä¹?æ ·ç??è??å¤©è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:403
-#, fuzzy
+#: ../src/empathy-account-assistant.c:399
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "æ??å·²ç»?æ?¥æ??è´¦æ?·ï¼?æ??æ?³ä½¿ç?¨å®?"
+msgstr "æ?¨è¿?è¦?è®¾ç½®å?¶å®?è??å¤©è´¦æ?·å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:405
 msgid "Enter your account details"
 msgstr "è¾?å?¥æ?¨ç??å¸?æ?·è¯¦æ??"
 
-#: ../src/empathy-account-assistant.c:414
-#, fuzzy
+#: ../src/empathy-account-assistant.c:410
 msgid "What kind of chat account do you want to create?"
-msgstr "%s æ?¥ç?µï¼?æ?¨æ?³è¦?æ?¥å?¬å??ï¼?"
+msgstr "æ?¨æ?³è¦?å??å»ºä»?ä¹?æ ·ç??è??å¤©è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:420
-#, fuzzy
+#: ../src/empathy-account-assistant.c:416
 msgid "Do you want to create other chat accounts?"
-msgstr "æ?¨ç??ç??æ?³è¦?å? é?¤è??ç³»äººâ??%sâ??å??ï¼?"
+msgstr "æ?¨æ?³è¦?å??å»ºå?¶å®?ç??è??å¤©è´¦æ?·å??ã??"
 
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:423
 msgid "Enter the details for the new account"
-msgstr ""
+msgstr "è¾?å?¥æ?°è´¦æ?·ç??è¯¦ç»?èµ?æ??"
 
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:509
 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 "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
+"ä½¿ç?¨ Empathyï¼?æ?¨å?¯ä»¥ä¸?é??è¿?ç??æ??å??è??å¤©ï¼?è¿?å?¯ä»¥ä¸?ä½¿ç?¨ Google Talkï¼?AIMï¼?Windows "
+"Live å??è®¸å¤?å?¶å®?è??å¤©è½¯ä»¶ç??æ??å??å??å??äº?è??å¤©ã??ä½¿ç?¨éº¦å??é£?æ??æ??å??å¤´ï¼?æ?¨å°±å?¯ä»¥å¼?å§?é?³é¢?"
+"å??è§?é¢?é??è¯?ã??"
 
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:526
 msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
+msgstr "æ?¨æ??æ²¡æ??å?¶å®?è??å¤©è½¯ä»¶ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:549
 msgid "Yes, import my account details from "
-msgstr ""
+msgstr "æ??ï¼?è¯·å¯¼å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:570
 msgid "Yes, I'll enter my account details now"
-msgstr ""
+msgstr "æ??ï¼?æ??ç?°å?¨å°±è¾?å?¥æ??ç??è´¦æ?·ä¿¡æ?¯"
 
-#: ../src/empathy-account-assistant.c:596
-#, fuzzy
+#: ../src/empathy-account-assistant.c:592
 msgid "No, I want a new account"
-msgstr "å??å»ºæ?°ç??å¸?æ?·(_C)"
+msgstr "ä¸?ï¼?æ??æ?³è¦?ä¸?ä¸ªæ?°ç??è´¦æ?·ã??"
 
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
+msgstr "æ²¡æ??ï¼?æ??å?ªæ?¯æ?³ç??ç??é??è¿?ç?°å?¨è°?å?¨çº¿ä¸?"
 
-#: ../src/empathy-account-assistant.c:627
-#, fuzzy
+#: ../src/empathy-account-assistant.c:623
 msgid "Select the accounts you want to import:"
-msgstr "é??æ?©æ?¨è¦?é??è¯·ç??äººï¼?"
+msgstr "é??æ?©æ?¨è¦?å¯¼å?¥ç??è´¦æ?·ï¼?"
 
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:710
 #: ../src/empathy-new-chatroom-dialog.c:496
 #: ../src/empathy-new-chatroom-dialog.c:497
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:717
 msgid "No, that's all for now"
-msgstr ""
+msgstr "æ²¡æ??ï¼?å°±è¿?æ ·å?§ã??"
 
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:910
 msgid "Welcome to Empathy"
 msgstr "æ¬¢è¿?ä½¿ç?¨ Empathy"
 
-#: ../src/empathy-account-assistant.c:923
+#: ../src/empathy-account-assistant.c:919
 msgid "Import your existing accounts"
 msgstr "å¯¼å?¥ç?°æ??å¸?æ?·"
 
-#: ../src/empathy-accounts-dialog.c:616
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:63
+#, c-format
+msgid "There are unsaved modification regarding your %s account."
+msgstr "æ?¨ç?? %s è´¦æ?·æ??æ?ªä¿?å?ç??ä¿®æ?¹ã??"
+
+#. 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".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../src/empathy-accounts-dialog.c:234
+#, 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"
+#: ../src/empathy-accounts-dialog.c:246
+#, c-format
+msgid "%s Account"
+msgstr "%s è´¦æ?·"
+
+#: ../src/empathy-accounts-dialog.c:250
+msgid "New account"
+msgstr "æ?°è´¦æ?·"
+
+#: ../src/empathy-accounts-dialog.c:514
+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:798
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1888,7 +1953,13 @@ msgstr ""
 "æ?¨å°?è¦?å? é?¤æ?¨ç?? %s è´¦æ?·ï¼?\n"
 "æ?¨ç¡®å®?è¦?ç»§ç»å??ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:622
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:802
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "æ?¨è¦?ä»?ç?µè??ä¸ç§»é?¤ %s å??ï¼?"
+
+#: ../src/empathy-accounts-dialog.c:808
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1900,13 +1971,35 @@ msgstr ""
 "\n"
 "å¦?æ??å°?æ?¥æ?¨é??æ?°æ·»å? æ¤è´¦æ?·ï¼?å®?ä»¬å°?ä»?ç?¶å?å?¨ã??"
 
+#. Translators: this is used only when built on a moblin platform
+#: ../src/empathy-accounts-dialog.c:815
+msgid "This will not remove your account on the server."
+msgstr "è¿?ä¸?ä¼?å? é?¤æ??å?¡å?¨ä¸?ç??è´¦æ?·ã??"
+
+#: ../src/empathy-accounts-dialog.c:1006
+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:1505
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr "æ?¨å°?è¦?å?³é?æ¤çª?å?£ï¼?æ??å??ç??ä¿®æ?¹å°?ä½?åº?ã??æ?¨ç¡®å®?è¦?ç»§ç»å??ï¼?"
+
+#. Â Translators:Â thisÂ isÂ usedÂ onlyÂ whenÂ builtÂ onÂ aÂ moblinÂ platformÂ 
+#: ../src/empathy-accounts-dialog.c:1671
+msgid "_Next"
+msgstr "_ä¸?ä¸?é¡µ"
+
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "è´¦æ?·"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Add new"
-msgstr ""
+msgstr "æ·»å? "
 
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "Cr_eate"
@@ -1938,56 +2031,57 @@ msgstr "å?¯ç?¨ç?°æ??å¸?æ?·(_R)"
 msgid "account"
 msgstr "è´¦æ?·"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:427
 msgid "Contrast"
 msgstr "å¯¹æ¯?åº¦"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:430
 msgid "Brightness"
 msgstr "äº®åº¦"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:433
 msgid "Gamma"
 msgstr "ä¼½é©¬"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:541
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:671
+#: ../src/empathy-call-window.c:674
 msgid "Connecting..."
 msgstr "æ£å?¨è¿?æ?¥..."
 
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:781
 msgid "_Sidebar"
 msgstr "ä¾§è¾¹æ ?(_S)"
 
-#: ../src/empathy-call-window.c:797
+#: ../src/empathy-call-window.c:800
 msgid "Dialpad"
 msgstr "ç?µè¯?é?®ç??"
 
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:806
 msgid "Audio input"
 msgstr "é?³é¢?è¾?å?¥"
 
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:810
 msgid "Video input"
 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:868
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:873
 #, 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:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:954
 msgid "Call"
 msgstr "é??è¯?"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²è¿?æ?¥ â?? %d:%02dm"
@@ -2020,12 +2114,12 @@ msgstr "é??è¯?(_C)"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:349
 #, c-format
 msgid "Conversations (%d)"
 msgstr "å¯¹è¯? (%d)"
 
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:481
 msgid "Typing a message."
 msgstr "è¾?å?¥æ¶?æ?¯ã??"
 
@@ -2122,58 +2216,58 @@ msgstr "æ??ç»?(_R)"
 msgid "_Answer"
 msgstr "æ?¥å?¬(_A)"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:446
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??æ?¥ç?µ"
 
-#: ../src/empathy-event-manager.c:497
+#: ../src/empathy-event-manager.c:490
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ£å??é??é??è¯·ç»?æ?¨"
 
-#: ../src/empathy-event-manager.c:503
+#: ../src/empathy-event-manager.c:496
 msgid "An external application will be started to handle it."
 msgstr "å°?å?¯å?¨ä¸?ä¸ªå¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:501
 msgid "You don't have the needed external application to handle it."
 msgstr "æ?¨æ²¡æ??å¿?é??ç??å¤?é?¨åº?ç?¨ç¨?åº?æ?¥å¤?ç??å®?."
 
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:628
 msgid "Room invitation"
 msgstr "è??å¤©å®¤é??è¯·"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:631
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ£é??è¯·æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:639
 msgid "_Decline"
 msgstr "æ??ç»?(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:644
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:683
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s å·²é??è¯·æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:709
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¥æ?¶ %s æ??ä»¶ä¼ è¾?"
 
-#: ../src/empathy-event-manager.c:896
+#: ../src/empathy-event-manager.c:889
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s ç??è®¢é??è¯·æ±?"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid ""
 "\n"
@@ -2183,13 +2277,13 @@ msgstr ""
 "æ¶?æ?¯ï¼?%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:936
+#: ../src/empathy-event-manager.c:929
 #, c-format
 msgid "%s is now offline."
 msgstr "%s å½?å??ç¦»çº¿ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:952
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "%s is now online."
 msgstr "%s å½?å??å?¨çº¿ã??"
@@ -2316,15 +2410,15 @@ msgid "Import Accounts"
 msgstr "å¯¼å?¥è´¦æ?·"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:282
 msgid "Import"
 msgstr "å¯¼å?¥"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:291
 msgid "Protocol"
 msgstr "å??è®®"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:315
 msgid "Source"
 msgstr "æº?"
 
@@ -2650,14 +2744,13 @@ msgid "Privacy"
 msgstr "é??ç§?"
 
 #: ../src/empathy-preferences.ui.h:21
-#, fuzzy
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"é??ä½?ä½?ç½®ç²¾åº¦æ??å?³ç??ä½ å?¬å¼?ç??å??å¸?ã??å·?å??å?½å®¶ä¿¡æ?¯ä¸?å?¨ç²¾ç¡®ã?? GPS åº§æ ?ä¼?æ??ä¸?ä¸ªé??æ?ºæ?°"
-"å? å?¥ (&#xB1;0.25&#xB0;) ã??"
+"é??ä½?å®?ä½?ç²¾åº¦æ??å?³ç??æ¯?æ?¨æ??å?¨ç??å??å¸?ã??å·?å??å?½å®¶æ?´æ??ç¡®ç??ä¿¡æ?¯å°?ä¸?ä¼?è¢«å?¬å¸?ã?? GPS å??æ ?"
+"å°?ç²¾ç¡®å?°ä¸?ä½?å°?æ?°ã?? "
 
 #: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
@@ -2705,6 +2798,10 @@ msgstr "å??æ??ç??è??ç³»äººå?¬å¸?ä½?ç½®ä¿¡æ?¯(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®ä¿¡æ?¯ç²¾åº¦(_R)"
 
+#: ../src/empathy-status-icon.c:178
+msgid "Respond"
+msgstr "å??åº?"
+
 #: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "ç?¶æ??"
@@ -2729,64 +2826,64 @@ msgstr "ä¸?ä¸ªç?± %s æ??å?¡æ??ä¾?é??è¯·ï¼?ä½?æ?¯ä½ ä¸?é??è¦?åº?ç?¨ç¨?åº?å¤?ç??
 msgid "Contact Map View"
 msgstr "è??ç³»å?°å?¾è§?å?¾"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
+#: ../src/empathy-debug-window.c:111 ../src/empathy-debug-window.c:1081
 msgid "Error"
 msgstr "é??è¯¯"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
+#: ../src/empathy-debug-window.c:114 ../src/empathy-debug-window.c:1075
 msgid "Critical"
 msgstr "å?±æ?¥"
 
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
+#: ../src/empathy-debug-window.c:117 ../src/empathy-debug-window.c:1069
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
-#: ../src/empathy-debug-dialog.c:1109
+#: ../src/empathy-debug-window.c:120 ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1111
 msgid "Message"
 msgstr "æ¶?æ?¯"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
+#: ../src/empathy-debug-window.c:123 ../src/empathy-debug-window.c:1057
 msgid "Info"
 msgstr "ä¿¡æ?¯"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
+#: ../src/empathy-debug-window.c:126 ../src/empathy-debug-window.c:1051
 msgid "Debug"
 msgstr "è°?è¯?"
 
-#: ../src/empathy-debug-dialog.c:841
+#: ../src/empathy-debug-window.c:841
 msgid "Save"
 msgstr "ä¿?å?"
 
-#: ../src/empathy-debug-dialog.c:944
+#: ../src/empathy-debug-window.c:944
 msgid "Debug Window"
 msgstr "è°?è¯?çª?å?£"
 
-#: ../src/empathy-debug-dialog.c:1017
+#: ../src/empathy-debug-window.c:1019
 msgid "Pause"
 msgstr "æ??å??"
 
-#: ../src/empathy-debug-dialog.c:1029
+#: ../src/empathy-debug-window.c:1031
 msgid "Level "
 msgstr "çº§å?« "
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-window.c:1100
 msgid "Time"
 msgstr "æ?¶é?´"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-window.c:1102
 msgid "Domain"
 msgstr "å??"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1104
 msgid "Category"
 msgstr "ç±»å?«"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1106
 msgid "Level"
 msgstr "çº§å?«"
 
-#: ../src/empathy-debug-dialog.c:1136
+#: ../src/empathy-debug-window.c:1138
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -2855,6 +2952,7 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 #~ msgid "Group Chat"
 #~ msgstr "ç¾¤è??"
 
+#, fuzzy
 #~ msgid "Contact Information"
 #~ msgstr "è??ç³»äººä¿¡æ?¯"
 
@@ -3097,3 +3195,30 @@ msgstr "å·²é??å®?ç??è¿?æ?¥ç®¡ç??ä¸?æ?¯æ??è¿?ç¨?è°?è¯?æ?©å±?"
 
 #~ msgid "Invitation Error"
 #~ msgstr "é??è¯·å?ºé??"
+
+#~ msgid "The contact selected cannot receive files."
+#~ msgstr "é??æ?©ç??è??ç³»äººæ? æ³?æ?¥å??æ??ä»¶ã??"
+
+#~ msgid "The contact selected is offline."
+#~ msgstr "è??ç³»äººç¦»çº¿"
+
+#~ msgid "No error message"
+#~ msgstr "æ? é??è¯¯ä¿¡æ?¯"
+
+#~ msgid "Instant Message (Empathy)"
+#~ msgstr "å?³æ?¶æ¶?æ?¯ï¼?Empathyï¼?"
+
+#~ msgid "_Import..."
+#~ msgstr "_å¯¼å?¥â?¦â?¦"
+
+#~ msgid "Location sources:"
+#~ msgstr "å®?ä½?æ?¥æº?ï¼?"
+
+#~ msgid "_Cellphone"
+#~ msgstr "_æ??æ?º"
+
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
+
+#~ msgid "_Network (IP, Wifi)"
+#~ msgstr "_ç½?ç»? (IP, Wifi)"
-- 
1.6.3.3


--=-qhzcX0j7oyRdcKltMRlJ
Content-Disposition: attachment; filename="0005-Updated-Finnish-translation.patch"
Content-Type: text/x-patch; name="0005-Updated-Finnish-translation.patch"; charset="UTF-8"
Content-Transfer-Encoding: 8bit
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]