[empathy] update Simplified Chinese (zh_CN) translation

From: YunQiang Su <yqsu src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy] update Simplified Chinese (zh_CN) translation
Date: Mon, 5 Mar 2012 09:51:06 +0000 (UTC)
commit 09f38d2c6cfb75b07f7144441d2044221a92c2ae
Author: YunQiang Su <yqsu src gnome org>
Date:   Mon Mar 5 17:50:58 2012 +0800

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po |  770 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 393 insertions(+), 377 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0a32f1c..d78765b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,14 +18,15 @@
 # Wylmer Wang <wantinghard gmail com>, 2010-2012.
 # zhen liu  <liuzhen1191 gmail com>, 2011
 # Yangtse Su <yangtsesu gmail com>, 2011
+# Mike Manilone <crtmike gmail com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-02-15 21:22+0000\n"
-"PO-Revision-Date: 2012-02-14 13:52+0800\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-02-26 11:57+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -50,6 +51,16 @@ msgstr "Empathy åæéèçå"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "äç Google TalkãFacebookãMSN äåèåååèåæå"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "ææå VoIP åå"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ççææå VoIP åå"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
 msgstr "åèäçèæççå"
@@ -494,16 +505,6 @@ msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "æååäéçååéä Empathy äçäæçåçåã"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2330
-msgid "Messaging and VoIP Accounts"
-msgstr "ææå VoIP åå"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ççææå VoIP åå"
-
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "ææååå"
@@ -548,7 +549,7 @@ msgstr "æéæäæéæåçæä"
 msgid "The selected file is empty"
 msgstr "æéæäæçç"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "æææçï%s"
@@ -599,7 +600,7 @@ msgid "Status is set to offline"
 msgstr "çæåèçäçç"
 
 #: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ççéè"
@@ -771,7 +772,7 @@ msgid "All accounts"
 msgstr "åéåå"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "åå"
 
@@ -1285,28 +1286,28 @@ msgstr "æææä"
 msgid "Click to enlarge"
 msgstr "ååäæå"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "åèååæåé"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "éæçèçääææåå"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "éæçèçäçç"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "éæçèçäææ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "äææåæäèäèèçæåå"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "æäçåäéäèäæäææéè"
 
@@ -1449,7 +1450,7 @@ msgstr "åæåç"
 msgid "unknown"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "èéï"
 
@@ -1564,9 +1565,9 @@ msgstr "%s çååå %s"
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
 #: ../libempathy-gtk/empathy-chat.c:2993
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
-#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "åæåèæ"
 
@@ -1601,7 +1602,7 @@ msgstr "èäæéæçääåçäæçï"
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "åèæ"
 
@@ -2146,7 +2147,7 @@ msgid "_Edit"
 msgstr "çè(_E)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1546
-#: ../src/empathy-chat-window.c:1175
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "éèåæèåå"
 
@@ -2234,133 +2235,133 @@ msgstr "æåæåå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "å %s èå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "ä %s èå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Yå%mæ%dæ %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s å"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæéï%sïçæä %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "æå"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "éæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "ææèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "ååçèééè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "æææç"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "çåèåéäåçåéåèæåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "åéæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "ääääçåéï"
 
@@ -2446,7 +2447,7 @@ msgid "There was an error starting the conversation"
 msgstr "åèåèæåé"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "èåääèçäæèæçèåçï"
 
@@ -2456,17 +2457,17 @@ msgid "New Conversation"
 msgstr "æååè"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "èéåå(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "ééåå(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "æåéè"
 
@@ -2522,7 +2523,7 @@ msgstr "èåäææ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åå"
@@ -2890,23 +2891,23 @@ msgstr "æéèäæ"
 msgid "Instant Message (Empathy)"
 msgstr "åæææ(Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "ååæäèåèæ"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ååæäæçèçäåè"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Empathy åæéèåæç"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "èçååççååé"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2966,6 +2967,7 @@ msgstr ""
 "Tao Wei <weitao1979 gmail com>, 2009\n"
 "Aron Xu <happyaron xu gmail com>, 2009, 2010\n"
 "Tao Wang <dancefire gmail com>, 2010\n"
+"Mike Manilone <crtmike gmail com>, 2012\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n";
@@ -2976,242 +2978,105 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ååååæåçéèã"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "åèæååèææåçéèã"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "åååååæåçéèã"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "åçéèã"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "éèäæäï%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"æåäèååèéæèåæçååäæïæèéååçïçåäçèèåäååååã"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1276
-msgid "An error occurred"
-msgstr "åçéè"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "æåçææåäçåçååï"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "æèèèçååèååååï"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "èåæçååèæ"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "ææååéççåçååï"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "ææèååååçèååååã"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "èåæååçèçèæ"
-
-#: ../src/empathy-account-assistant.c:614
-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:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "ææææååèåèäçååï"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "æïèååæçååäæ"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "æïæçååèåæçååäæ"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "äïææèääæçåå"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "ææïæåææççéèçåèåçä"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "éææèååçååï"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "æ"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "ææïåèæå"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy åäèååçåæèæååääççäçääïåäåäåääèåãåææ"
-"æäçèäåèïèäçæçäåäææåæçãæäåäåäéèâååâåèæèæ"
-"çäæèääææåéèäåè"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1152
-msgid "Edit->Accounts"
-msgstr "çè->åå"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "æäåçæçæ(_N)"
-
-#: ../src/empathy-account-assistant.c:1148
-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 "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"æææåèæåæååçäççæèåïåäææåè telepathy-salutãåæææå"
-"çèåèïèåè telepathy-salut åïåäååååèæäååéèçä(People "
-"Nearby)åå"
-
-#: ../src/empathy-account-assistant.c:1154
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut æåè"
-
-#: ../src/empathy-account-assistant.c:1200
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ææå VoIP åååæ"
-
-#: ../src/empathy-account-assistant.c:1234
-msgid "Welcome to Empathy"
-msgstr "æèäç Empathy"
-
-#: ../src/empathy-account-assistant.c:1243
-msgid "Import your existing accounts"
-msgstr "ååçæåå"
-
-#: ../src/empathy-account-assistant.c:1261
-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:69
+#: ../src/empathy-accounts-dialog.c:72
 #, 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:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "æçæååèææäåã"
 
-#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1332
+#: ../src/empathy-call-window.c:1289
 msgid "Connectingâ"
 msgstr "æåèæ..."
 
-#: ../src/empathy-accounts-dialog.c:388
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline â %s"
 msgstr "çç - %s"
 
-#: ../src/empathy-accounts-dialog.c:400
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæå - %s"
 
-#: ../src/empathy-accounts-dialog.c:411
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline â No Network Connection"
 msgstr "çç - æåççç"
 
-#: ../src/empathy-accounts-dialog.c:418
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "æççæ"
 
-#: ../src/empathy-accounts-dialog.c:430
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"åäæèæäèääæåãäææçåçïæäæèæåèççãèåè telepathy-"
+"haze åéæååæçäèæèçæçèæã"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â Account Disabled"
 msgstr "çç - ååèçç"
 
-#: ../src/empathy-accounts-dialog.c:533
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "çèèæåæ"
 
-#: ../src/empathy-accounts-dialog.c:696
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "äæååèåæçäääæåèã"
 
-#: ../src/empathy-accounts-dialog.c:702
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "èäçäçèæçäääæã"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "çèèæåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1292
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æèäçèäçé %s åï"
 
-#: ../src/empathy-accounts-dialog.c:1296
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "èääåéæååäçååã"
 
-#: ../src/empathy-accounts-dialog.c:1532
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "æåèéæåääååïæåçäæåäåãæçåèççåï"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1708
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "åç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1709
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "çç(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2179
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "èè(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "èæ(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3226,8 +3091,8 @@ msgid "_Importâ"
 msgstr "åå(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "åèï"
+msgid "Loading account information"
+msgstr "æååèååäæ"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3236,12 +3101,8 @@ msgid ""
 msgstr "èæåääæååïæéåéèäææèäççæäåèåèåçã"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "åæåèåè"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "æååèååäæ"
+msgid "No protocol backends installed"
+msgstr "æåèåèåç"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3251,15 +3112,11 @@ msgstr " - Empathy èèåæç"
 msgid "Empathy authentication client"
 msgstr "Empathy èèåæç"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "éèçä"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy èé/èéåæç"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy èé/èéåæç"
 
@@ -3302,98 +3159,98 @@ msgstr "èçäæ"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "ä %s éè"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "æåæèç IP åå"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet äæååæèç IP åå"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäææèç IP åå"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "äèæåå IP åå"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "åæçç IP åå"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "æç"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "åèæ â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "ææçè"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s èäææçèæèçææææçääééæåã"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s èäææçèæèçææææçääèéæåã"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3090
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "äèä %s åçèæãåèæäåèçæäääåèçæèæã"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "ççåçääéè"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3100
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ååæéèçééæåèææåæççèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ååæéèçèéæåèææåæççèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3403,23 +3260,23 @@ msgstr ""
 "Telepathy çäåçäääæåãè<a href=\"%s\">ææèäéè</a>ïåéäååè"
 "åéâèèâçåæéåçæåã"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "åååæéåçäääæé"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "ååèæçæå"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3167
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "äèåçééæ"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3177
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "äèåçèéæ"
 
@@ -3532,8 +3389,8 @@ msgstr "ççåï"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
-#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "æç"
 
@@ -3557,18 +3414,18 @@ msgstr "æååéï"
 msgid "Audio"
 msgstr "éé"
 
-#: ../src/empathy-chat-window.c:285
+#: ../src/empathy-chat-window.c:289
 msgid "Close this window?"
 msgstr "åéæçåï"
 
-#: ../src/empathy-chat-window.c:290
+#: ../src/empathy-chat-window.c:294
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr "åéæçååçå %sãæåääåæåääææïéééæååã"
 
-#: ../src/empathy-chat-window.c:301
+#: ../src/empathy-chat-window.c:305
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3579,60 +3436,60 @@ msgid_plural ""
 msgstr[0] ""
 "åéæçååçå %u éèååãæåääåæåääææïéééæååã"
 
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:314
 #, c-format
 msgid "Leave %s?"
 msgstr "çå %sï"
 
-#: ../src/empathy-chat-window.c:311
+#: ../src/empathy-chat-window.c:315
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "æåääåæåæèæèååçääææïéééæååã"
 
-#: ../src/empathy-chat-window.c:330
+#: ../src/empathy-chat-window.c:334
 msgid "Close window"
 msgstr "åéçå"
 
-#: ../src/empathy-chat-window.c:330
+#: ../src/empathy-chat-window.c:334
 msgid "Leave room"
 msgstr "çåèåå"
 
-#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d æè)"
 
-#: ../src/empathy-chat-window.c:648
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ååå %u ä)"
 
-#: ../src/empathy-chat-window.c:664
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (åæääç %d ææè)"
 
-#: ../src/empathy-chat-window.c:673
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ææäå %d ææè)"
 
-#: ../src/empathy-chat-window.c:888
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "çäï"
 
-#: ../src/empathy-chat-window.c:898
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d æææ"
 
-#: ../src/empathy-chat-window.c:920
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "èåææã"
 
@@ -3712,96 +3569,96 @@ msgstr "èåèæ"
 msgid "Manage Favorite Rooms"
 msgstr "ççèååæè"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "ååçèééè"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "æç"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èéæçãææèæååï"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æçïææèæååï"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s çæç"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "æå(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "äçèéæå(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1568
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s çèéåå"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèæåå %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æéèæåå %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "æç(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s åéèæåå %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "ææ %s æääè"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s åæåççæååè"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3921,26 +3778,30 @@ msgstr "æääè"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "äåèçéååæãååæåååèçæääè"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "åå(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "ææååååçååãEmpathy çååèææä Pidgin ååååã"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "åååå"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "åå"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "åè"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "æ"
 
@@ -4130,6 +3991,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "æ"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "å"
 
@@ -4466,63 +4332,84 @@ msgstr "åççæïååéèé"
 msgid "Contact Map View"
 msgstr "èçååèå"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "äå"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin éæ"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin åå"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "äæçèçææååãèææåäååæäã"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "èèçå"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "åéå pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "æå"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "çå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "èè"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "äæ"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "ææ"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "èå"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "åæ"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "éè"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "æé"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "å"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "çå"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "çå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4541,33 +4428,29 @@ msgstr "éæääèçääååèäèï"
 msgid "Invite"
 msgstr "éè"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "äæçääåèæïåæææåäïåååïçåéå"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "åæâéèçäâååçæåäæçääåèæ"
 
 # lainmeïåæéæçåçåå(æå gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "éåéæçååå(å gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<åå ID>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "æçåååæ"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy åå"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy åå"
 
@@ -4587,81 +4470,81 @@ msgstr "Empathy èèå"
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM åæç"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "åå"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1572
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "æå"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "äèéåç"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "æç"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "æå"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "æä"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s åååèååæïäæåææåäåääéèã"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2936
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "æè"
 
-#: ../src/empathy-call-window.c:2939
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "éé"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "æé"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-call-window.c:3214
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "æååçäéä %sã"
 
-#: ../src/empathy-call-window.c:3218
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you donât have enough credit for that call."
 msgstr "åäèïæäçåäéäèäæäææéèã"
 
-#: ../src/empathy-call-window.c:3220
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "åå"
 
@@ -4669,10 +4552,143 @@ msgstr "åå"
 msgid "_Match case"
 msgstr "ååååå(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "æåçææåäçåçååï"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "æåæåå"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "éèçä"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy åäèååçåæèæååääççäçääïåäåäåääèåãåææ"
+"æäçèäåèïèäçæçäåäææåæçã"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+msgstr ""
+"æåäåäåäæèäèçäææéèåèçäåèäéæ<span style=\"italic\">ç"
+"è â åå</span>æççèäåèã"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ååååæåçéèã"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "åèæååèææåçéèã"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "åååååæåçéèã"
+
+#~ msgid "There was an error."
+#~ msgstr "åçéèã"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "éèäæäï%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "æåäèååèéæèåæçååäæïæèéååçïçåäçèèåäååå"
+#~ "åã"
+
+#~ msgid "An error occurred"
+#~ msgstr "åçéè"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "æèèèçååèååååï"
+
+#~ msgid "Enter your account details"
+#~ msgstr "èåæçååèæ"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "ææååéççåçååï"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "ææèååååçèååååã"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "èåæååçèçèæ"
+
+#~ 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 åèåååèåèäçæåååäèåãäçéåéææååïæå"
+#~ "åäååééåèééèã"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "ææææååèåèäçååï"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "æïèååæçååäæ"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "æïæçååèåæçååäæ"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "äïææèääæçåå"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ææïæåææççéèçåèåçä"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "éææèååçååï"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ææïåèæå"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "çè->åå"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "æäåçæçæ(_N)"
+
+#~ 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 install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "æææåèæåæååçäççæèåïåäææåè telepathy-salutãåæææ"
+#~ "åçèåèïèåè telepathy-salut åïåäååååèæäååéèçä"
+#~ "(People Nearby)åå"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut æåè"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "ææå VoIP åååæ"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "æèäç Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ååçæåå"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "èèåäääæ"
+
+#~ msgid "Protocol:"
+#~ msgstr "åèï"
+
+#~ msgid "Show account assistant"
+#~ msgstr "æçåååæ"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "äææ Socket çå"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]