[empathy] update Simplified Chinese (zh_CN) translation



commit ebfea186ffbcb71e1c335d45a3cee4a13a7c9c06
Author: Cheng Lu <chenglu1990 gmail com>
Date:   Sat Sep 22 15:03:00 2012 +0300

    update Simplified Chinese (zh_CN) translation

 po/zh_CN.po | 3702 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1830 insertions(+), 1872 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 21c395f..ca4ea06 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,20 +21,21 @@
 # Mike Manilone <crtmike gmail com>, 2012
 # EL8LatSPQ <el8latspq hotmail com>, 2012.
 # YunQiang Su <wzssyqa gmail com>, 2012.
+# Cheng Lu <chenglu1990 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-03-16 10:47+0000\n"
-"PO-Revision-Date: 2012-04-11 16:38+0000\n"
-"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"POT-Creation-Date: 2012-09-20 08:28+0000\n"
+"PO-Revision-Date: 2012-08-31 16:21+0800\n"
+"Last-Translator: Cheng Lu <chenglu1990 gmail com>\n"
+"Language-Team: Chinese (Simplified) <i18n-zh googlegroups com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
-"Language: zh_CN\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -53,56 +54,47 @@ 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:2512
-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
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "åèäçèæççå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æåäçèæççåèåæåèææéæèæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy ååææåèåèæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æååååæèåçåæçååã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy çéææåèåçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æåååçæçéæèåèåçåæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "Empathy éèäèæäå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "äåäéæäçéèæäåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr "çäæææååèæèæèæçäåçåæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
@@ -110,280 +102,245 @@ msgstr ""
 "empathy-sanity-cleaning.c äçèäæåæçåæååèæèæçäåãçæäåå"
 "æåææèäåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "æçççèçä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æåæçèçäæåäçççèçäã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Show avatars"
-msgstr "æçåå"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "æååèçäåèåèåçåäæçååã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Show protocols"
-msgstr "æçåè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "æååèçäåèåèåçåäæçåèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "åèçäåèäæçäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
 msgstr "æååèçäåèåèåçåäæçäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Compact contact list"
-msgstr "çåæçèçäåè"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Whether to show the contact list in compact mode."
-msgstr "æåäçåæåæçèçäåèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "éèäçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "éèäçåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "éèçéååååçççå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "äæéååååçççåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "ååççåäæåæèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "ææäæèåæååççèåçåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "åçæææçååääã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr "åçæææçååääãåæä false åçåæçççæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "èåçåèæçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "èåçåèæäåçäç(åç)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "æçèçäåç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
 msgstr "æååèçäåèäæçåçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Contact list sort criterion"
-msgstr "èçäåèæåæä"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's state with the value \"state\". A value of \"name\" will sort "
-"the contact list by name."
-msgstr ""
-"äçäçæäææåèçäåèãéèæåääçåâçæâäæèçäçææåãåå"
-"äâååâæåæååæåèçäåèã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "äçéçåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "æåéèääæçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "çåæççåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
 msgstr "åçåæåçææåäçåéæçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "æåæææææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æåéèææåèæçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "ååæææææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æåäååææäçåéæçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "æåèæææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æåéèæäèæçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "èçäçåæææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æåéèèçääçæçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "èçäæéæææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æåéèèçääçæçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "çåæææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 msgid "Whether to play a sound when logging into a network."
 msgstr "åèççåææåæææçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "æéæææåé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 msgid "Whether to play a sound when logging out of a network."
 msgstr "åççæåææåæææçéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "åçæææååæç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "åæåæææææåååæçæçæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "çåæççååæç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
 msgstr "åçåæåçææåååæçæçæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "åæèåçåäæççåååææéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 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:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "åèçäçåæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "åèçääçææåæçååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "åèçäæéæååéç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "åèçäççææåæçååéçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "äçèæåæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "åèææååèæçåèæäèæåæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "åèååæçèçäåè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æååèååæçèçäåèã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "èåçåäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "çäåèåçåäæçäèçäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "èåçåäéèç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "çäåèåçåäæçäèçäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "Adium äéçèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-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.h:65
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr "åæèåäç Adium äéïäç Adium äéçèåãååçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "åç WebKit åååå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 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:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "åèääææåèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
@@ -391,495 +348,426 @@ msgstr ""
 "æååéâçåäâ(composing)æâæåâ(paused)çèåçæãçåäååâåç"
 "åâ(gone)çæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "äèååäçäé"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "æååèååäçäéã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "æåææåèè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "çäæåææåçèèçåèïäéååé(äåïen, fr, nl)ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "åçæåææå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æååææèäæåææçåèäæåææã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "æçèååç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "åçèääçæçèåæåæçåéæåçåçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy æåäçèçäååääèåçååæ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "æåäçèçäçååääèåçåçåæã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr "åååèåååèæäæåéæçåå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "æåéæååèååçååç D-Bus åèèåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "çæèå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "èéååæéèäçççæèåïäå /dev/video0ã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "çæäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr "åéèææååéèçäçã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "ååæåææ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "æååç Pulseaudio çååæåèæåã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "åéäçåææçæç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 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:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "Empathy èåååçæçäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "æååè Empathy åçæçäçåäçèçä"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy èåéèççæäèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "æååè Empathy éèççäèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy èåéèæææäèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "æååè Empathy éèææççäèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy èåéè GPS æäèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "æååè Empathy éè GPS äèäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "éä Emapthy äçäæçåçå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "æååäéçååéä Empathy äçäæçåçåã"
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
 msgstr "ææååå"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "The change in state was requested"
 msgstr "éèçææåäæ"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "You canceled the file transfer"
 msgstr "æåæäæääè"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "The other participant canceled the file transfer"
 msgstr "ååçåäèåæäæäçäè"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "Error while trying to transfer the file"
 msgstr "åäèèäæäçæååçéè"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "The other participant is unable to transfer the file"
 msgstr "ååçåäèææäèèäæä"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
 msgid "Unknown reason"
 msgstr "æçåå"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:914
 msgid "File transfer completed, but the file was corrupted"
 msgstr "æääèåæïäèæäåæå"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1200
 msgid "File transfer not supported by remote contact"
 msgstr "æääèäææèçèæ"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1256
 msgid "The selected file is not a regular file"
 msgstr "æéæäæéæåçæä"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1265
 msgid "The selected file is empty"
 msgstr "æéæäæçç"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+msgid "Password not found"
+msgstr "ææååç"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "IM åå %s (%s) çåç"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "åå %2$s (%3$s) çèåå %1$s åç"
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "æææçï%s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:407
 #, c-format
 msgid "Called %s"
 msgstr "ä %s éè"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:410
 #, c-format
 msgid "Call from %s"
 msgstr "æçï%s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d çéå"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d åéå"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d åæå"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d åå"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d ææå"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d æå"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "åæ"
+
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "åç"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "çå"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "éè"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "çç"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:238
 msgctxt "presence"
 msgid "Unknown"
 msgstr "æç"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr "ææååå"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
 msgid "Status is set to offline"
 msgstr "çæåèçäçç"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "ççéè"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
 msgstr "éèåè"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr "ååéè"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr "çæååèåç"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate not provided"
 msgstr "ææäèä"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr "èääèää"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr "èäåèæ"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not activated"
 msgstr "èäåæææ"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate hostname mismatch"
 msgstr "èääæåäåé"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate fingerprint mismatch"
 msgstr "èäæçäåé"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate self-signed"
 msgstr "èäæèçåç"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr "èäéè"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr "ååäåç"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr "èäææ"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr "èæèæç"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr "ææåçèæ"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr "èæåäå"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:348
 msgid "This account is already connected to the server"
 msgstr "èåååèæåæåå"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "èæåèäççåèæçæèæåä"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr "æååäåååèåå"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr "æååååïææåçååèæ"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr "èäåèåé"
 
 # lainmeïèääçäååçååçæææåååç
 # xslidianïèääççååçæäååæèæèçè
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "èääçäååçååçææèæåååç"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:362
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "æååèäçéåââææååèäéçæåââèåäåååççæéå"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:366
 msgid "Your software is too old"
 msgstr "äçèäçæåæä"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:368
 msgid "Internal error"
 msgstr "åééè"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:497
 msgid "People Nearby"
 msgstr "éèçä"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ææ"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:531
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:532
 msgid "Facebook Chat"
 msgstr "Facebook èå"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d çéå"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d åéå"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d åæå"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d åå"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d ææå"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d æå"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "åæ"
-
-#: ../libempathy/empathy-keyring.c:75
-#| msgid "Phrase not found"
-msgid "Password not found"
-msgstr "ææååç"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "IM åå %s (%s) çåç"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "åå %2$s (%3$s) çèåå %1$s åç"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:692
+#: ../libempathy-gtk/empathy-account-chooser.c:689
 msgid "All accounts"
 msgstr "åéåå"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
-msgid "Account"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-account-widget.c:683
-msgid "Password"
-msgstr "åç"
-
-#: ../libempathy-gtk/empathy-account-widget.c:684
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "æåå"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "çå"
-
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%sï"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Username:"
-msgstr "çæåï"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1710
-msgid "A_pply"
-msgstr "åç(_P)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1739
-msgid "L_og in"
-msgstr "çå(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "æååäåååèåå"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-msgid "Create a new account on the server"
-msgstr "åæååäååæçåå"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2241
-#, 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:2267
-#, c-format
-msgid "%s Account"
-msgstr "%s åå"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "æååå"
-
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "åç(_W)ï"
+msgid "Pass_word"
+msgstr "åç(_W)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
-msgstr "çæå(_N)ï"
+msgid "Screen _Name"
+msgstr "çæå(_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "<b>Example:</b> MyScreenName"
@@ -900,30 +788,28 @@ msgstr "èäåç"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "çå(_P)ï"
+msgid "_Port"
+msgstr "çå(_P)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "_Server:"
-msgstr "æåå(_S)ï"
+msgid "_Server"
+msgstr "æåå(_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
 msgstr "éç"
@@ -941,101 +827,137 @@ msgstr "æç AIM åçæääï"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "Remember Password"
 msgstr "èäåç"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D:"
-msgstr "çå I_Dï"
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
+msgid "Account"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<b>äåï</b>çæå"
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "æç GroupWise çæåæääï"
+#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "æåå"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "æç GroupWise åçæääï"
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "çå"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
-msgstr "ICQ _UINï"
+#: ../libempathy-gtk/empathy-account-widget.c:762
+#, c-format
+msgid "%s"
+msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>äåï</b>123456789"
+#: ../libempathy-gtk/empathy-account-widget.c:817
+#, c-format
+msgid "%s:"
+msgstr "%sï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "åçé(_A):"
+#: ../libempathy-gtk/empathy-account-widget.c:1429
+msgid "Username:"
+msgstr "çæåï"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "æç ICQ UIN æääï"
+#: ../libempathy-gtk/empathy-account-widget.c:1746
+msgid "A_pply"
+msgstr "åç(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "æç ICQ åçæääï"
+#: ../libempathy-gtk/empathy-account-widget.c:1775
+msgid "L_og in"
+msgstr "çå(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr "èå"
+#: ../libempathy-gtk/empathy-account-widget.c:1845
+msgid "This account already exists on the server"
+msgstr "æååäåååèåå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
+#: ../libempathy-gtk/empathy-account-widget.c:1849
+msgid "Create a new account on the server"
+msgstr "åæååäååæçåå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2270
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%2$s äç %1$s"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-msgid "TLS"
-msgstr "TLS"
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2296
+#, c-format
+msgid "%s Account"
+msgstr "%s åå"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
-msgid "Register"
-msgstr "æå"
+#: ../libempathy-gtk/empathy-account-widget.c:2300
+msgid "New account"
+msgstr "æååå"
 
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr "éé"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+msgid "Login I_D"
+msgstr "çå I_D"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-msgid "None"
-msgstr "æ"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>äåï</b>çæå"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "æç GroupWise çæåæääï"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "æç GroupWise åçæääï"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>äåï</b>123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "Ch_aracter set"
+msgstr "åçé(_A)"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "æç ICQ UIN æääï"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "æç ICQ åçæääï"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "çç"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network:"
-msgstr "ççï"
+msgid "Character set"
+msgstr "åçé"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "åçéï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "æå..."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 #: ../src/empathy-accounts-dialog.ui.h:2
@@ -1043,45 +965,47 @@ msgstr "æå..."
 msgid "Remove"
 msgstr "åé"
 
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "åç"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "æåå"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr "ååæ IRC æååäéèåçïåææäçåïåäèèååçã"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Nickname:"
-msgstr "æçï"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Password:"
-msgstr "åçï"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Quit message:"
-msgstr "éåææï"
+msgid "Nickname"
+msgstr "æç"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Real name:"
-msgstr "çåï"
+msgid "Quit message"
+msgstr "éåææ"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+msgid "Real name"
+msgstr "çå"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Username"
+msgstr "çæå"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "åä IRC çç?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "æç IRC æçæää?"
 
@@ -1127,25 +1051,25 @@ msgid "I_gnore SSL certificate errors"
 msgstr "åç SSL èäéè(_G)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "äåç(_T):"
+msgid "Priori_ty"
+msgstr "äåç(_T)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
-msgstr "èæ(_U)ï"
+msgid "Reso_urce"
+msgstr "èæ(_U)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "Encr_yption required (TLS/SSL)"
 msgstr "éèåå(TLS/SSL)(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Use old SS_L"
-msgstr "äçæç SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "èçæååèç"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "äçæç SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "æç Jabber ID æääï"
@@ -1162,6 +1086,30 @@ msgstr "æç Jabber åçæääï"
 msgid "What is your desired Jabber password?"
 msgstr "ææèç Jabber åçæääï"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname"
+msgstr "æç(_K)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name"
+msgstr "å(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "_First Name"
+msgstr "å(_F)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name"
+msgstr "ååçåå(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID"
+msgstr "_Jabber ID"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "E-_mail address"
+msgstr "çåéäåå(_M)"
+
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>äåï</b>user hotmail com"
@@ -1174,33 +1122,38 @@ msgstr "æç Windows Live ååæääï"
 msgid "What is your Windows Live password?"
 msgstr "æç Windows Live åçæääï"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
-msgstr "æç(_K):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "èå"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
-msgstr "å(_L)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
-msgstr "å(_F)"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
-msgstr "ååçåå(_P)ï"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber IDï"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "æå"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
-msgstr "çåéäåå(_M):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "æ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
-msgstr "çæå(_U)ï"
+msgid "_Username"
+msgstr "çæå(_U)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
@@ -1223,8 +1176,8 @@ msgid "Miscellaneous Options"
 msgstr "æé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
-msgstr "STUN æååï"
+msgid "STUN Server"
+msgstr "STUN æåå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Discover the STUN server automatically"
@@ -1234,30 +1187,25 @@ msgstr "èååç STUN æåå"
 msgid "Discover Binding"
 msgstr "åççå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "æååï"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
 msgstr "Keep-Alive éé"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism:"
-msgstr "æåï"
+msgid "Mechanism"
+msgstr "æå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Interval (seconds)"
 msgstr "éé(ç)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username:"
-msgstr "éèçæåï"
+msgid "Authentication username"
+msgstr "éèçæå"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
-msgstr "äèï"
+msgid "Transport"
+msgstr "äè"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
@@ -1267,18 +1215,22 @@ msgstr "åæèç"
 msgid "Ignore TLS Errors"
 msgstr "åç TLS éè"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "çåï"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Local IP Address"
+msgstr "æå IP åå"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "æç SIP çå ID æääï"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "æç SIP åååçæääï"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "åç(_W)ï"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "Yahoo I_Dï"
@@ -1291,6 +1243,14 @@ msgstr "åçäèåèååéè(_G)"
 msgid "_Room List locale:"
 msgstr "èåååè locale(_R)ï"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "åçé(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "çå(_P)ï"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "æç Yahoo! ID æääï"
@@ -1299,36 +1259,36 @@ msgstr "æç Yahoo! ID æääï"
 msgid "What is your Yahoo! password?"
 msgstr "æç Yahoo! åçæääï"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "ææèæåå"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ææääæåçåçæåèèæçççææ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "ææååçäåäæä"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "éææçåååç"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "çç..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "æåå"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "æææä"
 
@@ -1336,6 +1296,34 @@ msgstr "æææä"
 msgid "Click to enlarge"
 msgstr "ååäæå"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "åå <b>%s</b> éèåè"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3724
+msgid "Retry"
+msgstr "éè"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"èåæçåååç\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "éæ..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "éæ(_S)"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1361,62 +1349,61 @@ msgstr "äææåæäèäèèçæåå"
 msgid "You don't have enough credit in order to place this call"
 msgstr "æäçåäéäèäæäææéè"
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:727
 msgid "Failed to open private chat"
 msgstr "åççäåèåè"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:785
 msgid "Topic not supported on this conversation"
 msgstr "äææåæäèäèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "You are not allowed to change the topic"
 msgstr "æäèææäé"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "%s æææçèçä ID"
+#: ../libempathy-gtk/empathy-chat.c:967
+msgid "Invalid contact ID"
+msgstr "ææçèçä ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1054
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clearïæçååäèçææææ"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1057
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <äé>ïèååååèçäé"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èååå>ïååääæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èååå>ïååääæçèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/çæ[<èååID>] [<åå>]ïååéèçåèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <æç> [<ææ>]ïæåääçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <æç> <ææ>ïæåääçäèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <æç>ïåååæååäæåæçæç"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <åäææ>ïååååèäåéääåäææ"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1083
 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 "
@@ -1425,137 +1412,137 @@ msgstr ""
 "/say <ææ>ïåé <ææ> ååååèãèæçæåéääâ/âååçäæãäåïâ/"
 "say /join æçæååääæçèååâ"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <èçä ID>ïæçääèçäçäæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<åä>]ïæçææææçåäãåæ <åä> ææåäçïåæçåççæã"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1110
 #, c-format
 msgid "Usage: %s"
 msgstr "çæï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "Unknown command"
 msgstr "æçåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1281
 msgid "Unknown command; see /help for the available commands"
 msgstr "æçåäïèäç /help æéåçåä"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1538
 msgid "insufficient balance to send message"
 msgstr "äéäèïææåéææ"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1619
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "åéææâ%sâåéï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message: %s"
 msgstr "åéææåéï%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1550
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "äéäèïææåéææã <a href='%s'>åå</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1590
 msgid "not capable"
 msgstr "åäå"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1597
 msgid "offline"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "invalid contact"
 msgstr "ææèçä"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "permission denied"
 msgstr "æéäè"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "too long message"
 msgstr "ææåé"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "not implemented"
 msgstr "åæåç"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "unknown"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "èéï"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1695
 #, c-format
 msgid "Topic set to: %s"
 msgstr "èéèèçäï%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "èéè %s èçäï%s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1702
 msgid "No topic defined"
 msgstr "æèçèé"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2218
 msgid "(No Suggestions)"
 msgstr "(ææåè)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2286
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "æåâ%sâååå"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2323
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "æåâ%sâå %s åå"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2393
 msgid "Insert Smiley"
 msgstr "æåèæ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2411
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "åé(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2468
 msgid "_Spelling Suggestions"
 msgstr "æååè(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "Failed to retrieve recent logs"
 msgstr "èåæèæååè"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2718
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s åæåèæ"
@@ -1563,12 +1550,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:2730
+#: ../libempathy-gtk/empathy-chat.c:2725
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s è %2$s èå"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2728
 #, c-format
 msgid "%s was kicked"
 msgstr "%s èèå"
@@ -1576,17 +1563,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:2741
+#: ../libempathy-gtk/empathy-chat.c:2736
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s åè %s çæ"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2739
 #, c-format
 msgid "%s was banned"
 msgstr "%s èçæ"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s has left the room"
 msgstr "%s çåäèåå"
@@ -1596,17 +1583,17 @@ msgstr "%s çåäèåå"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2752
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2777
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ååäèåå"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2802
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s çååå %s"
@@ -1614,62 +1601,57 @@ msgstr "%s çååå %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * 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:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
+#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
+#: ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr "åæåèæ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Would you like to store this password?"
 msgstr "æåäååç?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3670
 msgid "Remember"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3680
 msgid "Not now"
 msgstr "äæçå"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "éè"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3728
 msgid "Wrong password; please try again:"
 msgstr "åçéèïèéèï"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3858
 msgid "This room is protected by a password:"
 msgstr "èäæéæçääåçäæçï"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3885
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr "åèæ"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4132
 msgid "Conversation"
 msgstr "åè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4137
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (çä)"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
-msgstr "æçæææçèåç"
+msgstr "æçæææçæèç"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
@@ -1687,17 +1669,16 @@ msgstr "æéäè"
 msgid "Could not block contact"
 msgstr "ææåèèçä"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "çèåèçèçä"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "ååï"
 
@@ -1705,546 +1686,494 @@ msgstr "ååï"
 msgid "Blocked Contacts"
 msgstr "ååèçèçä"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "ååéæåå(_C)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "åå"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "æåéæ(_O)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "çèåç"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "çåéäåå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "æåèçä"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "çç"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "åè %sï"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "çæ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "çåèåè %s äéæäåæèçæåï"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+msgid "Last seen:"
+msgstr "æèäçï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "åè(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "æååï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "äæèçäæç"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "èæææï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "èéèæ"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "çåææï"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "åèçæ(_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "åå"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "äåååå(_L)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "äé"
 
-#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
-msgid "Search contacts"
-msgstr "æçèçä"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "ææ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "éé"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "éæ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "éä"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+msgid "Search contacts"
+msgstr "æçèçä"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "æåèçä(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "ææåèçä"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "æçèæäçäæï"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "äåçæèèæçéïèèï"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "ééï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:747
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "åæ ISO ççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:749
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "ååï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:751
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "çï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:753
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "ååï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "ååï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:757
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-msgstr "éæççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "èéï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "åççï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "æåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:765
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "æéï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:767
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "ææï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:769
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "æèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:771
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URIï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:773
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "åççåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:775
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "éèï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:777
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "åçèå(ç)ï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "æåèå(ç)ï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:781
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "éåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:783
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "æäæåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:785
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "çåéåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:787
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "æèææäï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:791
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "çåï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:793
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "ææï"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
-msgid "Location"
-msgstr "äç"
-
-#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
-#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:659
-msgid "%B %e, %Y at %R UTC"
-msgstr "%B %e,%Y ä %R UTC æé"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:997
+#: ../libempathy-gtk/empathy-contact-widget.c:168
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "äååå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:224
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ææäååå"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
-msgid "Personal Details"
-msgstr "ääèæ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "èçäèæ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "Full name"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Phone number"
-msgstr "çèåç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "E-mail address"
-msgstr "çåéäåå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-msgid "Website"
-msgstr "çç"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-msgid "Birthday"
-msgstr "çæ"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Last seen:"
-msgstr "æèäçï"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
-msgid "Connected from:"
-msgstr "èæææï"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
-msgid "Away message:"
-msgstr "çåææï"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "work"
-msgstr "åå"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "home"
-msgstr "äé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "mobile"
-msgstr "ææ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "voice"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "preferred"
-msgstr "éé"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "éæ"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-msgid "parcel"
-msgstr "éä"
-
 #. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
+#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "æèçï"
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "æèç"
 
-#. Alias
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ååï"
+#: ../libempathy-gtk/empathy-user-info.c:449
+msgid "Alias"
+msgstr "åå"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>äç</b>ä(ææï\t"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "èçäèæ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "ååéäæèæ..."
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>äç</b>ä(ææï\t"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
 msgstr "åæçäæ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
-msgstr "æäççï"
+msgid "OS"
+msgstr "æäçç"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
-msgstr "çæï"
+msgid "Version"
+msgstr "çæ"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
-msgstr "åæçï"
+msgid "Client"
+msgstr "åæç"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "ç"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "éæææåèèçäååçççãæææåäéæåäççïäåääéæã"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "æåçç(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "éæ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "çç"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "æåèçä"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "åè %sï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "çåèåè %s äéæäåæèçæåï"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "ääçæåèåèï"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ääçæææèåèï"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "åè(_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "äæèçäæç"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "çèèçääæ"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "åçåçèçä"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts æåè"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "èåè gnome-contacts æèéèçäèæã"
+
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:173
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 msgid "Select account to use to place the call"
 msgstr "éæèçäææçèçåå"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:352
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "Mobile"
 msgstr "ææ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:419
 msgid "Work"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:421
 msgid "HOME"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:662
 msgid "_Block Contact"
 msgstr "åèèçä"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:718
+msgid "Delete and _Block"
+msgstr "åéååè(_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:780
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æççæèåéèçäâ%sâåï"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:789
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"ææåçæåæèåéåçåçèçä'%s' ï ææèååéææèçåçåçèçä"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:800
+msgid "Removing contact"
+msgstr "åéèçä"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "åé(_R)"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:1
+#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "èå(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "çä(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1295
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ééåå(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1328
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "èéåå(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "æèäè(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
 msgid "Send File"
 msgstr "åéæä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1428
 msgid "Share My Desktop"
 msgstr "åäæçæé"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "æè"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts æåè"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "èåè gnome-contacts æèéèçäèæã"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1483
 msgid "Infor_mation"
 msgstr "äæ(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1532
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "çè(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1648
+#: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "éèåæèåå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1694
 msgid "_Invite to Chat Room"
 msgstr "éèåèåå(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:1890
 msgid "_Add Contactâ"
 msgstr "æåèçä(_A)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "åéååè(_B)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2373
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æççèåéççâ%sâåï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 msgid "Removing group"
 msgstr "åéçç"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "åé(_R)"
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+msgid "Re_name"
+msgstr "éåå"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "æççæèåéèçäâ%sâåï"
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "ééï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "åæ ISO ççï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "ååï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "çï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "ååï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "ååï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "éæççï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "èéï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "åççï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "æåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "æéï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "ææï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "æèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URIï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "åççåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "éèï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "åçèå(ç)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "æåèå(ç)ï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "éåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "æäæåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "çåéåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "æèææäï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "çåï"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "çåï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "ææï"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "äç"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"ææåçæåæèåéåçåçèçä'%s' ï ææèååéææèçåçåçèçä"
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e,%Y ä %R UTC æé"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "åéèçä"
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "ååï"
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "æèçï"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2283,30 +2212,51 @@ msgstr "æåæåå"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+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:101
+msgid "People nearby"
+msgstr "éèçä"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+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>æççèäåèã"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "åå"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "å %s èå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "ä %s èå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Yå%mæ%dæ %A"
@@ -2324,92 +2274,92 @@ msgstr "<i>* %s %s</i>"
 msgid "<b>%s:</b> %s"
 msgstr "<b>%sï</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ç"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s å"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "éèæéï%sïçæä %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "äå"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "æå"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%Yå%mæ%dæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "éæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "è"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "äæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "ææèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:25
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "éè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "æç"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "ååçèééè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "æææç"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "äää"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "çåèåéäåçåéåèæåï"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "åéæé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "ääääçåéï"
 
@@ -2419,7 +2369,6 @@ msgstr "æä(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "_Edit"
 msgstr "çè(_E)"
 
@@ -2432,13 +2381,12 @@ msgid "Profile"
 msgstr "äääæ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "èå"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-streamed-media-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:24
 msgid "Video"
 msgstr "èé"
 
@@ -2450,120 +2398,123 @@ msgstr "ç 2 é"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">æåèå...</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "æåçææåäçåçååï"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "æåæåå"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "èåääèçäæèæçèåçï"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "èéåå(_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "ééåå(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "æåéè"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "èçääçç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "æåçèçäæææäææç"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "éæçèçääææåèçåäè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "æèæçåèäæåèäåå"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "ææäéæçèçäåèåè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "æåèæééåè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "ééåæ"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "æåéèéèæèååæéé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "æåæææèè"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "æçèé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 msgid "There was an error starting the conversation"
 msgstr "åèåèæåé"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:200
-msgid "Enter a contact identifier or phone number:"
-msgstr "èåääèçäæèæçèåçï"
-
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "æååè"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-msgid "_Video Call"
-msgstr "èéåå(_V)"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-msgid "_Audio Call"
-msgstr "ééåå(_A)"
-
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
-msgid "New Call"
-msgstr "æåéè"
-
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, c-format
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "åå <b>%s</b> éèåè"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"èåæçåååç\n"
-"<b>%s</b>"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:164
+#: ../libempathy-gtk/empathy-presence-chooser.c:200
 msgid "Custom Messageâ"
 msgstr "èåäææ..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:217
+#: ../libempathy-gtk/empathy-presence-chooser.c:219
 msgid "Edit Custom Messagesâ"
 msgstr "çèèåäææ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr "çåçéåçèåäçæ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr "çåèçåçèåäçæ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>ååäæ: %s</b>\n"
+"<small><i>æä Enter èçæäæææä Esc åæã</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
 msgid "Set status"
 msgstr "èççæ"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 msgid "Custom messagesâ"
 msgstr "èåäææ..."
 
@@ -2571,11 +2522,15 @@ msgstr "èåäææ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:608
 #, c-format
 msgid "New %s account"
 msgstr "æå %s åå"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "ååååå(_M)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "ææï"
@@ -2640,31 +2595,34 @@ msgstr "èééèçæ"
 msgid "Edit Custom Messages"
 msgstr "çèèåäææ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "èéèæ"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1104
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s åæåççæååè"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr "æç(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "æå(_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1125
 #, c-format
 msgid "Message edited at %s"
 msgstr "ææä %s èçè"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1841
 msgid "Normal"
 msgstr "æé"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "çå"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "çæ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "æç"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "èè"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "èåæååææäçèäææéèã"
@@ -2740,30 +2698,48 @@ msgstr "äåæçèæèäææéæ"
 msgid "Certificate Details"
 msgstr "èäèæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "æææå URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "éææä"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "çéäèïææäåæä"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "äåææäéè %s çéçéïäçåäæ %sïèéæåääçã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "ä %s äæçæä"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "èäçäçèæçäääæã"
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+msgid "<b>Personal Details</b>"
+msgstr "<b>ääèæ</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "ååéæåå(_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "æåéæ(_O)"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "ååèèçå"
@@ -2931,54 +2907,14 @@ msgstr "èæèè"
 msgid "Vietnamese"
 msgstr "èåè"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "Select..."
-msgstr "éæ..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "_Select"
-msgstr "éæ(_S)"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "æéèäæ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "åæææ(Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "ååæäèåèæ"
-
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "ååæäæçèçäåè"
-
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr " - Empathy åæéèåæç"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "èçååççååé"
-
-#: ../src/empathy.c:643
-#, 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-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3028,6 +2964,7 @@ msgstr ""
 "Aron Xu <happyaron xu gmail com>, 2009, 2010\n"
 "Tao Wang <dancefire gmail com>, 2010\n"
 "Mike Manilone <crtmike gmail com>, 2012\n"
+"Cheng Lu <chenglu1990 gmail com>, 2012\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n";
@@ -3038,44 +2975,68 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n";
 "  yuane https://launchpad.net/~yuane";
 
+#: ../src/empathy-accounts.c:182
+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 unless there are only \"People Nearby\" accounts"
+msgstr "åæâéèçäâååçæåäæçääåèæ"
+
+# lainmeïåæéæçåçåå(æå gabble/jabber/foo_40example_2eorg0)
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "éåéæçååå(å gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<åå ID>"
+
+#: ../src/empathy-accounts.c:197
+msgid "- Empathy Accounts"
+msgstr "- Empathy åå"
+
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "Empathy åå"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:68
 #, 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:76
+#: ../src/empathy-accounts-dialog.c:72
 msgid "Your new account has not been saved yet."
 msgstr "æçæååèææäåã"
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
 msgid "Connectingâ"
 msgstr "æåèæ..."
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline â %s"
 msgstr "çç - %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr "åæå - %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr "çç - æåççç"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "æççæ"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:492
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3084,64 +3045,62 @@ msgstr ""
 "åäæèæäèääæåãäææçåçïæäæèæåèççãèåè telepathy-"
 "haze åéæååæçäèæèçæçèæã"
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr "çç - ååèçç"
 
-#: ../src/empathy-accounts-dialog.c:585
+#: ../src/empathy-accounts-dialog.c:608
 msgid "Edit Connection Parameters"
 msgstr "çèèæåæ"
 
-#: ../src/empathy-accounts-dialog.c:750
-msgid "Failed to retrieve your personal information from the server."
-msgstr "äæååèåæçäääæåèã"
-
-#: ../src/empathy-accounts-dialog.c:756
-msgid "Go online to edit your personal information."
-msgstr "èäçäçèæçäääæã"
-
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "çèèæåæ(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1266
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æèäçèäçé %s åï"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1270
 msgid "This will not remove your account on the server."
 msgstr "èääåéæååäçååã"
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1475
 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:1755
-msgid "_Enable"
-msgstr "åç(_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1666
+msgid "_Enabled"
+msgstr "ååç(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "çç(_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1689
+msgid "Rename"
+msgstr "éåå"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2105
 msgid "_Skip"
 msgstr "èè(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2188
+#: ../src/empathy-accounts-dialog.c:2109
 msgid "_Connect"
 msgstr "èæ(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2288
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "æåèåéæçåïæåçäæåäåãæçåèççåï"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2431
+msgid "Messaging and VoIP Accounts"
+msgstr "ææå VoIP åå"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "åå(_I)..."
@@ -3160,153 +3119,178 @@ msgstr "èæåääæååïæéåéèäææèäççæäå
 msgid "No protocol backends installed"
 msgstr "æåèåèåç"
 
-#: ../src/empathy-auth-client.c:288
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
 msgstr " - Empathy èèåæç"
 
-#: ../src/empathy-auth-client.c:304
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
 msgstr "Empathy èèåæç"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr "ååæäèåèæ"
+
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "ååæäæçèçäåè"
+
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr " - Empathy åæéèåæç"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr "èçååççååé"
+
+#: ../src/empathy.c:625
+#, 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-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy èé/èéåæç"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy èé/èéåæç"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "åæå"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "äå"
-
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "äé"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s åååèååæïäæåææåäåääéèã"
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "éé"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+msgid "i"
+msgstr "i"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "äèæ(_S)"
+#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
+msgstr "æç"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "ééèå"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "%s çèéåå"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "èéèå"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s çæç"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "çèéç"
+#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "æç"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "èçäæ"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+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:1211
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1861
 #, c-format
 msgid "Call with %s"
 msgstr "ä %s éè"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2113
 msgid "The IP address as seen by the machine"
 msgstr "æåæèç IP åå"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2115
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet äæååæèç IP åå"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2117
 msgid "The IP address of the peer as seen by the other side"
 msgstr "åäææèç IP åå"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2119
 msgid "The IP address of a relay server"
 msgstr "äèæåå IP åå"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2121
 msgid "The IP address of the multicast group"
 msgstr "åæçç IP åå"
 
-#: ../src/empathy-streamed-media-window.c:1837
-#: ../src/empathy-streamed-media-window.c:1840
-#: ../src/empathy-streamed-media-window.c:1843
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "æç"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2874
+msgid "On hold"
+msgstr "æè"
+
+#: ../src/empathy-call-window.c:2876
+msgid "Mute"
+msgstr "éé"
+
+#: ../src/empathy-call-window.c:2878
+msgid "Duration"
+msgstr "æé"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2881
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "åèæ â %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:2977
 msgid "Technical Details"
 msgstr "ææçè"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3016
 #, 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:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3021
 #, 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:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3027
 #, 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:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3033
 msgid "There was a failure on the network"
 msgstr "ççåçääéè"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3037
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ååæéèçééæåèææåæççèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3040
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ååæéèçèéæåèææåæççèäåè"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3052
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3316,28 +3300,36 @@ msgstr ""
 "Telepathy çäåçäääæåãè<a href=\"%s\">ææèäéè</a>ïåéäååè"
 "åéâèèâçåæéåçæåã"
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3061
 msgid "There was a failure in the call engine"
 msgstr "åååæéåçäääæé"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3064
 msgid "The end of the stream was reached"
 msgstr "ååèæçæå"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3104
 msgid "Can't establish audio stream"
 msgstr "äèåçééæ"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
-msgid "Can't establish video stream"
-msgstr "äèåçèéæ"
+#: ../src/empathy-call-window.c:3114
+msgid "Can't establish video stream"
+msgstr "äèåçèéæ"
+
+#: ../src/empathy-call-window.c:3151
+#, c-format
+msgid "Your current balance is %s."
+msgstr "æååçäéä %sã"
+
+#: ../src/empathy-call-window.c:3155
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "åäèïæäçåäéäèäæäææéèã"
+
+#: ../src/empathy-call-window.c:3157
+msgid "Top Up"
+msgstr "åå"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "éè(_C)"
 
@@ -3354,23 +3346,18 @@ msgid "_Settings"
 msgstr "èç(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "æç(_V)"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "åå(_H)"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "åå(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "èè(_D)"
 
@@ -3391,12 +3378,10 @@ msgid "Disable camera"
 msgstr "çççæ"
 
 #: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
 msgid "Hang up"
 msgstr "ææ"
 
 #: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Hang up current call"
 msgstr "ææåååå"
 
@@ -3421,67 +3406,65 @@ msgid "Display the dialpad"
 msgstr "æçæåç"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "åéèé"
-
-#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle video transmission"
 msgstr "åæèéäè"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "åééé"
-
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle audio transmission"
 msgstr "åæééäè"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:25
 msgid "Encoding Codec:"
 msgstr "ççåï"
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-msgid "Unknown"
-msgstr "æç"
-
-#: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:27
 msgid "Decoding Codec:"
 msgstr "èçåï"
 
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:28
 msgid "Remote Candidate:"
 msgstr "èçåéï"
 
-#: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:29
 msgid "Local Candidate:"
 msgstr "æååéï"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "éé"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM åæç"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "åç"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "èåå"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "èåèæ"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "ççèååæè"
+
+#: ../src/empathy-chat-window.c:280
 msgid "Close this window?"
 msgstr "åéæçåï"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:286
 #, 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:305
+#: ../src/empathy-chat-window.c:299
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3492,60 +3475,60 @@ msgid_plural ""
 msgstr[0] ""
 "åéæçååçå %u éèååãæåääåæåääææïéééæååã"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:310
 #, c-format
 msgid "Leave %s?"
 msgstr "çå %sï"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:312
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "æåääåæåæèæèååçääææïéééæååã"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Close window"
 msgstr "åéçå"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:331
 msgid "Leave room"
 msgstr "çåèåå"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d æè)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:680
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ååå %u ä)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:696
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (åæääç %d ææè)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:705
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ææäå %d ææè)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:942
 msgid "SMS:"
 msgstr "çäï"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "æååé %d æææ"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:970
 msgid "Typing a message."
 msgstr "èåææã"
 
@@ -3609,112 +3592,160 @@ msgstr "åçæç(_R)"
 msgid "_Detach Tab"
 msgstr "æçæç(_D)"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "åç"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "æççåçæå"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "èåå"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy èèå"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "èåèæ"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy èèå"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "ççèååæè"
+#: ../src/empathy-debug-window.c:1599
+msgid "Save"
+msgstr "äå"
+
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr "Pastebin éæ"
+
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
+msgstr "Pastebin åå"
+
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "äæçèçææååãèææåäååæäã"
+
+#: ../src/empathy-debug-window.c:1856
+msgid "Debug Window"
+msgstr "èèçå"
+
+#: ../src/empathy-debug-window.c:1916
+msgid "Send to pastebin"
+msgstr "åéå pastebin"
+
+#: ../src/empathy-debug-window.c:1960
+msgid "Pause"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:1972
+msgid "Level "
+msgstr "çå "
+
+#: ../src/empathy-debug-window.c:1991
+msgid "Debug"
+msgstr "èè"
+
+#: ../src/empathy-debug-window.c:1996
+msgid "Info"
+msgstr "äæ"
+
+#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+msgid "Message"
+msgstr "ææ"
+
+#: ../src/empathy-debug-window.c:2006
+msgid "Warning"
+msgstr "èå"
+
+#: ../src/empathy-debug-window.c:2011
+msgid "Critical"
+msgstr "åæ"
+
+#: ../src/empathy-debug-window.c:2016
+msgid "Error"
+msgstr "éè"
+
+#: ../src/empathy-debug-window.c:2035
+msgid "Time"
+msgstr "æé"
+
+#: ../src/empathy-debug-window.c:2038
+msgid "Domain"
+msgstr "å"
+
+#: ../src/empathy-debug-window.c:2041
+msgid "Category"
+msgstr "çå"
+
+#: ../src/empathy-debug-window.c:2044
+msgid "Level"
+msgstr "çå"
+
+#: ../src/empathy-debug-window.c:2073
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "åéåçèæççäææèçèèæå"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:508
 msgid "Incoming video call"
 msgstr "ååçèééè"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
-msgid "Incoming call"
-msgstr "æç"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s èéæçãææèæååï"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:513
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s æçïææèæååï"
 
-#: ../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:555
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr "æç(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr "æå(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:557
 msgid "_Answer with video"
 msgstr "äçèéæå(_A)"
 
-#: ../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:837
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr "èååéè"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr "éèæåå %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æéèæåå %s"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr "æç(_D)"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s åéèæåå %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "æèéèåå %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "ææ %s æääè"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
 msgid "Password required"
 msgstr "éèåç"
 
-#: ../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:1222
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3828,211 +3859,65 @@ msgstr "åä"
 
 #: ../src/empathy-ft-manager.ui.h:1
 msgid "File Transfers"
-msgstr "æääè"
-
-#: ../src/empathy-ft-manager.ui.h:2
-msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "äåèçéååæãååæåååèçæääè"
-
-#: ../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:209
-msgid "Import Accounts"
-msgstr "åååå"
-
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
-msgid "Import"
-msgstr "åå"
-
-#: ../src/empathy-import-widget.c:325
-msgid "Protocol"
-msgstr "åè"
-
-#: ../src/empathy-import-widget.c:349
-msgid "Source"
-msgstr "æ"
-
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "æäåç"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "åæåèæ"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr "æéèèçääååæèæçèéçèçäã"
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "æææååéé"
-
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr "åææïåèä %2$s ææåïæäèäç %1$s ååã"
-
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "åçèä"
-
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "åé"
-
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "éæèæ"
-
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "çèåå"
-
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "ç %s åå(%s)..."
-
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr "åååå"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "åå..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "èçä"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr "æéèåçääååæèæçèéçèçäã"
-
-#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "æéèåç %s ææçèéçèçäã"
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "èçäåè"
-
-#: ../src/empathy-roster-window.ui.h:1
-msgid "Account settings"
-msgstr "ååèç"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "æååè(_N)..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "æååå(_C)..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contactsâ"
-msgstr "æçèçä(_S)..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "æääè(_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Offline Contacts"
-msgstr "ççèçä(_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Show P_rotocols"
-msgstr "æçåè(_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Credit Balance"
-msgstr "ååäé"
-
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "èçäåå(_M)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "åå(_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "ååèçèçä(_B)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "ééé(_R)"
+msgstr "æääè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "åèçäåèäææ(_L)"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "äåèçéååæãååæåååèçæääè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "æååæå(_N)"
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "åå(_I)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "æçææå(_S)"
+#: ../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-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "æåèå(_A)"
+#: ../src/empathy-import-dialog.c:209
+msgid "Import Accounts"
+msgstr "åååå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "åèèå(_O)"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:302
+msgid "Import"
+msgstr "åå"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "çåèå(_C)"
+#: ../src/empathy-import-widget.c:311
+msgid "Protocol"
+msgstr "åè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "èåå(_R)"
+#: ../src/empathy-import-widget.c:335
+msgid "Source"
+msgstr "æ"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Joinâ"
-msgstr "åå(_J)..."
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "éèåäè"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "åååæèçèåå(_F)"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "éæääèçääååèäèï"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "ççæèå"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "éè"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "èåå"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "æå"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr "ææååèåå"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4045,597 +3930,691 @@ msgstr ""
 "éèåç: %s\n"
 "æå: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "æ"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "å"
 
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "ææååèåååè"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "ææåæèåååè"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "ååèåå"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "èåèåååäååæååèäçåääæåäèååã"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "èåå(_R)ï"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr "èåèååæåçæååïæççèçèåååååååçæååäã"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr "èåèååæåçæååïæäçèçèåååååååçæååäã"
+msgstr "èåèååæåçæååïæççèçèåååååååçæååäã"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "æåå(_S)ï"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "ææèåèåååè"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "èåååè"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "åå"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "äèéåç"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "æç"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+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:240
+msgid "Provide"
+msgstr "æä"
+
+#: ../src/empathy-preferences.c:143
 msgid "Message received"
 msgstr "æåäææ"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:144
 msgid "Message sent"
 msgstr "ååäææ"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:145
 msgid "New conversation"
 msgstr "æåè"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:146
 msgid "Contact comes online"
 msgstr "èçääçä"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:147
 msgid "Contact goes offline"
 msgstr "èçäççä"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:148
 msgid "Account connected"
 msgstr "åååèæ"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:149
 msgid "Account disconnected"
 msgstr "åååæå"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:386
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "æçå"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "çåæ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:657
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:663
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr "æçååæåèæ"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1032
 msgid "Preferences"
 msgstr "ééé"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show _smileys as images"
-msgstr "æçèæçåäåå(_S)"
-
 #: ../src/empathy-preferences.ui.h:2
-msgid "Show contact _list in rooms"
-msgstr "åèååæçèçäåè(_L)"
+msgid "Show groups"
+msgstr "æçåç"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "åè"
+msgid "Show account balances"
+msgstr "æçååäé"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+msgid "Contact List"
+msgstr "èçäåè"
+
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "èåååäï"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "ææç(_B)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "æçå(_W)"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "åæçååæçååää"
-
 #: ../src/empathy-preferences.ui.h:8
-msgid "_Automatically connect on startup"
-msgstr "ååæèåèæ(_A) "
+msgid "Show _smileys as images"
+msgstr "æçèæçåäåå(_S)"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "åèååæçèçäåè(_L)"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Log conversations"
 msgstr "èååè"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "åæçååæçååää"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "ååæèåèæ(_A) "
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Behavior"
 msgstr "èä"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "åè"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Enable bubble notifications"
 msgstr "åèææéç(_E)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:17
 msgid "Disable notifications when _away or busy"
 msgstr "çåæåçæççæç(_A)"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
 msgstr "åäèéçæåèæç"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
 msgstr "åèçääçæåèæç"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Enable notifications when a contact goes offline"
 msgstr "åèçäççæåèæç"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "æç"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid "_Enable sound notifications"
 msgstr "åçåééç(_E)"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Disable sounds when _away or busy"
 msgstr "çåæåçæççåé(_A)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "ææääåé"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "åé"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Use _echo cancellation to improve call quality"
 msgstr "äçååæåïäæåéèèé"
 
-#: ../src/empathy-preferences.ui.h:23
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"ååæéåääæçèéååæåææææïäåæäèçæäåèåèééãåææ"
-"æåæåéèæååäåæçåéææéïèåèåéååæéåéæéèã"
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ååæéåääæçèéååæåææææïäåæäèçæäåèåèééãåææ"
+"æåæåéèæååäåæçåéææéïèåèåéååæéåéæéèã"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Publish location to my contacts"
+msgstr "åæçèçäååäçäæ(_P)"
+
+#: ../src/empathy-preferences.ui.h:31
+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 åæ"
+"åççåääåæã "
+
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Reduce location accuracy"
+msgstr "éääçäæçå(_R)"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+msgstr "éç"
+
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "ææ(_C)"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "çç(_N)(IPïWi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "äçææï"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "èèåèäåæååèçåå"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "åèæåææçèèï"
+
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "æåææ"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "èåäé(_E)ï"
+
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
+msgstr "çæï"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "äé"
+
+#: ../src/empathy-roster-window.c:242
+msgid "Provide Password"
+msgstr "æäåç"
+
+#: ../src/empathy-roster-window.c:248
+msgid "Disconnect"
+msgstr "åæåèæ"
+
+#: ../src/empathy-roster-window.c:442
+msgid "You need to setup an account to see contacts here."
+msgstr "æéèèçääååæèæçèéçèçäã"
+
+#: ../src/empathy-roster-window.c:518
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "åææïåèä %2$s ææåïæäèäç %1$s ååã"
+
+#: ../src/empathy-roster-window.c:636
+msgid "Update software..."
+msgstr "åçèä"
+
+#: ../src/empathy-roster-window.c:642
+msgid "Reconnect"
+msgstr "éæèæ"
+
+#: ../src/empathy-roster-window.c:646
+msgid "Edit Account"
+msgstr "çèåå"
+
+#: ../src/empathy-roster-window.c:651
+msgid "Close"
+msgstr "åé"
+
+#: ../src/empathy-roster-window.c:788
+msgid "Top up account"
+msgstr "åååå"
+
+#: ../src/empathy-roster-window.c:1470
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "æéèåçääååæèæçèéçèçäã"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1478
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "æéèåç %s ææçèéçèçäã"
+
+#: ../src/empathy-roster-window.c:1556
+#, fuzzy
+#| msgid "You need to enable %s to see contacts here."
+msgid "Change your presence to see contacts here"
+msgstr "æéèåç %s ææçèéçèçäã"
+
+#: ../src/empathy-roster-window.c:1565
+msgid "No match found"
+msgstr "æææååéé"
+
+#: ../src/empathy-roster-window.c:1570
+msgid "No online contacts"
+msgstr "æåçèçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æååè(_N)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "æåéè(_C)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "èçä"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "æåèçä(_A)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "æçèçä(_S)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "ååèçèçä(_B)"
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Publish location to my contacts"
-msgstr "åæçèçäååäçäæ(_P)"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "èåå(_R)"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"éäåäçåæåçæææåçååãååååææççäæåääèååã GPS åæ"
-"åççåääåæã "
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "åå(_J)..."
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:29
-msgid "_Reduce location accuracy"
-msgstr "éääçäæçå(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "åååæèçèåå(_F)"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Privacy"
-msgstr "éç"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "ççæèå(_M)"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "æääè(_F)"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "ææ(_C)"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "åå(_A)"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Network (IP, Wi-Fi)"
-msgstr "çç(_N)(IPïWi-Fi)"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ééé(_R)"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "Location sources:"
-msgstr "äçææï"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "åå"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "èèåèäåæååèçåå"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "åä Empathy"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "Enable spell checking for languages:"
-msgstr "åèæåææçèèï"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "éå(_Q)"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "Spell Checking"
-msgstr "æåææ"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "ååèç"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "Chat Th_eme:"
-msgstr "èåäé(_E)ï"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr ""
 
-#: ../src/empathy-preferences.ui.h:40
-msgid "Variant:"
-msgstr "çæï"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æååè(_N)..."
 
-#: ../src/empathy-preferences.ui.h:41
-msgid "Themes"
-msgstr "äé"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "æååå(_C)..."
 
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "çæ"
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "éå(_Q)"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "åæ"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "éæ"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+msgid "Please enter your account details"
+msgstr "èåæçååèæ"
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "èé(_I)"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+msgid "Edit %s account options"
+msgstr "çè %s ååéé"
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "èéåé"
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+#, fuzzy
+#| msgid "Import your existing accounts"
+msgid "Integrate your IM accounts"
+msgstr "ååçæåå"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "èééè"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "ççææå VoIP åå"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "èéåå"
+#~ msgid "Show avatars"
+#~ msgstr "æçåå"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "åæååèçä"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "æååèçäåèåèåçåäæçååã"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "çæåé"
+#~ msgid "Show protocols"
+#~ msgstr "æçåè"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "çççæåæåéèé"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "æååèçäåèåèåçåäæçåèã"
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "éè"
+#~ msgid "Compact contact list"
+#~ msgstr "çåæçèçäåè"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "åççæïääåéèé"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "æåäçåæåæçèçäåèã"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "çæåå"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "èçäåèæåæä"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "åççæïååéèé"
+#~ msgid ""
+#~ "Which criterion to use when sorting the contact list. Default is to sort "
+#~ "by the contact's state with the value \"state\". A value of \"name\" will "
+#~ "sort the contact list by name."
+#~ msgstr ""
+#~ "äçäçæäææåèçäåèãéèæåääçåâçæâäæèçäçææåãå"
+#~ "åäâååâæåæååæåèçäåèã"
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "èçååèå"
+#~ msgid "Network:"
+#~ msgstr "ççï"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "äå"
+#~ msgid "Password:"
+#~ msgstr "åçï"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Pastebin éæ"
+#~ msgid "Port:"
+#~ msgstr "çåï"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Pastebin åå"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "%s æææçèçä ID"
 
-#: ../src/empathy-debug-window.c:1680
-#, c-format
-msgid "%s"
-msgstr "%s"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "äæçèçææååãèææåäååæäã"
+#~ msgid "_Block User"
+#~ msgstr "åèçæ(_B)"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "èèçå"
+#~ msgid "Decide _Later"
+#~ msgstr "äåååå(_L)"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "åéå pastebin"
+#~ msgid "Classic"
+#~ msgstr "çå"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "æå"
+#~ msgid "Simple"
+#~ msgstr "çæ"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "çå "
+#~ msgid "Clean"
+#~ msgstr "æç"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "èè"
+#~ msgid "Blue"
+#~ msgstr "èè"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "äæ"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "äæååèåæçäääæåèã"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "ææ"
+#~ msgid "_Enable"
+#~ msgstr "åç(_E)"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "èå"
+#~ msgid "_Disable"
+#~ msgstr "çç(_D)"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "åæ"
+#~ msgid "Contrast"
+#~ msgstr "åæå"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "éè"
+#~ msgid "Brightness"
+#~ msgstr "äå"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "æé"
+#~ msgid "Gamma"
+#~ msgstr "äé"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "å"
+#~ msgid "Volume"
+#~ msgstr "éé"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "çå"
+#~ msgid "_Sidebar"
+#~ msgstr "äèæ(_S)"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "çå"
+#~ msgid "Audio input"
+#~ msgstr "ééèå"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "åéåçèæççäææèçèèæå"
+#~ msgid "Video input"
+#~ msgstr "èéèå"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "éèåäè"
+#~ msgid "Dialpad"
+#~ msgstr "çèéç"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "éæääèçääååèäèï"
+#~ msgid "Details"
+#~ msgstr "èçäæ"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "éè"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "æç"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "äæçääåèæïåæææåäïåååïçåéå"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "åèæ â %d:%02dm"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "åæâéèçäâååçæåäæçääåèæ"
+#~ msgid "Send Video"
+#~ msgstr "åéèé"
 
-# lainmeïåæéæçåçåå(æå gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "éåéæçååå(å gabble/jabber/foo_40example_2eorg0)"
+#~ msgid "Send Audio"
+#~ msgstr "åééé"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<åå ID>"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "ç %s åå(%s)..."
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy åå"
+#~ msgid "Top Up..."
+#~ msgstr "åå..."
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy åå"
+#~ msgid "_Offline Contacts"
+#~ msgstr "ççèçä(_O)"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "æççåçæå"
+#~ msgid "Show P_rotocols"
+#~ msgstr "æçåè(_R)"
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy èèå"
+#~ msgid "Credit Balance"
+#~ msgstr "ååäé"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy èèå"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "èçäåå(_M)"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr " - Empathy IM åæç"
+#~ msgid "Find in Contact _List"
+#~ msgstr "åèçäåèäææ(_L)"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "åå"
+#~ msgid "Sort by _Name"
+#~ msgstr "æååæå(_N)"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "æç"
+#~ msgid "Sort by _Status"
+#~ msgstr "æçææå(_S)"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "æå"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "æåèå(_A)"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "äèéåç"
+#~ msgid "N_ormal Size"
+#~ msgstr "åèèå(_O)"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "æç"
+#~ msgid "_Compact Size"
+#~ msgstr "çåèå(_C)"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "æå"
+#~ msgid "_Joinâ"
+#~ msgstr "åå(_J)..."
 
-#. 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:246
-msgid "Provide"
-msgstr "æä"
+#~ msgid "Could not start room listing"
+#~ msgstr "ææååèåååè"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s åååèååæïäæåææåäåääéèã"
+#~ msgid "Could not stop room listing"
+#~ msgstr "ææåæèåååè"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
-msgid "i"
-msgstr "i"
+#~ msgid "Appearance"
+#~ msgstr "åè"
 
-#: ../src/empathy-call-window.c:2888
-msgid "On hold"
-msgstr "æè"
+#~ msgid "Redial"
+#~ msgstr "éæ"
 
-#: ../src/empathy-call-window.c:2891
-msgid "Mute"
-msgstr "éé"
+#~ msgid "V_ideo"
+#~ msgstr "èé(_I)"
 
-#: ../src/empathy-call-window.c:2893
-msgid "Duration"
-msgstr "æé"
+#~ msgid "Video Off"
+#~ msgstr "èéåé"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#~ msgid "Video Preview"
+#~ msgstr "èééè"
 
-#: ../src/empathy-call-window.c:3166
-#, c-format
-msgid "Your current balance is %s."
-msgstr "æååçäéä %sã"
+#~ msgid "Video On"
+#~ msgstr "èéåå"
 
-#: ../src/empathy-call-window.c:3170
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "åäèïæäçåäéäèäæäææéèã"
+#~ msgid "Call the contact again"
+#~ msgstr "åæååèçä"
 
-#: ../src/empathy-call-window.c:3172
-msgid "Top Up"
-msgstr "åå"
+#~ msgid "Camera Off"
+#~ msgstr "çæåé"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "ååååå(_M)"
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "çççæåæåéèé"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "æåçææåäçåçååï"
+#~ msgid "Preview"
+#~ msgstr "éè"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "æåæåå"
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "åççæïääåéèé"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "éèçä"
+#~ msgid "Camera On"
+#~ 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 åäèååçåæèæååääççäçääïåäåäåääèåãåææ"
-"æäçèäåèïèäçæçäåäææåæçã"
+#~ msgid "Enable camera and send video"
+#~ msgstr "åççæïååéèé"
 
-#: ../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 "Contact Map View"
+#~ msgstr "èçååèå"
 
 #~ msgid "There was an error while importing the accounts."
 #~ msgstr "ååååæåçéèã"
@@ -4665,9 +4644,6 @@ 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 "ææååéççåçååï"
 
@@ -4733,18 +4709,12 @@ msgstr ""
 #~ 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 çå"
 
@@ -4930,9 +4900,6 @@ msgstr ""
 #~ msgid "Saved Status Messages"
 #~ msgstr "äåçæäæ"
 
-#~ msgid "_Enabled"
-#~ msgstr "ååç(_E)"
-
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "ææåçæäååéçéäæäåååäåé"
 
@@ -4991,9 +4958,6 @@ msgstr ""
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "éæèæååèåè"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "ååèåååè"
-
 #~ msgid "Select a destination"
 #~ msgstr "éæççå"
 
@@ -5056,12 +5020,6 @@ msgstr ""
 #~ msgid "Unknown error"
 #~ msgstr "æççéè"
 
-#~ msgid "_Join..."
-#~ msgstr "åå(_J)..."
-
-#~ msgid "_New Conversation..."
-#~ msgstr "æååè(_N)..."
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "äèåååççåä %s: %s æå"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]