[empathy] [l10n] Update Japanese translation



commit 5c1ff60ee03e050fe7e1d824ec91dd63cc47613b
Author: Jiro Matsuzawa <jmatsuzawa gnome org>
Date:   Thu Aug 2 11:55:43 2012 +0900

    [l10n] Update Japanese translation
    
    Merge latest pot

 po/ja.po | 3991 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 1896 insertions(+), 2095 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index adf8c74..849ccb2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -39,16 +39,15 @@
 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-31 11:22+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n";
+"POT-Creation-Date: 2012-07-30 06:57+0000\n"
 "PO-Revision-Date: 2012-04-02 09:42+0900\n"
 "Last-Translator: Mako N <mako pasero net>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -69,7 +68,7 @@ msgstr "GoogleããããFacebookãMSN ãäãåããããããããã
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2550
+#: ../src/empathy-accounts-dialog.c:2463
 msgid "Messaging and VoIP Accounts"
 msgstr "ãããããããã VoIP ãããããã"
 
@@ -77,846 +76,693 @@ msgstr "ãããããããã VoIP ãããããã"
 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
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"èåçãåæ/åæçããããæçãããããããåçããããããããèåãããã"
+#: ../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 "èåæãèåæçãããããã"
 
-#: ../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 ãèåãããèåçãèåããããããããããããããããããããã"
+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 "ããããæãèåçãéåäããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ãããããããããçæããããããEmpathy ãèåçãéåäããããããããã"
-"ããããã"
+#: ../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 "èéãããããããäåãããããããããããããããã"
 
 #. 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.in.h:10
+#: ../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: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."
+#: ../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."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../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:13
+#: ../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:14
-msgid "Show avatars"
-msgstr "ãããããèçãããããã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"çæåãäèãããããããããããäãçæåããããããèçããããããã"
-"ãã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Show protocols"
-msgstr "ããããããèç"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "çæåãäèãäãçæåãããããããèçããããããããã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "çæåãäèãæéãèçãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../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:20
-msgid "Compact contact list"
-msgstr "çæåãäèãåãããããããã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Whether to show the contact list in compact mode."
-msgstr "çæåãäèãåããèçããããããããã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "ãããããããããéããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "ãããããããããéãããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../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:25
+#: ../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:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "æãããããããããããããããéããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../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:28
+#: ../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:29
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"åäãããããããéçéåãèçãããããã false ãããããããããããéç"
-"ãããã"
+#: ../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:30
+#: ../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:31
+#: ../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:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "çæåãããããèçãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../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:34
-msgid "Contact list sort criterion"
-msgstr "çæåãäèãäãæããéãæä"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-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 ""
-"çæåãäèãäãçæåãäãæããéãããæäãäçãããããããããã"
-"\"state\"ããçæåãçæãäãæãããã\"name\" ããããçæåãååãäã"
-"æãããã"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "éçããããããäããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../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:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "éåäãããããããããéãããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../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:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "ããããããåäããããããããéãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../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:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "ããããããéäããããããããéãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../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:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "ãããããæããäèãããããããããéãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../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:46
+#: ../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:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"çæåãããããããããããéçããããããããããåçããããããããã"
+msgstr "çæåãããããããããããéçããããããããããåçããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../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:49
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"çæåããããããããããããéçããããããããããåçããããããããã"
+#: ../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:50
+#: ../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:51
+#: ../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:52
+#: ../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:53
+#: ../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:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "ããããããåäããããããããããéçãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../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:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "éåäããããããããããéçããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../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:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"ããããããããããããããããåããããããååãããããããéçãã"
+msgstr "ããããããããããããããããåããããããååãããããããéçãã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-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.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:60
+#: ../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:61
+#: ../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:62
+#: ../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:63
+#: ../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:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "ãããããããããããäããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../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:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "èèåãçæåãäèãèçãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../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:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "ããããããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../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:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 #, fuzzy
 msgid "Chat window theme variant"
 msgstr "ããããããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 #, fuzzy
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "ããããããããããäçãããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../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:73
-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
+#, fuzzy
+#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+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:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Developer Tools ãæåããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Web Inspector ãããã WebKit developer tools ãæåãããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../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:77
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-msgstr ""
-"ããããçæã 'ååä' ã 'äæä' ãéäãããããããçåããããã'çä' "
-"çæããååããããããã"
+#: ../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."
+msgstr "ããããçæã 'ååä' ã 'äæä' ãéäãããããããçåããããã'çä' çæããååããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "èèåãããããéçãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../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:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "ããããããããããèè"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-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.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:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "ãããããããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+#: ../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:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "ãããããããèåããæå"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"ããããããããããããããããèå(tab)ããéãããããããããåããèåã"
-"ãæåããã"
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "ããããããããããããããããèå(tab)ããéãããããããããåããèåããæåããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "çæåãäèããããããããããããããããããããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Empathy ãçæåãããããããããããããããããããããããåçããããã"
-"ãããã"
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy ãçæåãããããããããããããããããããããããåçããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../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:89
+#: ../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 ãããããããããããã"
+msgstr "èèåãååãäãããæèããããããã D-Bus ãããããããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "ããããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../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:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "ããããäç"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../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:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "ãããéåããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../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:96
+#: ../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:97
-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.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:98
+#: ../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:99
+#: ../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:100
+#: ../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:101
+#: ../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:102
+#: ../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:103
+#: ../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:104
+#: ../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:105
+#: ../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:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy ãåæãçåãäãããããã"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../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:737
 msgid "No reason was specified"
 msgstr "ååãçåããããããã"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "çæãåæãèæããããã"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "ããããèéãããããããããã"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "äãçæåãããããèéãããããããããã"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "ãããããèéäãããããççãããã"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 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:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "ååäæãã"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ãããããèéãåäãããããããããããããåããããã"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "ããããåãçæãããããèéãããããããããããã"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "éæãããããããäèçãããããããããããã"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "éæããããããããçãã"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:75
+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 "èèå '%s' ãããããã (ããããã %s (%s))"
+
+#: ../libempathy/empathy-message.c:407 ../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:411
 #, c-format
 msgid "Called %s"
 msgstr "%s ããããéè"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:414
 #, 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:232
 msgid "Available"
 msgstr "ååä"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "åãèãä"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "éåä"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "éãä"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "ããããã"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "ååãçåããããããã"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "ååçæãããããããèåãããããã"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../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:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "èèãåæãããã"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "æååãããããã"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "ååãäçäãã"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "èææãããããã"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "äçãããèææãã"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "èææãæåæéãåããããã"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "èææãåçããããã"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "èææããããåãäèãããã"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "èææãæçãäèãããã"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "èææèèãçåãã"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "èææãééããããããã"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "æåãåçããããã"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "èææãæããããããã"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "æçãæåããããã"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "æçãççããããã"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "æçãåããããã"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "ããããããããããããããããæçæããã"
 
-#: ../libempathy/empathy-utils.c:357
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:356
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "æçãåããããããäãæããæçãçãæããããã"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "ããããããããããããããååããããã"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "ãããããããæçãåçããããããããåããçæããããã"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "èææãçååããããã"
 
-#: ../libempathy/empathy-utils.c:366
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:365
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "èææãååãããæåããããããããäããããããæåçãåããã"
 
-#: ../libempathy/empathy-utils.c:369
-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:368
+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:372
 msgid "Your software is too old"
 msgstr "ãããããããåãããã"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "åéããã"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google ããã"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../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 "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 "èèå '%s' ãããããã (ããããã %s (%s))"
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ããããããããã"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:323
-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:16
-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:"
+#, fuzzy
+#| msgid "Pass_word:"
+msgid "Pass_word"
 msgstr "ããããã(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
+#, fuzzy
+#| msgid "Screen _Name:"
+msgid "Screen _Name"
 msgstr "ãããããå(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
@@ -938,30 +784,32 @@ 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:"
+#, fuzzy
+#| msgid "_Port:"
+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:"
+#, fuzzy
+#| msgid "_Server:"
+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:17
+#: ../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 "èç"
@@ -979,31 +827,109 @@ 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 "ããããå(_D):"
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+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> username"
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../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 ã User ID ãååãããããã"
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../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
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../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.c:765
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "ããããå:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "éç(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "ãããã(_O)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1848
+msgid "This account already exists on the server"
+msgstr "ããããããããããããããããååããã"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+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:2269
+#, 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:2295
+#, c-format
+msgid "%s Account"
+msgstr "%s ããããã"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2299
+msgid "New account"
+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
+#, fuzzy
+#| msgid "Login I_D:"
+msgid "Login I_D"
+msgstr "ããããå(_D):"
+
+#: ../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> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "GroupWise ã User ID ãååãããããã"
+
+#: ../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:"
+#, fuzzy
+#| msgid "ICQ _UIN:"
+msgid "ICQ _UIN"
 msgstr "ICQ UIN(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
@@ -1011,8 +937,9 @@ msgid "<b>Example:</b> 123456789"
 msgstr "<b>ä:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
+#, fuzzy
+#| msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
 msgstr "æåéå(_A):"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
@@ -1023,54 +950,23 @@ msgstr "ICQ UIN ãååãããããã"
 msgid "What is your ICQ password?"
 msgstr "ICQ ãããããããååãããããã"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:205
-#: ../libempathy-gtk/empathy-account-widget-sip.c:238
-msgid "Auto"
-msgstr "èå"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:208
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:211
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:214
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:243
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:248
-msgid "Options"
-msgstr "Options"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:251
-msgid "None"
-msgstr "ãã"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "ãããããã"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Network:"
-msgstr "ãããããã:"
-
 # åãèããããããæåããããããããããèã(ããããååããéãåç)ã
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#, fuzzy
+#| msgid "Character set:"
+msgid "Character set"
 msgstr "æåãããããããã:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 #: ../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
@@ -1079,48 +975,52 @@ 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:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "äã"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "äã"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "ãããã"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-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 "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:12
-msgid "Nickname:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#, fuzzy
+#| msgid "Nickname:"
+msgid "Nickname"
 msgstr "ãããããã:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Password:"
-msgstr "ããããã:"
+#, fuzzy
+#| msgid "Quit message:"
+msgid "Quit message"
+msgstr "çäæãããããã:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Quit message:"
-msgstr "çäæãããããã:"
+#, fuzzy
+#| msgid "Real name:"
+msgid "Real name"
+msgstr "æå:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Real name:"
-msgstr "æå:"
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "ããããå:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "ãã IRC ããããããããã?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "IRC ããããããããäããã?"
 
@@ -1133,15 +1033,11 @@ msgstr "ãããã Facebook ãããããåãäããã?"
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
-"Facebook username if you don't have one."
+"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a Facebook username if you don't have one."
 msgstr ""
-"ãããããããããããåãããFacebook ãããããããæãååãããããããã"
-"ãããã\n"
-"ãããããã facebook.com/<b>badger</b> ãããã<b>badger</b> ãååãããã"
-"ããã\n"
-"ããæããããããããããã<a href=\"http://www.facebook.com/username/\";>ã"
-"ãããã</a>ãäãã Facebook ãããããåãéæããããããã"
+"ãããããããããããåãããFacebook ãããããããæãååãããããããããããã\n"
+"ãããããã facebook.com/<b>badger</b> ãããã<b>badger</b> ãååããããããã\n"
+"ããæããããããããããã<a href=\"http://www.facebook.com/username/\";>ããããã</a>ãäãã Facebook ãããããåãéæããããããã"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
@@ -1168,11 +1064,15 @@ msgid "I_gnore SSL certificate errors"
 msgstr "SSL ãèææãééããããããçè(_G)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
+#, fuzzy
+#| msgid "Priori_ty:"
+msgid "Priori_ty"
 msgstr "ååå(_T):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
+#, fuzzy
+#| msgid "Reso_urce:"
+msgid "Reso_urce"
 msgstr "ãããã(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
@@ -1180,13 +1080,13 @@ 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 "åã SSL ãäã(_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 "åã SSL ãäã(_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Jabber ID ãååãããããã"
@@ -1203,44 +1103,87 @@ msgstr "Jabber ããããããååãããããã"
 msgid "What is your desired Jabber password?"
 msgstr "åæãã Jabber ããããããååãããããã"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user hotmail com"
-msgstr "<b>ä:</b> user hotmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Windows Live ID ãååãããããã"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Windows Live ãããããããååãããããã"
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
+#, fuzzy
+#| msgid "Nic_kname:"
+msgid "Nic_kname"
 msgstr "ãããããã(_K):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "_Last Name"
 msgstr "å(_L):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
+#, fuzzy
+#| msgid "_First Name:"
+msgid "_First Name"
 msgstr "åå(_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
+#, fuzzy
+#| msgid "_Published Name:"
+msgid "_Published Name"
 msgstr "åç(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
+#, fuzzy
+#| msgid "_Jabber ID:"
+msgid "_Jabber ID"
 msgstr "Jabber ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
+#, fuzzy
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
 msgstr "E-ããããããã(_M):"
 
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>ä:</b> user hotmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "Windows Live ID ãååãããããã"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "Windows Live ãããããããååãããããã"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "èå"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "Register"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "ãã"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
+#, fuzzy
+#| msgid "_Username:"
+msgid "_Username"
 msgstr "ããããå(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
@@ -1264,7 +1207,9 @@ msgid "Miscellaneous Options"
 msgstr "ããäãããããã"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
+#, fuzzy
+#| msgid "STUN Server:"
+msgid "STUN Server"
 msgstr "STUN ãããã:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
@@ -1275,17 +1220,14 @@ 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:"
+#, fuzzy
+#| msgid "Mechanism:"
+msgid "Mechanism"
 msgstr "ããããã:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
@@ -1293,11 +1235,15 @@ msgid "Interval (seconds)"
 msgstr "éé (ç)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username:"
+#, fuzzy
+#| msgid "Authentication username:"
+msgid "Authentication username"
 msgstr "èèçããããå:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
+#, fuzzy
+#| msgid "Transport:"
+msgid "Transport"
 msgstr "ããããããã:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
@@ -1308,18 +1254,24 @@ 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
+#, fuzzy
+#| msgid "E-mail address"
+msgid "Local IP Address"
+msgstr "E-ããããããã"
 
-#: ../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! ã ID(_D):"
@@ -1332,6 +1284,14 @@ msgstr "äèãèèåããæåãçè(_G)"
 msgid "_Room List locale:"
 msgstr "èèåãäèãããåæ(_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 ãååãããããã"
@@ -1340,36 +1300,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:542
+#: ../libempathy-gtk/empathy-avatar-chooser.c:627
 msgid "Couldn't convert image"
 msgstr "çåãåæãããããããã"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:543
 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:903
 msgid "Couldn't save picture to file"
 msgstr "çåããããããäåãããããããã"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1027
 msgid "Select Your Avatar Image"
 msgstr "ãããããäçããçåãéæ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1035
 msgid "Take a picture..."
 msgstr "åçãæã..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1048
 msgid "No Image"
 msgstr "çåãã"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1105
 msgid "Images"
 msgstr "çåãããã"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1109
 msgid "All Files"
 msgstr "ãããããããã"
 
@@ -1377,6 +1337,35 @@ msgstr "ãããããããã"
 msgid "Click to enlarge"
 msgstr "ãããããããåãããããã"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, fuzzy, c-format
+#| msgid "Authentification failed for account <b>%s</b>"
+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:3725
+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"
@@ -1402,205 +1391,192 @@ 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:728
 msgid "Failed to open private chat"
 msgstr "ããããããããããããéããããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "ããäèãããããããããããããããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 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:968
+#, fuzzy
+#| msgid "invalid contact"
+msgid "Invalid contact ID"
+msgstr "çåãçæåãã"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: çåãäèããããããããããããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ãããã>: çåãäèããããããèå"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <èèå ID>: æããèèåãåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <èèå ID>: æããèèåãåå"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
+#: ../libempathy-gtk/empathy-chat.c:1068
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<èèå ID>] [<çç>]: èèå(ãããããããçåãèèå)ãéå"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ããããã ID> [<ããããã>]: ããããããããããããéå"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ããããã ID> <ããããã>: ããããããããããããéå"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ãããããã>: çåããããããããããããããããããåæ"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <ããããã>: ACTION ããããããçåãäèãéã"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
-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 "
-"join a new chat room\""
-msgstr ""
-"/say <ããããã>: <ããããã> ãçåãäèãéãèããããã '/' ãåãã"
-"ããããããéäããæãäãããããä: \"/say /join ãæããèèåãååãã"
-"ããäããã\""
+#: ../libempathy-gtk/empathy-chat.c:1084
+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 join a new chat room\""
+msgstr "/say <ããããã>: <ããããã> ãçåãäèãéãèããããã '/' ãåããããããããéäããæãäãããããä: \"/say /join ãæããèèåãååããããäããã\""
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <çæå ID>: çæåãããããæåãèç"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<ãããã>]: ãããããããããããããããããèçã<ãããã> ãæå"
-"ããããããäçææãèç"
+#: ../libempathy-gtk/empathy-chat.c:1092
+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:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "äãæ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "äæããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1282
 msgid "Unknown command; see /help for the available commands"
 msgstr "äæãããããããã/help ãåçåèããããããèçãããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1539
 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:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, 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:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
 #, 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:1551
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr ""
-"ããããããéäããããæéãäèãããããã<a href='%s'>èåãããããã</"
-"a>ã"
+msgstr "ããããããéäããããæéãäèãããããã<a href='%s'>èåãããããã</a>ã"
 
-#: ../libempathy-gtk/empathy-chat.c:1617
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "ããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "çåãçæåãã"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "æéãããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "ããããããéãããã"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "æåèãã"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "ååäæãã"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "ãããã:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "æãããããã: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, 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:1703
 msgid "No topic defined"
 msgstr "ãããããããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(ææãã)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, 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:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' ã %s ãèæãèåãã"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "ããããããæå"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1179
 msgid "_Send"
 msgstr "éä(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "ããããææ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "æèããããååãåæãããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ãåæãããã"
@@ -1608,12 +1584,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:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ã %2$s ã kick ããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ã kick ããããã"
@@ -1621,17 +1597,17 @@ msgstr "%s ã kick ããããã"
 #. 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:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ã %2$s ã BAN ããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s ã BAN ããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ãããèèåããéåãããã"
@@ -1641,17 +1617,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:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ãããèèåãååãããã"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ã %s ãããããã"
@@ -1659,55 +1635,50 @@ 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:1466
-#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "äé"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
 msgstr "ããããããäåãããã?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "èæãã"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3681
 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:3729
 msgid "Wrong password; please try again:"
 msgstr "ããããããééããããããååææãããããã:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "ããèèåãããããããäèãããããã:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3886
+#: ../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:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "ããããã"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "äè"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
+#: ../libempathy-gtk/empathy-chat.c:4138
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1732,17 +1703,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:503
-#: ../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 "ããããã:"
 
@@ -1750,254 +1720,6 @@ 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)"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "ããããéã(_O)"
-
-#. 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 "%Yå%b%eæ %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-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-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' ãããéçããããããããã?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "ãããã(_B)"
-
-#: ../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] "ããçæåãäåãäéåãããéåãã(_R)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "çéãããããã"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "çæåããããã(_B)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "ãããæãã(_L)"
-
-#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:496
-msgid "Search contacts"
-msgstr "çæåãæç"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:526
-msgid "Search: "
-msgstr "æç:"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:584
-msgid "_Add Contact"
-msgstr "çæåãèå(_A)"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
-msgid "No contacts found"
-msgstr "çæåãèããããããããã"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:618
-msgid "Your message introducing yourself:"
-msgstr "èåçäãããããã:"
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:626
-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 "%Yå%b%eæ %R UTC"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:997
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "ãããããäå"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
-#: ../libempathy-gtk/empathy-individual-widget.c:958
-msgid "Unable to save avatar"
-msgstr "ãããããäåããããã"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1455
-msgid "Personal Details"
-msgstr "åäãèç"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1458
-#: ../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 "æå:"
@@ -2026,6 +1748,10 @@ msgstr "èçæ"
 msgid "Last seen:"
 msgstr "åå(_L):"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "ãããã:"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:115
 #, fuzzy
 msgid "Connected from:"
@@ -2071,42 +1797,92 @@ msgstr ""
 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:610
+msgid "_Add Contact"
+msgstr "çæåãèå(_A)"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+msgid "No contacts found"
+msgstr "çæåãèããããããããã"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+msgid "Your message introducing yourself:"
+msgstr "èåçäãããããã:"
+
+#: ../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:170
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "ãããããäå"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+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:"
+#: ../libempathy-gtk/empathy-user-info.c:444
+#, fuzzy
+#| msgid "Identifier:"
+msgid "Identifier"
 msgstr "èåå:"
 
-#. Alias
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
+#: ../libempathy-gtk/empathy-user-info.c:449
+#, fuzzy
+#| msgid "Alias:"
+msgid "Alias"
 msgstr "åå:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>åæ</b> ã (date)\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> ã (date)\t"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
 msgstr "ããããããæå"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
+#, fuzzy
+#| msgid "OS:"
+msgid "OS"
 msgstr "OS:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
+#, fuzzy
+#| msgid "Version:"
+msgid "Version"
 msgstr "ããããã:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
+#, fuzzy
+#| msgid "Client:"
+msgid "Client"
 msgstr "ãããããã:"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:327
@@ -2114,12 +1890,8 @@ msgid "Groups"
 msgstr "ãããã"
 
 #: ../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 ""
-"ããçæåãçéãããããããéæãããããã (2ãääããããããéæãã"
-"ããããããåãéæãããããæãããã)"
+msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
+msgstr "ããçæåãçéãããããããéæãããããã (2ãääããããããéæããããããããåãéæãããããæãããã)"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
@@ -2131,179 +1903,328 @@ msgid "Select"
 msgstr "éæ"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:403
-#: ../src/empathy-roster-window.c:1970
 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] "ääã ID ãããããããã:"
 
-#: ../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] "ääã ID ãããããããããã:"
 
+#: ../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] "ããçæåãäåãäéåãããéåãã(_R)"
+
 #: ../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:347
 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:351
 #: ../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:416
 #, fuzzy
 msgid "Mobile"
 msgstr "ãããã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 #, fuzzy
 msgid "Work"
 msgstr "ää"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "HOME"
 msgstr "èå"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:661
 msgid "_Block Contact"
 msgstr "çæåããããã(_B)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+msgid "Delete and _Block"
+msgstr "åéãããããã(_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:779
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "æåã '%s' ãããçæåãåéãããã?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:788
+#, 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:799
+msgid "Removing contact"
+msgstr "çæåãåé"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+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:1226
+#: ../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:1261
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "éåéè(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
 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:1368
+#: ../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:1397
 msgid "Send File"
 msgstr "ãããããéä"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 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:1453
+#: ../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:1482
 msgid "Infor_mation"
 msgstr "æå(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
 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:1647
+#: ../src/empathy-chat-window.c:1235
 msgid "Inviting you to this room"
 msgstr "ããèèåãæåããã"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
 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:1889
 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:2374
 #, 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:2377
 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:2445
+#, fuzzy
+#| msgid "Real name:"
+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-view.c:2483
+#: ../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-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 "%Yå%b%eæ %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "åå:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-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"
@@ -2342,30 +2263,42 @@ 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:98
+msgid "People nearby"
+msgstr "People nearby"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
+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å%b%eæ %A %X"
@@ -2383,93 +2316,93 @@ 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 ""
 
-#: ../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å%b%eæ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1843
-#: ../libempathy-gtk/empathy-log-window.c:3471
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "ããã"
 
-#: ../libempathy-gtk/empathy-log-window.c:1942
-#: ../libempathy-gtk/empathy-log-window.c:2401
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "ããã"
 
-#: ../libempathy-gtk/empathy-log-window.c:2714
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "çæåãããèèå"
 
-#: ../libempathy-gtk/empathy-log-window.c:2923
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "æä"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "ããã"
 
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "æåãããã"
 
-#: ../libempathy-gtk/empathy-log-window.c:3043
-#: ../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:3048
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "çä"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "çä"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "åæããéè"
 
-#: ../libempathy-gtk/empathy-log-window.c:3072
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "çé"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../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:3768
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "ãããæå"
 
 # ææèãèéãããããããããããããããã:ãããã
-#: ../libempathy-gtk/empathy-log-window.c:3775
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "ããããã:"
 
@@ -2479,7 +2412,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)"
 
@@ -2492,13 +2424,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 "ããã"
 
@@ -2510,121 +2441,122 @@ msgstr ""
 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
 #, fuzzy
 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:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "çèããããããâ"
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "çèãããããããçéâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "ããããããããããçæãããããããæãåãããåéããã"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 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:385
+#, 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 ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "ååçæãèå"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "çèããããããâ"
 
@@ -2632,11 +2564,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:610
 #, 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 "æç:"
@@ -2701,31 +2637,36 @@ 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:1114
+#, fuzzy, 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:731
+msgid "_Decline"
+msgstr "ãæããã(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#, fuzzy
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "åãåã"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, c-format
 msgid "Message edited at %s"
 msgstr "%s ãçéããããããã"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 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 "ããããããããããæäããã ID ãæèãããããã"
@@ -2755,8 +2696,7 @@ msgid "The certificate is self-signed."
 msgstr "èææãèåçåããããããã"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr "èææãçèèãããèèåããããååãããããã"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2801,32 +2741,48 @@ msgstr "ããéæãåæãæçããèæãã"
 msgid "Certificate Details"
 msgstr "èææãèç"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1049
 msgid "Unable to open URI"
 msgstr "URI ãéãããã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1173
 msgid "Select a file"
 msgstr "ãããããéæ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1247
 msgid "Insufficient free space to save file"
 msgstr "ãããããäåããããçãåéãäèããããã"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1255
 #, 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 ããããããããåã"
-"åæãéããããããã"
+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:1301
 #, 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
+#, fuzzy
+#| msgid "Personal Details"
+msgid "<b>Personal Details</b>"
+msgstr "åäãèç"
+
+#. 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 "çåããããã"
@@ -2994,82 +2950,25 @@ msgstr "èæ"
 msgid "Vietnamese"
 msgstr "ããããè"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "éæ..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "éæ(_S)"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "ãããããããããã"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../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 "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy ãããããããããããã; ãããããããããèåãçèãã GNU äèå"
-"èåçèèåçæãçäçãããããããäéãçãåããæéãäãæããããã"
-"ãåéåãããåæãããããããããã"
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy ãããããããããããã; ãããããããããèåãçèãã GNU äèåèåçèèåçæãçäçãããããããäéãçãåããæéãäãæããããããåéåãããåæãããããããããã"
 
 #: ../src/empathy-about-dialog.c:85
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathy ãåçãããããããããæåããéåããããããããååãçäèã"
-"ããåçåçãããçåãççããããéåæãäèãããããããèçã GNU äè"
-"åèåçèèåçæããèããããã"
+msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "Empathy ãåçãããããããããæåããéåããããããããååãçäèãããåçåçãããçåãççããããéåæãäèãããããããèçã GNU äèåèåçèèåçæããèããããã"
 
 #: ../src/empathy-about-dialog.c:89
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"ãããããæããããããäçã GNU äèåèåçèèåçæãåããåãåããã"
-"ãããããããããããååããFree Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA ããæçãæããããããã"
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "ãããããæããããããäçã GNU äèåèåçèèåçæãåããåãåããããããããããããããååããFree Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA ããæçãæããããããã"
 
 #: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
@@ -3088,22 +2987,44 @@ msgstr ""
 "ææ äé <jmatsuzawa src gnome org>\n"
 "ææGNOMEããããä <http://www.gnome.gr.jp/>"
 
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "ããããããäãèçãããåç(ããããããã)ãéããçäãã"
+
+#: ../src/empathy-accounts.c:188
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "\"People Nearby\" ãããããããããããããããããäãèçããã"
+
+#: ../src/empathy-accounts.c:192
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "æåãäããããããããããéæãããããã (ä gabble/jabber/hoge_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:194
+msgid "<account-id>"
+msgstr "<ããããã ID>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- Empathy ãããããã"
+
+#: ../src/empathy-accounts.c:242
+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:70
 #, 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:74
 msgid "Your new account has not been saved yet."
 msgstr "æããããããããããäåãããããããã"
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "æçäâ"
 
@@ -3126,14 +3047,8 @@ msgid "Unknown Status"
 msgstr "äæãçæ"
 
 #: ../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 "
-"the account."
-msgstr ""
-"ãããããããããåãããããããããããããããããããäåããããããã"
-"çåããããããããtelepathy-haze ãããããããããããããããåèåããã"
-"ãããããçèããããããã"
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "ãããããããããåãããããããããããããããããããäåãããããããçåããããããããtelepathy-haze ãããããããããããããããåèåããããããããçèããããããã"
 
 #: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
@@ -3143,28 +3058,20 @@ msgstr "ããããã - ããããããçå"
 msgid "Edit Connection Parameters"
 msgstr "æçãããããããçé"
 
-#: ../src/empathy-accounts-dialog.c:773
-msgid "Failed to retrieve your personal information from the server."
-msgstr "ããããããåäæåãååããããåæããããã"
-
-#: ../src/empathy-accounts-dialog.c:779
-msgid "Go online to edit your personal information."
-msgstr "åäæåãçéãããããããããããããããããã"
-
-#: ../src/empathy-accounts-dialog.c:866
+#: ../src/empathy-accounts-dialog.c:796
 msgid "_Edit Connection Parameters..."
 msgstr "æçãããããããçé(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1362
+#: ../src/empathy-accounts-dialog.c:1298
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ããããããããã %s ãåéãããã?"
 
-#: ../src/empathy-accounts-dialog.c:1366
+#: ../src/empathy-accounts-dialog.c:1302
 msgid "This will not remove your account on the server."
 msgstr "ãããããããããããããããããããåéãããããããããããã"
 
-#: ../src/empathy-accounts-dialog.c:1602
+#: ../src/empathy-accounts-dialog.c:1507
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3172,24 +3079,27 @@ msgstr ""
 "åæãçæããäãããããããéæãããããããããã\n"
 "æåãççãããã?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1779
-msgid "_Enable"
-msgstr "æåå(_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1698
+msgid "_Enabled"
+msgstr "ããããã(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1780
-msgid "_Disable"
-msgstr "çåå(_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1721
+#, fuzzy
+#| msgid "Real name:"
+msgid "Rename"
+msgstr "æå:"
 
-#: ../src/empathy-accounts-dialog.c:2221
+#: ../src/empathy-accounts-dialog.c:2137
 msgid "_Skip"
 msgstr "ãããã(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2225
+#: ../src/empathy-accounts-dialog.c:2141
 msgid "_Connect"
 msgstr "æç(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2402
+#: ../src/empathy-accounts-dialog.c:2320
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3206,12 +3116,8 @@ msgid "Loading account information"
 msgstr "ããããããæåãèãèãä"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"æããããããããçéãããããããæåãåçããããããããããããããã"
-"ãããããããããããããããã"
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "æããããããããçéãããããããæåãåçããããããããããããããããããããããããããããããã"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
@@ -3225,187 +3131,195 @@ msgstr " - Empathy èèãããããã"
 msgid "Empathy authentication client"
 msgstr "Empathy èèãããããã"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "èåãããèåçããããããããã"
+
+#: ../src/empathy.c:436
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "èåæãçæåãäèãäãããããããèçããã"
+
+#: ../src/empathy.c:452
+msgid "- Empathy IM Client"
+msgstr "- Empathy ããããããããããããã"
+
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "ãããããããããããæçããã"
+
+#: ../src/empathy.c:630
+#, 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:195
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy éå/ãããããããããã"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+#: ../src/empathy-call.c:219
 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:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "ããããã(_S)"
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "çäããããã"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "éååå"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, 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:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s ãããããåãåããã"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "ããããããã"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "æå"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "èç"
+#: ../src/empathy-call-window.c:1496
+#: ../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:1861
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "%s ããéè"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2105
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr "ããããããèããã IP ãããã"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ãããããããäããããããèããã IP ãããã"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2118
 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:2111
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "ãããããããã IP ãããã"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2122
 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:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../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:2869
+msgid "On hold"
+msgstr "äç"
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "ãããã"
+
+#: ../src/empathy-call-window.c:2873
+msgid "Duration"
+msgstr "éèæé"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "æçãããã â %då%02dç"
+msgid "%s â %d:%02dm"
+msgstr "%s â %då%02dç"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2964
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "æèçãèç"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3003
+#: ../src/empathy-call-window.c:3011
 #, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s ããããããããããäãããããããããããããããããããããéåããã"
-"ããããçèããããã"
+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:3008
+#: ../src/empathy-call-window.c:3016
 #, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s ããããããããããäãããããããããããããããããããããåçããã"
-"ããããçèããããã"
+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:3014
+#: ../src/empathy-call-window.c:3022
 #, 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 ããæçãççããããããããããããäããããããçææçãèåãããã"
-"ããåèæãããããã"
+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:3020
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "ãããããããåéãççãããã"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3024
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"ããéèãåèãéåãããããããããäãããããããããããããããããã"
-"ããããã"
+#: ../src/empathy-call-window.c:3032
+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:3027
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"ããéèãåèãåçãããããããããäãããããããããããããããããã"
-"ããããã"
+#: ../src/empathy-call-window.c:3035
+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:3039
+#: ../src/empathy-call-window.c:3047
 #, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy ããããããããäãæåããããããççããããã<a href=\"%s\">ã"
-"ãäååãåå</a>ãããããããããæããããããããããã'ãããã' ããã"
-"ãããéãããããæäããããããã"
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Telepathy ããããããããäãæåããããããççããããã<a href=\"%s\">ããäååãåå</a>ãããããããããæããããããããããã'ãããã' ããããããéãããããæäããããããã"
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "éèãããããåéãççãããã"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3051
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "ããããããççãåéãããã"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3091
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "éåããããããççããããã"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "æåããããããççããããã"
 
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr "çåãæéã %s ããã"
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "æéãäèãããããããéèãããããã"
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr "èå"
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "éè(_C)"
 
@@ -3422,23 +3336,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)"
 
@@ -3459,12 +3368,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 "çåãéèãæãã"
 
@@ -3488,135 +3395,121 @@ msgstr "ããããããããèç"
 msgid "Display the dialpad"
 msgstr "ããããããããèç"
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "æåãéä"
-
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:22
 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:2514 ../src/empathy-call-window.c:2515
-#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517
-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:106
+msgid "- Empathy Chat Client"
+msgstr "- Empathy ãããããããããã"
+
+#: ../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:282
 msgid "Close this window?"
 msgstr "ããããããããéãããã?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:288
 #, c-format
-msgid ""
-"Closing this window will leave %s. You will not receive any further messages "
-"until you rejoin it."
-msgstr ""
-"ããããããããéããã %s ãéåããããããäåããããããããåãååã"
-"ãããåäããããã"
+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:301
 #, c-format
-msgid ""
-"Closing this window will leave a chat room. You will not receive any further "
-"messages until you rejoin it."
-msgid_plural ""
-"Closing this window will leave %u chat rooms. You will not receive any "
-"further messages until you rejoin them."
-msgstr[0] ""
-"ããããããéããã %u åãèèåããéåããããããäåããããããããå"
-"ãååããããåäããããã"
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "ããããããéããã %u åãèèåããéåããããããäåããããããããåãååããããåäããããã"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:312
 #, c-format
 msgid "Leave %s?"
 msgstr "%s ããéåãããã?"
 
-#: ../src/empathy-chat-window.c:315
-msgid ""
-"You will not receive any further messages from this chat room until you "
-"rejoin it."
+#: ../src/empathy-chat-window.c:314
+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:333
 msgid "Close window"
 msgstr "éãã"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Leave room"
 msgstr "éå"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, 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:682
 #, 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:698
 #, 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:707
 #, 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:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:952
 #, 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:972
 msgid "Typing a message."
 msgstr "ããããããååããããã"
 
@@ -3680,112 +3573,158 @@ 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:1603
+msgid "Save"
+msgstr "äå"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr "Pastebin ããã"
+
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "ããããããããã"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "Pastebin ãéä"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "äæåæ"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "ããã "
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "ãããã"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "ããããã"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "ææ"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "ããã"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "æå"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "ãããã"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "åé"
+
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "ããã"
+
+#: ../src/empathy-debug-window.c:2077
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "éæããæçãããããããããããããããæåãããããããããããã"
+
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ãããéèãçä"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483
-msgid "Incoming call"
-msgstr "çäããããã"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, 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:515
 #, 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:1489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s ãããããåãåããã"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "æåãã(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "åçãã(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "ããããåç(_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1489
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "%s ããããããããéèãçäãã"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "èèåããæå"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ããååãæå"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, 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:736
 msgid "_Join"
 msgstr "åå(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ããããããã %s ãæåãããã"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ãããã %s ããååãæåãåãåãããã"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:947
 #, 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:983 ../src/empathy-roster-window.c:224
 msgid "Password required"
 msgstr "ããããããåèãã"
 
-#: ../src/empathy-event-manager.c:1216
-#, fuzzy, 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:1120
 #, c-format
 msgid ""
 "\n"
@@ -3883,230 +3822,81 @@ msgstr "\"%s\" ãååæãããããããããã"
 #: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
-msgstr "ããããèçä \"%s\""
-
-#: ../src/empathy-ft-manager.c:1025
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1037
-msgid "File"
-msgstr "ãããã"
-
-#: ../src/empathy-ft-manager.c:1059
-msgid "Remaining"
-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 ""
-"ãããããåèãããããããèããããããããããçåããããããããããã"
-"ãããããããããã 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:303
-msgid "Import"
-msgstr "ããããããã"
-
-#: ../src/empathy-import-widget.c:312
-msgid "Protocol"
-msgstr "ããããã"
-
-#: ../src/empathy-import-widget.c:336
-msgid "Source"
-msgstr "æäå"
-
-#: ../src/empathy-roster-window.c:391
-#, fuzzy
-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
-#, fuzzy, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr "%s ãããããããã%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 "ãããããæé"
+msgstr "ããããèçä \"%s\""
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "ååäãçæå(_M)"
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
 
-#: ../src/empathy-roster-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "ããããã(_A)"
+#: ../src/empathy-ft-manager.c:1037
+msgid "File"
+msgstr "ãããã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "ããããäãçæå(_B)"
+#: ../src/empathy-ft-manager.c:1059
+msgid "Remaining"
+msgstr "æã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "èå(_R)"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+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 "ãããããåèãããããããèããããããããããçåããããããããããããããããããããã 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:303
+msgid "Import"
+msgstr "ããããããã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "ãããããããã(_C)"
+#: ../src/empathy-import-widget.c:312
+msgid "Protocol"
+msgstr "ããããã"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "èèå(_R)"
+#: ../src/empathy-import-widget.c:336
+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:636
+#: ../src/empathy-new-chatroom-dialog.c:410
+#, fuzzy
+#| msgid "Failed to retrieve recent logs"
+msgid "Failed to list rooms"
+msgstr "æèããããååãåæãããã"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4119,604 +3909,673 @@ msgstr ""
 "ããããããåè: %s\n"
 "ããããæ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "ãã"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "ããã"
 
-#: ../src/empathy-new-chatroom-dialog.c:666
-msgid "Could not start room listing"
-msgstr "èèåãäèäæãéåãããããããã"
-
-#: ../src/empathy-new-chatroom-dialog.c:676
-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
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"ååããèèåãååãååããããäãããäèãã1ãääãèèåãããããã"
-"ããããã"
+#: ../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 "ååããèèåãååãååããããäãããäèãã1ãääãèèåããããããããããã"
 
-#: ../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:3
+#, fuzzy
+#| msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+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 "ããèèåãæäãããããããããååãããããããããèèåãçååçãããããããããããååãçãããããããããã"
+
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"ããèèåãæäãããããããããååãããããããããèèåãçååçãã"
-"ãããããããããååãçãããããããããã"
+msgid "_Server:"
+msgstr "ãããã(_S):"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../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
+#, fuzzy
+msgid "Provide"
+msgstr "ããããã"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "ããããããåäãã"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "ããããããéäãã"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "æããäèãåãã"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:147
 msgid "Contact comes online"
 msgstr "çæåãããããããã"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "çæåããããããããã"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "èåãããããããã"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "èåããããããããã"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "èè"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:724
+#: ../src/empathy-preferences.c:638
 msgid "Juliet"
 msgstr "ãããããã"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:645
 msgid "Romeo"
 msgstr "ããã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ãããããããããã ! ãããããããããããã !"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
 msgstr "ãããããåããèèãåããæããã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:658
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ããããããããããããããããæäãããèèããã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
 msgstr "ãããããããããããããããããããã"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:664
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ããããèããã? ããçãèããã?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:667
 msgid "Juliet has disconnected"
 msgstr "ãããããããåæãããã"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1033
 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)"
+#, fuzzy
+#| msgid "Show contact groups"
+msgid "Show groups"
+msgstr "çæåãããããèçãããããã"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "åè"
+#, fuzzy
+msgid "Show account balances"
+msgstr "ããããããããããããèçãã"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2134
+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 "ããããããããããããããããããããéçãã(_C)"
 
-#: ../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 "éèãèãåäããããããããéåãäã(_E)"
 
-#: ../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:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "çæåãåæãåéãã(_P)"
 
-#: ../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 åæ"
-"ãåæçç1äãããçåããã"
+#: ../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 åæãåæçç1äãããçåããã"
+
+#. 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(_G)"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "æå(_C)"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ãããããã (IPãWi-Fi)(_N)"
+
+#: ../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
+#, fuzzy
+msgid "Variant:"
+msgstr "æä:"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "ããã"
+
+#: ../src/empathy-roster-window.c:241
+#, fuzzy
+msgid "Provide Password"
+msgstr "ããããã"
+
+#: ../src/empathy-roster-window.c:247
+msgid "Disconnect"
+msgstr "åæ"
+
+#: ../src/empathy-roster-window.c:418
+msgid "You need to setup an account to see contacts here."
+msgstr "çæåãèçãããããããããããèåããããããã"
+
+#: ../src/empathy-roster-window.c:505
+#, fuzzy, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "%s ãããããããã%s ããããããããææããããäããããã"
+
+#: ../src/empathy-roster-window.c:571
+msgid "Update software..."
+msgstr "ãããããããææ..."
+
+#: ../src/empathy-roster-window.c:577 ../src/empathy-roster-window.c:694
+msgid "Close"
+msgstr "éãã"
+
+#: ../src/empathy-roster-window.c:682
+msgid "Reconnect"
+msgstr "åæç"
+
+#: ../src/empathy-roster-window.c:688
+msgid "Edit Account"
+msgstr "ããããããçé"
+
+#: ../src/empathy-roster-window.c:868
+#, fuzzy
+#| msgid "Top up account credit"
+msgid "Top up account"
+msgstr "ããããããããããããèåãã"
+
+#: ../src/empathy-roster-window.c:1530
+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:1538
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "çæåãèçããããã%s ãæåãããããããã"
+
+#: ../src/empathy-roster-window.c:1902
+msgid "No match found"
+msgstr "èããããããããã"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "æããäè(_N)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#, fuzzy
+#| msgid "New Call"
+msgid "New _Call..."
+msgstr "æããéè"
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#, fuzzy
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "çæå"
 
-#. 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:4
+#, fuzzy
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "çæåãèå(_A)"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Privacy"
-msgstr "ãããããã"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#, fuzzy
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "çæåãæç(_S)â"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_GPS"
-msgstr "GPS(_G)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "ããããäãçæå(_B)"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "æå(_C)"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#, fuzzy
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "èèå(_R)"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ãããããã (IPãWi-Fi)(_N)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "ååãã(_J)"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "Location sources:"
-msgstr "åæãããã:"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ãæãåããèå(_F)"
 
-#: ../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:10
+#, fuzzy
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "ãæãåããçç"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "Enable spell checking for languages:"
-msgstr "ããããããããæåããã:"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ããããèé(_F)"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "Spell Checking"
-msgstr "ããããããã"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "ããããã(_A)"
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "Chat Th_eme:"
-msgstr "ããã(_E):"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "èå(_R)"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-roster-window-menubar.ui.h:15
 #, fuzzy
-msgid "Variant:"
-msgstr "æä:"
-
-#: ../src/empathy-preferences.ui.h:41
-msgid "Themes"
-msgstr "ããã"
+#| msgid "_Help"
+msgid "Help"
+msgstr "ããã(_H)"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "çæ"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#, fuzzy
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "Empathy"
 
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "çä(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "ããããã"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "ããããããèå"
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "ããã(_I)"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "æããäè(_N)â"
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "ãããå"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "æããéè(_C)â"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "ããããããããã"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "çæ"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "ãããå"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:176
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "çæåãåååãåã"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:207
+#, fuzzy
+#| msgid "Enter your account details"
+msgid "Please enter your account details"
+msgstr "ããããããèçãåå"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "ãããå"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, fuzzy, c-format
+#| msgid "Loading account information"
+msgid "Edit %s account options"
+msgstr "ããããããæåãèãèãä"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "ããããçåãããæåãéäãäæ"
+#~ msgid "Show avatars"
+#~ msgstr "ãããããèçãããããã"
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "ããããã"
+#~ msgid "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "çæåãäèãããããããããããäãçæåããããããèçããããããããã"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "ããããæåããããæåãéããã"
+#~ msgid "Show protocols"
+#~ msgstr "ããããããèç"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "ãããå"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "çæåãäèãäãçæåãããããããèçããããããããã"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "ããããæåãããæåãéä"
+#~ msgid "Compact contact list"
+#~ msgstr "çæåãäèãåãããããããã"
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "Contact Map View"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "çæåãäèãåããèçããããããããã"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "äå"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "çæåãäèãäãæããéãæä"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Pastebin ããã"
+#~ 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 "çæåãäèãäãçæåãäãæããéãããæäãäçãããããããããã\"state\"ããçæåãçæãäãæãããã\"name\" ããããçæåãååãäãæãããã"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr ""
+#~ msgid "Network:"
+#~ msgstr "ãããããã:"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
+#~ msgid "Password:"
+#~ msgstr "ããããã:"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "ããããããããã"
+#~ msgid "Port:"
+#~ msgstr "ãããçå:"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "Pastebin ãéä"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "â%sâ ãçåãçæå ID ãã"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "äæåæ"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%Yå%b%eæ %A"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "ããã "
+#~ msgid "_Block User"
+#~ msgstr "çæåããããã(_B)"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "ãããã"
+#~ msgid "Decide _Later"
+#~ msgstr "ãããæãã(_L)"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "æå"
+#~ msgid "Classic"
+#~ msgstr "ãããããã"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "ããããã"
+#~ msgid "Simple"
+#~ msgstr "ãããã"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "ææ"
+#~ msgid "Clean"
+#~ msgstr "ãããã"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "åé"
+#~ msgid "Blue"
+#~ msgstr "ããã"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "ããã"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "ããããããåäæåãååããããåæããããã"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "æå"
+#~ msgid "_Enable"
+#~ msgstr "æåå(_E)"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "ãããã"
+#~ msgid "_Disable"
+#~ msgstr "çåå(_D)"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "åé"
+#~ msgid "Contrast"
+#~ msgstr "ãããããã"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "ããã"
+#~ msgid "Brightness"
+#~ msgstr "æãã"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "éæããæçãããããããããããããããæåãããããããããããã"
+#~ msgid "Gamma"
+#~ msgstr "ããã"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "ååèãæå"
+#~ msgid "Volume"
+#~ msgstr "éé"
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "äèãæåããçæåãéãããããã"
+#~ msgid "_Sidebar"
+#~ msgstr "ããããã(_S)"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "æåãã"
+#~ msgid "Audio input"
+#~ msgstr "éååå"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "ããããããäãèçãããåç(ããããããã)ãéããçäãã"
+#~ msgid "Video input"
+#~ msgstr "ãããåå"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "\"People Nearby\" ãããããããããããããããããäãèçããã"
+#~ msgid "Dialpad"
+#~ msgstr "ããããããã"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"æåãäããããããããããéæãããããã (ä gabble/jabber/"
-"hoge_40example_2eorg0)"
+#~ msgid "Details"
+#~ msgstr "èç"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<ããããã ID>"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "äæ"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy ãããããã"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "æçãããã â %då%02dç"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy ãããããã"
+#~ msgid "Send Video"
+#~ msgstr "æåãéä"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr ""
+#~ msgid "Send Audio"
+#~ msgstr "éåãéä"
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy ããããã"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "%s (%s) ãèå..."
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy ããããã"
+#~ msgid "Top Up..."
+#~ msgstr "èå..."
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "- Empathy ãããããããããã"
+#~ msgid "_Offline Contacts"
+#~ msgstr "ããããããçæåãèç(_O)"
 
-#: ../src/empathy-notifications-approver.c:190
-msgid "Respond"
-msgstr "åçãã"
+#~ msgid "Show P_rotocols"
+#~ msgstr "ããããããèç(_R)"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1493
-msgid "Reject"
-msgstr "æå"
+#~ msgid "Credit Balance"
+#~ msgstr "ãããããæé"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1494
-msgid "Answer"
-msgstr "åç"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "ååäãçæå(_M)"
 
-#: ../src/empathy-notifications-approver.c:214
-msgid "Answer with video"
-msgstr "ããããåç"
+#~ msgid "Find in Contact _List"
+#~ msgstr "çæåãäèãæç(_L)"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
-msgid "Decline"
-msgstr "ãæã"
+#~ msgid "Sort by _Name"
+#~ msgstr "ååãäãæã(_N)"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
-msgid "Accept"
-msgstr "åãåã"
+#~ msgid "Sort by _Status"
+#~ msgstr "çæãäãæã(_S)"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
-#, fuzzy
-msgid "Provide"
-msgstr "ããããã"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "ãããããããéåããã(_A)"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s ãåãåãããããããããããããåãéèäãããã"
+#~ msgid "N_ormal Size"
+#~ msgstr "ãããããããéåããã(_O)"
 
-#. 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 ""
+#~ msgid "_Compact Size"
+#~ msgstr "ãããããããã(_C)"
 
-#: ../src/empathy-call-window.c:2860
-msgid "On hold"
-msgstr "äç"
+#~ msgid "_Joinâ"
+#~ msgstr "åå(_J)â"
 
-#: ../src/empathy-call-window.c:2863
-msgid "Mute"
-msgstr "ãããã"
+#~ msgid "Could not start room listing"
+#~ msgstr "èèåãäèäæãéåãããããããã"
 
-#: ../src/empathy-call-window.c:2865
-msgid "Duration"
-msgstr "éèæé"
+#~ msgid "Could not stop room listing"
+#~ msgstr "èèåãäèäæãåæãããããããã"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2868
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %då%02dç"
+#~ msgid "Appearance"
+#~ msgstr "åè"
 
-#: ../src/empathy-call-window.c:3138
-#, c-format
-msgid "Your current balance is %s."
-msgstr "çåãæéã %s ããã"
+#~ msgid "Redial"
+#~ msgstr "ããããã"
 
-#: ../src/empathy-call-window.c:3142
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "æéãäèãããããããéèãããããã"
+#~ msgid "V_ideo"
+#~ msgstr "ããã(_I)"
 
-#: ../src/empathy-call-window.c:3144
-msgid "Top Up"
-msgstr "èå"
+#~ msgid "Video Off"
+#~ msgstr "ãããå"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "åæååæåãååãã(_M)"
+#~ msgid "Video Preview"
+#~ msgstr "ããããããããã"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "ããçéãããããããããããã?"
+#~ msgid "Video On"
+#~ msgstr "ãããå"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "æããããããããèå"
+#~ msgid "Call the contact again"
+#~ msgstr "çæåãåååãåã"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "People nearby"
+#~ msgid "Camera Off"
+#~ 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 "Disable camera and stop sending 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 "Preview"
+#~ msgstr "ããããã"
 
-#~ msgid "%s"
-#~ msgstr "%s"
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "ããããæåããããæåãéããã"
+
+#~ msgid "Camera On"
+#~ msgstr "ãããå"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "ããããæåãããæåãéä"
+
+#~ msgid "Contact Map View"
+#~ msgstr "Contact Map View"
 
 #~ msgid "There was an error while importing the accounts."
 #~ msgstr "ãããããããããããäãããããççããããã"
@@ -4733,12 +4592,8 @@ msgstr ""
 #~ msgid "The error message was: %s"
 #~ msgstr "ãããããããã: %s"
 
-#~ msgid ""
-#~ "You can either go back and try to enter your accounts' details again or "
-#~ "quit this assistant and add accounts later from the Edit menu."
-#~ msgstr ""
-#~ "æããããããããèçãçéãããããããããããããçäããçéãããã"
-#~ "ããããããããåãèåãããããããããã"
+#~ msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
+#~ msgstr "æããããããããèçãçéãããããããããããããçäããçéããããããããããããåãèåãããããããããã"
 
 #~ msgid "An error occurred"
 #~ msgstr "ããããççãããã"
@@ -4746,9 +4601,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 "çæãããããããããçéã?"
 
@@ -4758,15 +4610,8 @@ msgstr ""
 #~ msgid "Enter the details for the new account"
 #~ msgstr "æããããããããèçãåå"
 
-#~ msgid ""
-#~ "With Empathy you can chat with people online nearby and with friends and "
-#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
-#~ "programs. With a microphone or a webcam you can also have audio or video "
-#~ "calls."
-#~ msgstr ""
-#~ "Empathy ãäãããèããäãåéãååã Google ããããAIMãWindows Live "
-#~ "ãäããããããããããããããããããããããããããããéåããããã"
-#~ "éèããããã"
+#~ msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
+#~ msgstr "Empathy ãäãããèããäãåéãååã Google ããããAIMãWindows Live ãäããããããããããããããããããããããããããããéåãããããéèããããã"
 
 #~ msgid "Do you have an account you've been using with another chat program?"
 #~ msgstr "äãããããããããããåçããããããããããããããã?"
@@ -4795,16 +4640,8 @@ msgstr ""
 #~ msgid "I do _not want to enable this feature for now"
 #~ msgstr "ããæèãäãæåããããããããã(_N)"
 
-#~ msgid ""
-#~ "You won't be able to chat with people connected to your local network, as "
-#~ "telepathy-salut is not installed. If you want to enable this feature, "
-#~ "please install the telepathy-salut package and create a People Nearby "
-#~ "account from the Accounts dialog"
-#~ msgstr ""
-#~ "ãããããããããããæçããäããããããããããããããããã"
-#~ "telepathy-salut ããããããããããããããããããããæèãæåãããã"
-#~ "ããtelepathy-salut ãããããããããããããããããããããããããã "
-#~ "People Nearby ãããããããäæããããããã"
+#~ msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
+#~ msgstr "ãããããããããããæçããäãããããããããããããããããtelepathy-salut ããããããããããããããããããããæèãæåããããããtelepathy-salut ãããããããããããããããããããããããããã People Nearby ãããããããäæããããããã"
 
 #~ msgid "telepathy-salut not installed"
 #~ msgstr "telepathy-salut ãããããããããããããã"
@@ -4824,10 +4661,6 @@ msgstr ""
 #~ msgid "Protocol:"
 #~ msgstr "ããããã:"
 
-#, fuzzy
-#~ msgid "Show account assistant"
-#~ msgstr "ããããããããããããèçãã"
-
 #~ msgid "Personal Information"
 #~ msgstr "åäãæå"
 
@@ -4851,8 +4684,7 @@ msgstr ""
 #~ msgid "_Unlinkâ"
 #~ msgstr "ããããåã(_U)â"
 
-#~ msgid ""
-#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgid "Completely split the displayed linked contacts into the separate contacts."
 #~ msgstr "èçããããããçæåããååãçæåãååãåéãããã"
 
 #~ msgid "_Link"
@@ -4861,12 +4693,8 @@ msgstr ""
 #~ msgid "Unlink linked contacts '%s'?"
 #~ msgstr "ããçæå '%s' ãããããåãããã?"
 
-#~ msgid ""
-#~ "Are you sure you want to unlink these linked contacts? This will "
-#~ "completely split the linked contacts into separate contacts."
-#~ msgstr ""
-#~ "ããããçæåãããããåãããã? ããçæåããååãçæåãååãåé"
-#~ "ãããã"
+#~ msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
+#~ msgstr "ããããçæåãããããåãããã? ããçæåããååãçæåãååãåéãããã"
 
 #~ msgctxt "Unlink individual (button)"
 #~ msgid "_Unlink"
@@ -4973,9 +4801,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "ããã"
 
-#~ msgid "_Enabled"
-#~ msgstr "ããããã(_E)"
-
 #~ msgid "Date"
 #~ msgstr "æä"
 
@@ -5008,11 +4833,8 @@ msgstr ""
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "ããããããåãèããåãåããããããã"
 
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr ""
-#~ "Empathy ãäããããããããããããããããæåãåãèããããåãåãã"
-#~ "ãããããããã"
+#~ msgid "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy ãäããããããããããããããããæåãåãèããããåãåãããããããããã"
 
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "åäæããããããéäãããããããããããããäèãããã"
@@ -5057,11 +4879,8 @@ msgstr ""
 #~ msgid "MC 4 accounts have been imported."
 #~ msgstr "MC 4 ãããããããããããæãããããã"
 
-#~ msgid ""
-#~ "Whether or not the Salut account has been created on the first Empathy "
-#~ "run."
-#~ msgstr ""
-#~ "Empathy ãåããèåããæã Salut ããããããçæããããããããã"
+#~ msgid "Whether or not the Salut account has been created on the first Empathy run."
+#~ msgstr "Empathy ãåããèåããæã Salut ããããããçæããããããããã"
 
 #~ msgid "Can't set an empty display name"
 #~ msgstr "çãèçåãèåããããã"
@@ -5090,8 +4909,7 @@ msgstr ""
 #~ msgid "Select a destination"
 #~ msgstr "äååãéæ"
 
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgid "The contact to display in the applet. Empty means no contact is displayed."
 #~ msgstr "ããããããäãèçããäéããã"
 
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
@@ -5129,17 +4947,13 @@ msgstr ""
 #~ "æåãåéãããããããããã?"
 
 #~ msgid ""
-#~ "Any associated conversations and chat rooms will NOT be removed if you "
-#~ "decide to proceed.\n"
+#~ "Any associated conversations and chat rooms will NOT be removed if you decide to proceed.\n"
 #~ "\n"
-#~ "Should you decide to add the account back at a later time, they will "
-#~ "still be available."
+#~ "Should you decide to add the account back at a later time, they will still be available."
 #~ msgstr ""
-#~ "ãããããããããåéãçèããããåéãããããããããééããäèã"
-#~ "ããããããããåéãããããã\n"
+#~ "ãããããããããåéãçèããããåéãããããããããééããäèãããããããããåéãããããã\n"
 #~ "\n"
-#~ "ããççãããããããããããèåãçããæãååçããããããããããã"
-#~ "ãã"
+#~ "ããççãããããããããããèåãçããæãååçããããããããããããã"
 
 #~ msgid "Add new"
 #~ msgstr "æããèåãã"
@@ -5163,8 +4977,7 @@ msgstr ""
 #~ msgstr "ãããååããããããããããããããèåããããã"
 
 #~ msgid "You don't have the needed external application to handle it."
-#~ msgstr ""
-#~ "ãããååããããããããããããããåéèåããåèããããããã"
+#~ msgstr "ãããååããããããããããããããåéèåããåèããããããã"
 
 #~ msgid "%s account"
 #~ msgstr "%s ããããã"
@@ -5175,12 +4988,6 @@ msgstr ""
 #~ msgid "Unknown error"
 #~ msgstr "ååäæãããããã"
 
-#~ msgid "_Join..."
-#~ msgstr "ååãã(_J)"
-
-#~ msgid "_New Conversation..."
-#~ msgstr "æããäè(_N)..."
-
 #~ msgid "Allow _GPS usage"
 #~ msgstr "GPSãäçãèåãã(_G)"
 
@@ -5196,12 +5003,8 @@ msgstr ""
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "%s ãããããããããããããããããèåããããã: %s"
 
-#~ msgid ""
-#~ "An invitation was offered for service %s, but you don't have the needed "
-#~ "application to handle it"
-#~ msgstr ""
-#~ "%s ãããããããããæåãåãåãããã (ãããããããåçããããã"
-#~ "ããããããåéèåããåèãããããã)"
+#~ msgid "An invitation was offered for service %s, but you don't have the needed application to handle it"
+#~ msgstr "%s ãããããããããæåãåãåãããã (ãããããããåçãããããããããããåéèåããåèãããããã)"
 
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "ããããããçæãããããããããããããããã"
@@ -5311,10 +5114,8 @@ msgstr ""
 #~ msgid "Re_fresh"
 #~ msgstr "ææ(_F)"
 
-#~ msgid ""
-#~ "This list represents all chat rooms hosted on the server you have entered."
-#~ msgstr ""
-#~ "ããäèããããããããæäããããããããããããããããèçãããã"
+#~ msgid "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "ããäèããããããããæäããããããããããããããããèçãããã"
 
 #~ msgid "<b>Contact List</b>"
 #~ msgstr "<b>äéããã</b>"



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