sort contacts by most recent event

[empathy.git] / po / en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index fe0f961d5266695525ae566776717c9596333525..54f73f68459da404f0d157e80e76bb576cf51848 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,90 +2,144 @@
 # Copyright (C) 2006 Empathy's COPYRIGHT HOLDER
 # This file is distributed under the same licence as the empathy package.
 # David Lodge <dave@cirt.net>, 2007, 2009.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012, 2013.
 # Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
+# Chris Leonard <cjl@laptop.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-12 11:18+0000\n"
-"PO-Revision-Date: 2010-09-22 19:37+0100\n"
-"Last-Translator: Philip Withnall <philip@tecnocode.co.uk>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-03-11 16:01+0000\n"
+"PO-Revision-Date: 2013-03-26 18:14+0100\n"
+"Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy Internet Messaging"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM Client"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "Compact contact list"
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Connection managers should be used"
-msgstr "Connection managers should be used"
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
+
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magic number used to check if sanity cleaning tasks should be run"
+
+#: ../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 ""
+"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:12
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
+msgid "Hide main window"
+msgstr "Hide main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Contact list sort criterion"
-msgstr "Contact list sort criterion"
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
+msgid "Hide the main window."
+msgstr "Hide the main window."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "Default directory to select an avatar image from"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Disable popup notifications when away"
-msgstr "Disable popup notifications when away"
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable sounds when away"
-msgstr "Disable sounds when away"
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
+msgid "Open new chats in separate windows"
+msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "Display incoming events in the status area"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -93,332 +147,296 @@ msgstr ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Empathy can publish the user's location"
-msgstr "Empathy can publish the user's location"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy can use the GPS to guess the location"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy can use the mobile phone network to guess the location"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy can use the network to guess the location"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy default download folder"
-msgstr "Empathy default download folder"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy has migrated butterfly logs"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy should auto-away when idle"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy should auto-connect on startup"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy should reduce the location's accuracy"
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy should use the avatar of the contact as the chat window icon"
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Enable WebKit Developer Tools"
-msgstr "Enable WebKit Developer Tools"
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
+msgid "Show contact groups"
+msgstr "Show contact groups"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable popup notifications for new messages"
-msgstr "Enable popup notifications for new messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable spell checker"
-msgstr "Enable spell checker"
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Hide main window"
-msgstr "Hide main window"
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide the main window."
-msgstr "Hide the main window."
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Nick completed character"
-msgstr "Nick completed character"
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Open new chats in separate windows"
-msgstr "Open new chats in separate windows"
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
+msgid "Play a sound for incoming messages"
+msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Path of the Adium theme to use"
-msgstr "Path of the Adium theme to use"
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
+msgid "Play a sound for outgoing messages"
+msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Play a sound for incoming messages"
-msgstr "Play a sound for incoming messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for outgoing messages"
-msgstr "Play a sound for outgoing messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pop up notifications if the chat isn't focused"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pop up notifications when a contact logs in"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pop up notifications when a contact logs out"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Show avatars"
-msgstr "Show avatars"
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show contact list in rooms"
-msgstr "Show contact list in rooms"
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show hint about closing the main window"
-msgstr "Show hint about closing the main window"
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show protocols"
-msgstr "Show protocols"
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "The default folder to save file transfers in."
-msgstr "The default folder to save file transfers in."
+#: ../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 ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "The last directory that an avatar image was chosen from."
-msgstr "The last directory that an avatar image was chosen from."
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The position for the chat window side pane"
-msgstr "The position for the chat window side pane"
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "The stored position (in pixels) of the chat window side pane."
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Use theme for chat rooms"
-msgstr "Use theme for chat rooms"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Whether Empathy can publish the user's location to their contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Whether Empathy can use the GPS to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Whether Empathy can use the mobile phone network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Whether Empathy can use the network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
+msgid "Chat window theme"
+msgstr "Chat window theme"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Whether Empathy has migrated butterfly logs."
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Whether Empathy should automatically log into your accounts on startup."
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"The theme variant that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
 msgstr ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
-"Whether to check words typed against the languages you want to check with."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Whether to check words typed against the languages you want to check with."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Whether to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging into the network."
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Whether to play a sound to notify of contacts logging out of the network."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to play a sound to notify of events."
-msgstr "Whether to play a sound to notify of events."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Whether to play a sound to notify of incoming messages."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Whether to play a sound to notify of new conversations."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Whether to play a sound to notify of outgoing messages."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound when logging into a network."
-msgstr "Whether to play a sound when logging into a network."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Whether to play a sound when logging out of a network."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Whether to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Whether to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Whether to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Whether to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Whether to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialogue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Whether to show popup notifications when away or busy."
+#: ../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 object path of the last account selected to join a room."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Whether to show protocols for contacts in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
+msgid "Camera device"
+msgstr "Camera device"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Whether to show the contact list in chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
+msgid "Camera position"
+msgstr "Camera position"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
+msgid "Echo cancellation support"
+msgstr "Echo cancellation support"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show the contact list in compact mode."
-msgstr "Whether to show the contact list in compact mode."
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
+
+#: ../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."
@@ -426,209 +444,302 @@ msgstr ""
 "Whether to show the message dialogue about closing the main window with the "
 "'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to use the theme for chat rooms."
-msgstr "Whether to use the theme for chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Manage Messaging and VoIP accounts"
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2105
-msgid "Messaging and VoIP Accounts"
-msgstr "Messaging and VoIP Accounts"
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../libempathy/empathy-ft-handler.c:830
-msgid "File transfer completed, but the file was corrupted"
-msgstr "File transfer completed, but the file was corrupted"
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the mobile phone network to guess the location"
 
-#: ../libempathy/empathy-ft-handler.c:1121
-msgid "File transfer not supported by remote contact"
-msgstr "File transfer not supported by remote contact"
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Whether Empathy can use the mobile phone network to guess the location."
 
-#: ../libempathy/empathy-ft-handler.c:1177
-msgid "The selected file is not a regular file"
-msgstr "The selected file is not a regular file"
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
 
-#: ../libempathy/empathy-ft-handler.c:1186
-msgid "The selected file is empty"
-msgstr "The selected file is empty"
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
 
-#: ../libempathy/empathy-tp-file.c:283
-msgid "Socket type not supported"
-msgstr "Socket type not supported"
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
 msgstr "No reason was specified"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "The change in state was requested"
 msgstr "The change in state was requested"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "You canceled the file transfer"
 msgstr "You cancelled the file transfer"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "The other participant canceled the file transfer"
 msgstr "The other participant cancelled the file transfer"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "Error while trying to transfer the file"
 msgstr "Error while trying to transfer the file"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "The other participant is unable to transfer the file"
 msgstr "The other participant is unable to transfer the file"
 
-#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-ft-handler.c:914
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
+
+#: ../libempathy/empathy-ft-handler.c:1200
+msgid "File transfer not supported by remote contact"
+msgstr "File transfer not supported by remote contact"
+
+#: ../libempathy/empathy-ft-handler.c:1256
+msgid "The selected file is not a regular file"
+msgstr "The selected file is not a regular file"
+
+#: ../libempathy/empathy-ft-handler.c:1265
+msgid "The selected file is empty"
+msgstr "The selected file is empty"
+
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+msgid "Password not found"
+msgstr "Password not found"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "IM account password for %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Password for chatroom '%s' on account %s (%s)"
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#, c-format
+msgid "Missed call from %s"
+msgstr "Missed call from %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:407
+#, c-format
+msgid "Called %s"
+msgstr "Called %s"
+
+#: ../libempathy/empathy-message.c:410
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d second ago"
+msgstr[1] "%d seconds ago"
+
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
+
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
+
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
+
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week ago"
+msgstr[1] "%d weeks ago"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "in the future"
+
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "Available"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "Away"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1900
-#: ../src/empathy-call-window.c:1901 ../src/empathy-call-window.c:1902
-#: ../src/empathy-call-window.c:1903 ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:238
+msgctxt "presence"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
 msgid "Status is set to offline"
 msgstr "Status is set to offline"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "Network error"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr "Encryption error"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr "Name in use"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate not provided"
 msgstr "Certificate not provided"
 
-#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr "Certificate untrusted"
 
-#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr "Certificate expired"
 
-#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not activated"
 msgstr "Certificate not activated"
 
-#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate hostname mismatch"
 msgstr "Certificate hostname mismatch"
 
-#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate self-signed"
 msgstr "Certificate self-signed"
 
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr "Certificate error"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr "Encryption is not available"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr "Certificate is invalid"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr "Connection has been refused"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr "Connection can't be established"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr "Connection has been lost"
 
-#: ../libempathy/empathy-utils.c:366
-msgid "This resource is already connected to the server"
-msgstr "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:348
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Connection has been replaced by a new connection using the same resource"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr "The account already exists on the server"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr "Certificate has been revoked"
 
-#: ../libempathy/empathy-utils.c:377
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certificate uses an insecure cypher algorithm or is cryptographically weak"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:362
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -636,372 +747,296 @@ msgstr ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy/empathy-utils.c:543
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:366
+msgid "Your software is too old"
+msgstr "Your software is too old"
+
+#: ../libempathy/empathy-utils.c:368
+msgid "Internal error"
+msgstr "Internal error"
+
+#: ../libempathy/empathy-utils.c:497
+#: ../libempathy-gtk/empathy-roster-model.h:30
 msgid "People Nearby"
 msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:548
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:577
+#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:539
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:137
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d second ago"
-msgstr[1] "%d seconds ago"
-
-#: ../libempathy/empathy-time.c:142
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minute ago"
-msgstr[1] "%d minutes ago"
-
-#: ../libempathy/empathy-time.c:147
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d hour ago"
-msgstr[1] "%d hours ago"
-
-#: ../libempathy/empathy-time.c:152
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d day ago"
-msgstr[1] "%d days ago"
+#: ../libempathy-gtk/empathy-account-chooser.c:689
+msgid "All accounts"
+msgstr "All accounts"
 
-#: ../libempathy/empathy-time.c:157
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d week ago"
-msgstr[1] "%d weeks ago"
+#: ../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
+msgid "Pass_word"
+msgstr "Pass_word"
 
-#: ../libempathy/empathy-time.c:162
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d month ago"
-msgstr[1] "%d months ago"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+msgid "Screen _Name"
+msgstr "Screen _Name"
 
-#: ../libempathy/empathy-time.c:167
-msgid "in the future"
-msgstr "in the future"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:493
-msgid "All"
-msgstr "All"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:670
-#: ../libempathy-gtk/empathy-log-window.c:650
-#: ../src/empathy-import-widget.c:321
-msgid "Account"
-msgstr "Account"
+#: ../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:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "_Port"
+msgstr "_Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:671
-msgid "Password"
-msgstr "Password"
+#: ../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:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "_Server"
+msgstr "_Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:672
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "Server"
+#: ../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:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../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 "Advanced"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr "What is your AIM screen name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../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:25
+msgid "Remember Password"
+msgstr "Remember Password"
+
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
+msgid "Account"
+msgstr "Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "Password"
+
+#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:673
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:745
-#: ../libempathy-gtk/empathy-account-widget.c:802
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1127
+#: ../libempathy-gtk/empathy-account-widget.c:762
 #, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "The account %s is edited via My Web Accounts."
+msgid "%s"
+msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1133
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "The account %s cannot be edited in Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1153
-msgid "Launch My Web Accounts"
-msgstr "Launch My Web Accounts"
+msgid "%s:"
+msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1465
+#: ../libempathy-gtk/empathy-account-widget.c:1429
 msgid "Username:"
 msgstr "Username:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1806
+#: ../libempathy-gtk/empathy-account-widget.c:1746
 msgid "A_pply"
 msgstr "A_pply"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1775
 msgid "L_og in"
 msgstr "L_og in"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1902
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Account:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1913
-msgid "_Enabled"
-msgstr "_Enabled"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1978
+#: ../libempathy-gtk/empathy-account-widget.c:1845
 msgid "This account already exists on the server"
 msgstr "This account already exists on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1981
+#: ../libempathy-gtk/empathy-account-widget.c:1849
 msgid "Create a new account on the server"
 msgstr "Create a new account on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2095
-msgid "Ca_ncel"
-msgstr "Ca_ncel"
-
 #. 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:2392
+#: ../libempathy-gtk/empathy-account-widget.c:2270
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s on %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2418
+#: ../libempathy-gtk/empathy-account-widget.c:2296
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2422
+#: ../libempathy-gtk/empathy-account-widget.c:2300
 msgid "New account"
 msgstr "New account"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Example:</b> MyScreenName"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Advanced"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pass_word:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-msgid "Screen _Name:"
-msgstr "Screen _Name:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "What is your AIM password?"
-msgstr "What is your AIM password?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM screen name?"
-msgstr "What is your AIM screen name?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
+msgid "Login I_D"
+msgstr "Login I_D"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../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>Example:</b> username"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "Login I_D:"
-msgstr "Login I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "What is your GroupWise User ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "What is your GroupWise password?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Example:</b> 123456789"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN"
+msgstr "ICQ _UIN"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Ch_aracter set:"
-msgstr "Ch_aracter set:"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Example:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "Ch_aracter set"
+msgstr "Ch_aracter set"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "What is your ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "What is your ICQ password?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
-msgid "TLS"
-msgstr "TLS"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
-msgid "Register"
-msgstr "Register"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
-msgid "Options"
-msgstr "Options"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
-msgid "None"
-msgstr "None"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "Character set:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Network"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Character set"
+msgstr "Character set"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Network:"
-msgstr "Network:"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Add…"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Nickname:"
-msgstr "Nickname:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Password:"
-msgstr "Password:"
+#: ../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
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remove"
 
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Quit message:"
-msgstr "Quit message:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-msgid "Real name:"
-msgstr "Real name:"
+msgid "Up"
+msgstr "Up"
 
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "Servers"
+msgid "Down"
+msgstr "Down"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "What is your IRC nickname?"
-msgstr "What is your IRC nickname?"
+msgid "Servers"
+msgstr "Servers"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "Which IRC network?"
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Example:</b> user@gmail.com"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+msgid "Nickname"
+msgstr "Nickname"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Example:</b> user@jabber.org"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "Quit message"
+msgstr "Quit message"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Encr_yption required (TLS/SSL)"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+msgid "Real name"
+msgstr "Real name"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnore SSL certificate errors"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+msgid "Username"
+msgstr "Username"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Override server settings"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "Which IRC network?"
+msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "Reso_urce:"
-msgstr "Reso_urce:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1013,244 +1048,386 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
 "Facebook username if you don't have one."
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "What is your Facebook password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "What is your Google ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "What is your Google password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "Use old SS_L"
-msgstr "Use old SS_L"
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "What is your Facebook password?"
-msgstr "What is your Facebook password?"
+msgid "Priori_ty"
+msgstr "Priori_ty"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "What is your Facebook username?"
-msgstr "What is your Facebook username?"
+msgid "Reso_urce"
+msgstr "Reso_urce"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Google ID?"
-msgstr "What is your Google ID?"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Google password?"
-msgstr "What is your Google password?"
+msgid "Override server settings"
+msgstr "Override server settings"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Jabber password?"
-msgstr "What is your Jabber password?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Example:</b> user@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live ID?"
-msgstr "What is your Windows Live ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live password?"
-msgstr "What is your Windows Live password?"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname"
+msgstr "Nic_kname"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_mail address:"
+msgid "_Last Name"
+msgstr "_Last Name"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "Nic_kname:"
+msgid "_First Name"
+msgstr "_First Name"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
-msgstr "_First Name:"
+msgid "_Published Name"
+msgstr "_Published Name"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid "_Jabber ID"
+msgstr "_Jabber ID"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Last Name:"
+msgid "E-_mail address"
+msgstr "E-_mail address"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Example:</b> user@my.sip.server"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Authentication username:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Discover Binding"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "Auto"
+
+#: ../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 "None"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username"
+msgstr "_Username"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Example:</b> user@my.sip.server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Discover the STUN server automatically"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "Interval (seconds)"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive Options"
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr "Loose Routeing"
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
-msgstr "Mechanism:"
+msgid "STUN Server"
+msgstr "STUN Server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Miscellaneous Options"
-msgstr "Miscellaneous Options"
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal Options"
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Port:"
-msgstr "Port:"
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Proxy Options"
-msgstr "Proxy Options"
+msgid "Mechanism"
+msgstr "Mechanism"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "STUN Server:"
-msgstr "STUN Server:"
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Server:"
-msgstr "Server:"
+msgid "Authentication username"
+msgstr "Authentication username"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
-msgstr "Transport:"
+msgid "Transport"
+msgstr "Transport"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "What is your SIP account password?"
-msgstr "What is your SIP account password?"
+msgid "Loose Routing"
+msgstr "Loose Routeing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Local IP Address"
+msgstr "Local IP Address"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "What is your SIP login ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "_Username:"
-msgstr "_Username:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnore conference and chat room invitations"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "What is your Yahoo! ID?"
-msgstr "What is your Yahoo! ID?"
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! password?"
-msgstr "What is your Yahoo! password?"
+msgid "Ch_aracter set:"
+msgstr "Ch_aracter set:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
+msgid "_Port:"
+msgstr "_Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Room List locale:"
-msgstr "_Room List locale:"
+msgid "What is your Yahoo! ID?"
+msgstr "What is your Yahoo! ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "What is your Yahoo! password?"
+msgstr "What is your Yahoo! password?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "Couldn't convert image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "None of the accepted image formats are supported on your system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+msgid "Couldn't save picture to file"
+msgstr "Couldn't save picture to file"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+msgid "Take a picture..."
+msgstr "Take a picture…"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "No Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "Images"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "All Files"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:323
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/empathy-chat.c:644
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "Authentication failed for account <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3853
+msgid "Retry"
+msgstr "Retry"
+
+#: ../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 ""
+"Enter your password for account\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "Select…"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "_Select"
+
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "There was an error starting the call"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "The specified contact doesn't support calls"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "The specified contact is offline"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "The specified contact is not valid"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Emergency calls are not supported on this protocol"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
+
+#: ../libempathy-gtk/empathy-chat.c:740
 msgid "Failed to open private chat"
 msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:798
 msgid "Topic not supported on this conversation"
 msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:690
+#: ../libempathy-gtk/empathy-chat.c:804
 msgid "You are not allowed to change the topic"
 msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/empathy-chat.c:824
+#: ../libempathy-gtk/empathy-chat.c:980
+msgid "Invalid contact ID"
+msgstr "Invalid contact ID"
+
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: clear all messages from the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:827
+#: ../libempathy-gtk/empathy-chat.c:1070
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: set the topic of the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:830
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:833
+#: ../libempathy-gtk/empathy-chat.c:1076
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:838
+#: ../libempathy-gtk/empathy-chat.c:1080
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:845
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/empathy-chat.c:848
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:1096
 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 "
@@ -1260,7 +1437,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:1101
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: display information about a contact"
+
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1268,98 +1449,126 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:1123
 #, c-format
 msgid "Usage: %s"
 msgstr "Usage: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:895
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libempathy-gtk/empathy-chat.c:1016
+#: ../libempathy-gtk/empathy-chat.c:1294
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unknown command; see /help for the available commands"
 
-#: ../libempathy-gtk/empathy-chat.c:1156
+#: ../libempathy-gtk/empathy-chat.c:1551
+msgid "insufficient balance to send message"
+msgstr "insufficient balance to send message"
+
+#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
+#: ../libempathy-gtk/empathy-chat.c:1632
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
+#: ../libempathy-gtk/empathy-chat.c:1636
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1563
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1603
+msgid "not capable"
+msgstr "not capable"
+
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "invalid contact"
 msgstr "invalid contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "permission denied"
 msgstr "permission denied"
 
-#: ../libempathy-gtk/empathy-chat.c:1165
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "too long message"
 msgstr "too long message"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1622
 msgid "not implemented"
 msgstr "not implemented"
 
-#: ../libempathy-gtk/empathy-chat.c:1172
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libempathy-gtk/empathy-chat.c:1176
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Error sending message '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1237 ../src/empathy-chat-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libempathy-gtk/empathy-chat.c:1249
+#: ../libempathy-gtk/empathy-chat.c:1708
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1251
+#: ../libempathy-gtk/empathy-chat.c:1710
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1715
 msgid "No topic defined"
 msgstr "No topic defined"
 
-#: ../libempathy-gtk/empathy-chat.c:1750
+#: ../libempathy-gtk/empathy-chat.c:2231
 msgid "(No Suggestions)"
 msgstr "(No Suggestions)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1818
+#: ../libempathy-gtk/empathy-chat.c:2299
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Add '%s' to Dictionary"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1855
+#: ../libempathy-gtk/empathy-chat.c:2336
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/empathy-chat.c:1914
+#: ../libempathy-gtk/empathy-chat.c:2406
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1932
-#: ../libempathy-gtk/empathy-ui-utils.c:1809
+#: ../libempathy-gtk/empathy-chat.c:2424
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2481
 msgid "_Spelling Suggestions"
 msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/empathy-chat.c:2056
+#: ../libempathy-gtk/empathy-chat.c:2592
 msgid "Failed to retrieve recent logs"
 msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/empathy-chat.c:2162
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s has disconnected"
@@ -1367,12 +1576,12 @@ msgstr "%s has disconnected"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2169
+#: ../libempathy-gtk/empathy-chat.c:2842
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2845
 #, c-format
 msgid "%s was kicked"
 msgstr "%s was kicked"
@@ -1380,17 +1589,17 @@ msgstr "%s was kicked"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2180
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2183
+#: ../libempathy-gtk/empathy-chat.c:2856
 #, c-format
 msgid "%s was banned"
 msgstr "%s was banned"
 
-#: ../libempathy-gtk/empathy-chat.c:2187
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid "%s has left the room"
 msgstr "%s has left the room"
@@ -1400,505 +1609,630 @@ msgstr "%s has left the room"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2196
+#: ../libempathy-gtk/empathy-chat.c:2869
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2221
+#: ../libempathy-gtk/empathy-chat.c:2894
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s has joined the room"
 
-#: ../libempathy-gtk/empathy-chat.c:2246
+#: ../libempathy-gtk/empathy-chat.c:2919
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2385 ../src/empathy-call-window.c:1945
+#. 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:3106 ../src/empathy-call-window.c:1537
+#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
+#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../libempathy-gtk/empathy-chat.c:3016
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3793
+msgid "Would you like to store this password?"
+msgstr "Would you like to store this password?"
+
+#: ../libempathy-gtk/empathy-chat.c:3799
+msgid "Remember"
+msgstr "Remember"
+
+#: ../libempathy-gtk/empathy-chat.c:3809
+msgid "Not now"
+msgstr "Not now"
+
+#: ../libempathy-gtk/empathy-chat.c:3857
 msgid "Wrong password; please try again:"
 msgstr "Wrong password; please try again:"
 
-#: ../libempathy-gtk/empathy-chat.c:3017
-msgid "Retry"
-msgstr "Retry"
-
-#: ../libempathy-gtk/empathy-chat.c:3022
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3987
 msgid "This room is protected by a password:"
 msgstr "This room is protected by a password:"
 
-#: ../libempathy-gtk/empathy-chat.c:3023
+#: ../libempathy-gtk/empathy-chat.c:4014
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "Join"
 
-#: ../libempathy-gtk/empathy-chat.c:3163
+#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libempathy-gtk/empathy-chat.c:3216
-#: ../libempathy-gtk/empathy-log-window.c:657
+#: ../libempathy-gtk/empathy-chat.c:4261
 msgid "Conversation"
 msgstr "Conversation"
 
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
-msgid "_Copy Link Address"
-msgstr "_Copy Link Address"
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4266
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
-msgid "_Open Link"
-msgstr "_Open Link"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+msgid "Unknown or invalid identifier"
+msgstr "Unknown or invalid identifier"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
-msgid "%A %B %d %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Contact blocking temporarily unavailable"
+msgstr "Contact blocking temporarily unavailable"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:265
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Edit Contact Information"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking unavailable"
+msgstr "Contact blocking unavailable"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:316
-msgid "Personal Information"
-msgstr "Personal Information"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Permission Denied"
+msgstr "Permission Denied"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:425
-#: ../libempathy-gtk/empathy-individual-dialogs.c:115
-msgid "New Contact"
-msgstr "New Contact"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+msgid "Could not block contact"
+msgstr "Could not block contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decide _Later"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+msgid "Edit Blocked Contacts"
+msgstr "Edit Blocked Contacts"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "Subscription Request"
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Account:"
+msgstr "Account:"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ungrouped"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blocked Contacts"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favourite People"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "Full name"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2000
-#: ../libempathy-gtk/empathy-individual-view.c:2263
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Do you really want to remove the group '%s'?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "Phone number"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2002
-#: ../libempathy-gtk/empathy-individual-view.c:2266
-msgid "Removing group"
-msgstr "Removing group"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "E-mail address"
 
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2051
-#: ../libempathy-gtk/empathy-contact-list-view.c:2128
-#: ../libempathy-gtk/empathy-individual-view.c:2321
-#: ../libempathy-gtk/empathy-individual-view.c:2435
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "_Remove"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "Website"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2081
-#: ../libempathy-gtk/empathy-individual-view.c:2352
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Do you really want to remove the contact '%s'?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "Birthday"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2083
-#: ../libempathy-gtk/empathy-individual-view.c:2354
-msgid "Removing contact"
-msgstr "Removing contact"
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+msgid "Last seen:"
+msgstr "Last seen:"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Add Contact…"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:516
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Chat"
-msgstr "_Chat"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "Connected from:"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-#: ../libempathy-gtk/empathy-individual-menu.c:559
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio Call"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "Away message:"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-#: ../libempathy-gtk/empathy-individual-menu.c:601
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video Call"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "work"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:333
-#: ../libempathy-gtk/empathy-individual-menu.c:644
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Previous Conversations"
-msgstr "_Previous Conversations"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "home"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:355
-#: ../libempathy-gtk/empathy-individual-menu.c:685
-msgid "Send File"
-msgstr "Send File"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "mobile"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:378
-#: ../libempathy-gtk/empathy-individual-menu.c:727
-msgid "Share My Desktop"
-msgstr "Share My Desktop"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "voice"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:418
-#: ../libempathy-gtk/empathy-contact-widget.c:1630
-#: ../libempathy-gtk/empathy-individual-menu.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favourite"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "preferred"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:447
-#: ../libempathy-gtk/empathy-individual-menu.c:788
-msgid "Infor_mation"
-msgstr "Infor_mation"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "postal"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:493
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Edit"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "parcel"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:969
-#: ../src/empathy-chat-window.c:919
-msgid "Inviting you to this room"
-msgstr "Inviting you to this room"
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+msgid "Search contacts"
+msgstr "Search contacts"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:578
-#: ../libempathy-gtk/empathy-individual-menu.c:1016
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+msgid "Search: "
+msgstr "Search: "
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Select a contact"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:252
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Full name:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:253
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Phone number:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:254
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail address:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:255
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Website:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:256
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Birthday:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:670
-#: ../libempathy-gtk/empathy-individual-widget.c:476
-msgid "Country ISO Code:"
-msgstr "Country ISO Code:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+msgid "_Add Contact"
+msgstr "_Add Contact"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:672
-#: ../libempathy-gtk/empathy-individual-widget.c:478
-msgid "Country:"
-msgstr "Country:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+msgid "No contacts found"
+msgstr "No contacts found"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:674
-#: ../libempathy-gtk/empathy-individual-widget.c:480
-msgid "State:"
-msgstr "County:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+msgid "Your message introducing yourself:"
+msgstr "Your message introducing yourself:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:676
-#: ../libempathy-gtk/empathy-individual-widget.c:482
-msgid "City:"
-msgstr "City:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:678
-#: ../libempathy-gtk/empathy-individual-widget.c:484
-msgid "Area:"
-msgstr "Area:"
+#: ../libempathy-gtk/empathy-contact-widget.c:168
+#: ../libempathy-gtk/empathy-individual-widget.c:898
+msgid "Save Avatar"
+msgstr "Save Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:680
-#: ../libempathy-gtk/empathy-individual-widget.c:486
-msgid "Postal Code:"
-msgstr "Postal Code:"
+#: ../libempathy-gtk/empathy-contact-widget.c:224
+#: ../libempathy-gtk/empathy-individual-widget.c:956
+msgid "Unable to save avatar"
+msgstr "Unable to save avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:682
-#: ../libempathy-gtk/empathy-individual-widget.c:488
-msgid "Street:"
-msgstr "Street:"
+#. Identifier to connect to Instant Messaging network
+#. Setup id label
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-user-info.c:444
+msgid "Identifier"
+msgstr "Identifier"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:684
-#: ../libempathy-gtk/empathy-individual-widget.c:490
-msgid "Building:"
-msgstr "Building:"
+#. Setup nickname entry
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-user-info.c:449
+msgid "Alias"
+msgstr "Alias"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:686
-#: ../libempathy-gtk/empathy-individual-widget.c:492
-msgid "Floor:"
-msgstr "Floor:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Contact Details"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:688
-#: ../libempathy-gtk/empathy-individual-widget.c:494
-msgid "Room:"
-msgstr "Room:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information requested…"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:690
-#: ../libempathy-gtk/empathy-individual-widget.c:496
-msgid "Text:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS"
+msgstr "OS"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version"
+msgstr "Version"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client"
+msgstr "Client"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:327
+msgid "Groups"
+msgstr "Groups"
+
+#: ../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 ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+
+#: ../libempathy-gtk/empathy-groups-widget.c:358
+msgid "_Add Group"
+msgstr "_Add Group"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:393
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Select"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:403
+msgid "Group"
+msgstr "Group"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "New Contact"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "Block %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 "Are you sure you want to block '%s' from contacting you again?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "The following identity will be blocked:"
+msgstr[1] "The following identities will be blocked:"
+
+#: ../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] "The following identity can not be blocked:"
+msgstr[1] "The following identities can not be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_Block"
+
+#: ../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] "_Report this contact as abusive"
+msgstr[1] "_Report these contacts as abusive"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+msgid "Linked Contacts"
+msgstr "Linked Contacts"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#. 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:177
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:353
+msgid "Select account to use to place the call"
+msgstr "Select account to use to place the call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
+msgid "Call"
+msgstr "Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:422
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:424
+msgid "Work"
+msgstr "Work"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:426
+msgid "HOME"
+msgstr "HOME"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:669
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Delete and _Block"
+msgstr "Delete and _Block"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:787
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:796
+#, 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 ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:807
+msgid "Removing contact"
+msgstr "Removing contact"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "_Remove"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1269
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1302
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1366
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
+msgid "Infor_mation"
+msgstr "Infor_mation"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edit"
+
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1245
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2373
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2376
+msgid "Removing group"
+msgstr "Removing group"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2444
+msgid "Re_name"
+msgstr "Re_name"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Country ISO Code:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Country:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "County:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "City:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Postal Code:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Street:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Building:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Floor:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Room:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:692
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Description:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:694
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:696
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Accuracy Level:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:700
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertical Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:702
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontal Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Bearing:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:708
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Climb Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:710
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Last Updated on:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:712
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:714
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:716
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:621
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Location"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:623
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-individual-widget.c:672
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:921
-msgid "Save Avatar"
-msgstr "Save Avatar"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:989
-#: ../libempathy-gtk/empathy-individual-widget.c:979
-msgid "Unable to save avatar"
-msgstr "Unable to save avatar"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Location</b> at (date)\t"
-
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1302
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Client Information"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Client:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Contact Details"
-
-#. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 #: ../libempathy-gtk/empathy-individual-widget.c:1511
 msgid "Identifier:"
 msgstr "Identifier:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Information requested…"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "OS:"
-msgstr "OS:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Version:"
-msgstr "Version:"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:332
-msgid "Groups"
-msgstr "Groups"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:344
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-
-#: ../libempathy-gtk/empathy-groups-widget.c:363
-msgid "_Add Group"
-msgstr "_Add Group"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:398
-msgctxt "verb in a column header displaying group names"
-msgid "Select"
-msgstr "Select"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1276
-msgid "Group"
-msgstr "Group"
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-msgid "Linked Contacts"
-msgstr "Linked Contacts"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-msgid "Select contacts to link"
-msgstr "Select contacts to link"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-msgid "New contact preview"
-msgstr "New contact preview"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:472
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Contacts selected in the list on the left will be linked together."
-
-#. 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:132
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:836
-msgctxt "Edit individual (contextual menu)"
-msgid "_Edit"
-msgstr "_Edit"
-
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:862
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Link Contacts…"
-
-#: ../libempathy-gtk/empathy-individual-widget.c:1649
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
 #, c-format
-msgid "Meta-contact containing %u contact"
-msgid_plural "Meta-contact containing %u contacts"
-msgstr[0] "Meta-contact containing %u contact"
-msgstr[1] "Meta-contact containing %u contacts"
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Linked contact containing %u contact"
+msgstr[1] "Linked contacts containing %u contacts"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Location</b> at (date)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Online from a phone or mobile device"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "New Network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
 msgid "Choose an IRC network"
 msgstr "Choose an IRC network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
+msgid "Reset _Networks List"
+msgstr "Reset _Networks List"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Select"
@@ -1907,129 +2241,275 @@ msgstr "Select"
 msgid "new server"
 msgstr "new server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Link Contacts"
+#: ../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 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."
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Unlink…"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+msgid "People nearby"
+msgstr "People nearby"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
 msgid ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
 msgstr ""
-"Completely split the displayed meta-contact into the contacts it contains."
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "History"
+
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "Show"
 
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Link"
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "Search"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
-msgid "Unlink meta-contact '%s'?"
-msgstr "Unlink meta-contact '%s'?"
+msgid "Chat in %s"
+msgstr "Chat in %s"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:185
-msgid ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
-msgstr ""
-"Are you sure you want to unlink this meta-contact? This will completely "
-"split the meta-contact into the contacts it contains."
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat with %s"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Unlink"
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1351
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
 
-#: ../libempathy-gtk/empathy-log-window.c:667
-msgid "Date"
-msgstr "Date"
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1292
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversations"
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1298
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1375
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s second"
+msgstr[1] "%s seconds"
+
+#: ../libempathy-gtk/empathy-log-window.c:1382
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
+
+#: ../libempathy-gtk/empathy-log-window.c:1390
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Call took %s, ended at %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1721
+msgid "Today"
+msgstr "Today"
+
+#: ../libempathy-gtk/empathy-log-window.c:1725
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1740
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "Who"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "When"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Anything"
+msgstr "Anything"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+msgid "Text chats"
+msgstr "Text chats"
+
+#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../src/empathy-preferences.ui.h:29
+msgid "Calls"
+msgstr "Calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "Incoming calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "Outgoing calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "Missed calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3071
+msgid "What"
+msgstr "What"
+
+#: ../libempathy-gtk/empathy-log-window.c:3760
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Are you sure you want to delete all logs of previous conversations?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3764
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../libempathy-gtk/empathy-log-window.c:3771
+msgid "Delete from:"
+msgstr "Delete from:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_File"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+msgid "_Edit"
+msgstr "_Edit"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Find Next"
+msgid "Delete All History..."
+msgstr "Delete All History…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Find Previous"
+msgid "Profile"
+msgstr "Profile"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Previous Conversations"
+#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+msgid "Chat"
+msgstr "Chat"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Search"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "Video"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "page 2"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_For:"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading…</span>"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Contact ID:"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "Adding new account"
 
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
-msgid "New Conversation"
-msgstr "New Conversation"
+#: ../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 "Enter a contact identifier or phone number:"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
-msgid "Send _Video"
-msgstr "Send _Video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "_Video Call"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-msgid "C_all"
-msgstr "C_all"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "_Audio Call"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
 msgid "New Call"
 msgstr "New Call"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:230
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"Enter your password for account\n"
-"<b>%s</b>"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+msgid "The contact is offline"
+msgstr "The contact is offline"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-password-dialog.c:265
-msgid "Remember password"
-msgstr "Remember password"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+msgid "New Conversation"
+msgstr "New Conversation"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2037,34 +2517,40 @@ msgstr "Remember password"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:164
+#: ../libempathy-gtk/empathy-presence-chooser.c:200
 msgid "Custom Message…"
 msgstr "Custom Message…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:217
+#: ../libempathy-gtk/empathy-presence-chooser.c:219
 msgid "Edit Custom Messages…"
 msgstr "Edit Custom Messages…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr "Click to remove this status as a favourite"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr "Click to make this status a favourite"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
 msgid "Set status"
 msgstr "Set status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:948
-msgid "Set your presence and current status"
-msgstr "Set your presence and current status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 msgid "Custom messages…"
 msgstr "Custom messages…"
 
@@ -2072,18 +2558,30 @@ msgstr "Custom messages…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:608
 #, c-format
 msgid "New %s account"
 msgstr "New %s account"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match case"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Find:"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "_Next"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Match case"
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
@@ -2129,37 +2627,37 @@ msgstr "Outgoing voice call"
 msgid "Voice call ended"
 msgstr "Voice call ended"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Enter Custom Message"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Edit Custom Messages"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Save _New Status Message"
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "Subscription Request"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Saved Status Messages"
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1104
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s would like permission to see when you are online"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
-msgid "Classic"
-msgstr "Classic"
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr "_Decline"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
-msgid "Simple"
-msgstr "Simple"
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "_Accept"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
-msgid "Clean"
-msgstr "Clean"
+#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message edited at %s"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Blue"
-msgstr "Blue"
+#: ../libempathy-gtk/empathy-theme-adium.c:1921
+msgid "Normal"
+msgstr "Normal"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
@@ -2183,7 +2681,8 @@ msgstr "The certificate does not have the expected fingerprint."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+"The hostname verified by the certificate doesn't match the server name."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
@@ -2217,35 +2716,75 @@ msgstr "Expected hostname: %s"
 msgid "Certificate hostname: %s"
 msgstr "Certificate hostname: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:271
-msgid "Continue"
-msgstr "Continue"
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "C_ontinue"
+msgstr "C_ontinue"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:277
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Remember this choice for future connections"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:302
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certificate Details"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1706
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "Unable to open URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1870
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
+msgid "Insufficient free space to save file"
+msgstr "Insufficient free space to save file"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Incoming file from %s"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+msgid "<b>Personal Details</b>"
+msgstr "<b>Personal Details</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Copy Link Address"
+msgstr "_Copy Link Address"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
+msgid "_Open Link"
+msgstr "_Open Link"
+
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "Inspect HTML"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Current Locale"
@@ -2413,51 +2952,30 @@ msgstr "Western"
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "The selected contact cannot receive files."
+#: ../libempathy-gtk/empathy-roster-model.h:29
+msgid "Top Contacts"
+msgstr "Top Contacts"
+
+#: ../libempathy-gtk/empathy-roster-model.h:31
+msgid "Ungrouped"
+msgstr "Ungrouped"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "The selected contact is offline."
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:205
+#, c-format
+#| msgid "Select a contact"
+msgid "Server cannot find contact: %s"
+msgstr "Server cannot find contact: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "No error message"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
-#: ../src/empathy.c:309
-msgid "Don't connect on startup"
-msgstr "Don't connect on startup"
-
-#: ../src/empathy.c:313
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "Don't display the contact list or any other dialogues on startup"
-
-#: ../src/empathy.c:321
-msgid "- Empathy IM Client"
-msgstr "- Empathy IM Client"
-
-#: ../src/empathy.c:500
-msgid "Error contacting the Account Manager"
-msgstr "Error contacting the Account Manager"
-
-#: ../src/empathy.c:502
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -2492,231 +3010,112 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "An Instant Messaging client for GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "David Lodge <dave@cirt.net>\n"
 "Philip Withnall <philip@tecnocode.co.uk>\n"
-"Bruce Cowan <bruce@bcowan.me.uk>"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "There was an error while importing the accounts."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "There was an error while parsing the account details."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "There was an error while creating the account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "There was an error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "The error message was: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"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."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1268
-msgid "An error occurred"
-msgstr "An error occurred"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "What kind of chat account do you have?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Do you have any other chat accounts you want to set up?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enter your account details"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "What kind of chat account do you want to create?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Do you want to create other chat accounts?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enter the details for the new account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"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."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Do you have an account you've been using with another chat program?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Yes, import my account details from "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Yes, I'll enter my account details now"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, I want a new account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, I just want to see people online nearby for now"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Select the accounts you want to import:"
-
-#: ../src/empathy-account-assistant.c:810
-#: ../src/empathy-new-chatroom-dialog.c:636
-#: ../src/empathy-new-chatroom-dialog.c:637
-msgid "Yes"
-msgstr "Yes"
+"Bruce Cowan <bruce@bcowan.me.uk>\n"
+"Chris Leonard <cjl@laptop.org>"
 
-#: ../src/empathy-account-assistant.c:817
-msgid "No, that's all for now"
-msgstr "No, that's all for now"
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
 
-#: ../src/empathy-account-assistant.c:1082
+#: ../src/empathy-accounts.c:186
 msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialogue"
-
-#: ../src/empathy-account-assistant.c:1088
-#: ../src/empathy-account-assistant.c:1144
-msgid "Edit->Accounts"
-msgstr "Edit->Accounts"
-
-#: ../src/empathy-account-assistant.c:1104
-msgid "I don't want to enable this feature for now"
-msgstr "I don't want to enable this feature for now"
+"Don't display any dialogues unless there are only \"People Nearby\" accounts"
 
-#: ../src/empathy-account-assistant.c:1140
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
-"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 dialogue"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut not installed"
-
-#: ../src/empathy-account-assistant.c:1192
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Messaging and VoIP Accounts Assistant"
+"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-account-assistant.c:1226
-msgid "Welcome to Empathy"
-msgstr "Welcome to Empathy"
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<account-id>"
 
-#: ../src/empathy-account-assistant.c:1235
-msgid "Import your existing accounts"
-msgstr "Import your existing accounts"
+#: ../src/empathy-accounts.c:197
+msgid "- Empathy Accounts"
+msgstr "- Empathy Accounts"
 
-#: ../src/empathy-account-assistant.c:1253
-msgid "Please enter personal details"
-msgstr "Please enter personal details"
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "Empathy Accounts"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:68
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "There are unsaved modifications to your %s account."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:72
 msgid "Your new account has not been saved yet."
 msgstr "Your new account has not been saved yet."
 
-#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:811
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
 msgid "Connecting…"
 msgstr "Connecting…"
 
-#: ../src/empathy-accounts-dialog.c:321
+#: ../src/empathy-accounts-dialog.c:445
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:333
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnected — %s"
 
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — No Network Connection"
 msgstr "Offline — No Network Connection"
 
-#: ../src/empathy-accounts-dialog.c:351
+#: ../src/empathy-accounts-dialog.c:475
 msgid "Unknown Status"
 msgstr "Unknown Status"
 
-#: ../src/empathy-accounts-dialog.c:363
+#: ../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 ""
+"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."
+
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline — Account Disabled"
 msgstr "Offline — Account Disabled"
 
-#: ../src/empathy-accounts-dialog.c:759
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:608
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parameters"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parameters…"
 
-#: ../src/empathy-accounts-dialog.c:1106
+#: ../src/empathy-accounts-dialog.c:1268
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Do you want to remove %s from your computer?"
 
-#: ../src/empathy-accounts-dialog.c:1110
+#: ../src/empathy-accounts-dialog.c:1272
 msgid "This will not remove your account on the server."
 msgstr "This will not remove your account on the server."
 
-#: ../src/empathy-accounts-dialog.c:1348
+#: ../src/empathy-accounts-dialog.c:1477
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2724,7 +3123,25 @@ msgstr ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 
-#: ../src/empathy-accounts-dialog.c:1951
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1668
+msgid "_Enabled"
+msgstr "_Enabled"
+
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1691
+msgid "Rename"
+msgstr "Rename"
+
+#: ../src/empathy-accounts-dialog.c:2107
+msgid "_Skip"
+msgstr "_Skip"
+
+#: ../src/empathy-accounts-dialog.c:2111
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../src/empathy-accounts-dialog.c:2290
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2732,19 +3149,20 @@ msgstr ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "Loading account information"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "No protocol installed"
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2433
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "_Import…"
+msgstr "_Import…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "Loading account information"
+
+#: ../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."
@@ -2752,114 +3170,147 @@ msgstr ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "_Add…"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "_Import…"
+msgid "No protocol backends installed"
+msgstr "No protocol backends installed"
 
-#: ../src/empathy-auth-client.c:237
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
 msgstr " - Empathy authentication client"
 
-#: ../src/empathy-auth-client.c:253
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
 msgstr "Empathy authentication client"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "People nearby"
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr "Don't connect on startup"
+
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Don't display the contact list or any other dialogues on startup"
+
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM Client"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
+
+#: ../src/empathy.c:625
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-call.c:124
+#| msgid "Incoming call"
+msgid "In a call"
+msgstr "In a call"
 
-#: ../src/empathy-av.c:118
+#: ../src/empathy-call.c:224
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Audio/Video Client"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-call.c:248
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Audio/Video Client"
 
-#: ../src/empathy-call-window.c:481
-msgid "Contrast"
-msgstr "Contrast"
-
-#: ../src/empathy-call-window.c:484
-msgid "Brightness"
-msgstr "Brightness"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s just tried to call you, but you were in another call."
 
-#: ../src/empathy-call-window.c:487
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
+msgstr "Incoming call"
 
-#: ../src/empathy-call-window.c:592
-msgid "Volume"
-msgstr "Volume"
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Incoming video call from %s"
 
-#: ../src/empathy-call-window.c:1168
-msgid "_Sidebar"
-msgstr "_Sidebar"
+#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Incoming call from %s"
 
-#: ../src/empathy-call-window.c:1188
-msgid "Audio input"
-msgstr "Audio input"
+#: ../src/empathy-call-window.c:1564
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "Reject"
 
-#: ../src/empathy-call-window.c:1192
-msgid "Video input"
-msgstr "Video input"
-
-#: ../src/empathy-call-window.c:1196
-msgid "Dialpad"
-msgstr "Dialpad"
-
-#: ../src/empathy-call-window.c:1201
-msgid "Details"
-msgstr "Details"
+#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+msgstr "Answer"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1270
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Call with %s"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:1349
-msgid "Call"
-msgstr "Call"
-
-#: ../src/empathy-call-window.c:1503
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address as seen by the machine"
 msgstr "The IP address as seen by the machine"
 
-#: ../src/empathy-call-window.c:1505
+#: ../src/empathy-call-window.c:2188
 msgid "The IP address as seen by a server on the Internet"
 msgstr "The IP address as seen by a server on the Internet"
 
-#: ../src/empathy-call-window.c:1507
+#: ../src/empathy-call-window.c:2190
 msgid "The IP address of the peer as seen by the other side"
 msgstr "The IP address of the peer as seen by the other side"
 
-#: ../src/empathy-call-window.c:1509
+#: ../src/empathy-call-window.c:2192
 msgid "The IP address of a relay server"
 msgstr "The IP address of a relay server"
 
-#: ../src/empathy-call-window.c:1511
+#: ../src/empathy-call-window.c:2194
 msgid "The IP address of the multicast group"
 msgstr "The IP address of the multicast group"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.ui.h:28
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.c:2966
+msgid "On hold"
+msgstr "On hold"
+
+#: ../src/empathy-call-window.c:2970
+msgid "Mute"
+msgstr "Mute"
+
+#: ../src/empathy-call-window.c:2972
+msgid "Duration"
+msgstr "Duration"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2975
 #, c-format
-msgid "Connected — %d:%02dm"
-msgstr "Connected — %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2322
+#: ../src/empathy-call-window.c:3071
 msgid "Technical Details"
 msgstr "Technical Details"
 
-#: ../src/empathy-call-window.c:2360
+#: ../src/empathy-call-window.c:3110
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2868,7 +3319,7 @@ msgstr ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 
-#: ../src/empathy-call-window.c:2365
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2877,7 +3328,7 @@ msgstr ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 
-#: ../src/empathy-call-window.c:2371
+#: ../src/empathy-call-window.c:3121
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2886,23 +3337,23 @@ msgstr ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 
-#: ../src/empathy-call-window.c:2377
+#: ../src/empathy-call-window.c:3127
 msgid "There was a failure on the network"
 msgstr "There was a failure on the network"
 
-#: ../src/empathy-call-window.c:2381
+#: ../src/empathy-call-window.c:3131
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "The audio formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-call-window.c:2384
+#: ../src/empathy-call-window.c:3134
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "The video formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-call-window.c:2394
+#: ../src/empathy-call-window.c:3146
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2913,322 +3364,503 @@ msgstr ""
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 
-#: ../src/empathy-call-window.c:2402
+#: ../src/empathy-call-window.c:3155
 msgid "There was a failure in the call engine"
 msgstr "There was a failure in the call engine"
 
-#: ../src/empathy-call-window.c:2405
+#: ../src/empathy-call-window.c:3158
 msgid "The end of the stream was reached"
 msgstr "The end of the stream was reached"
 
-#: ../src/empathy-call-window.c:2445
+#: ../src/empathy-call-window.c:3198
 msgid "Can't establish audio stream"
 msgstr "Can't establish audio stream"
 
-#: ../src/empathy-call-window.c:2455
+#: ../src/empathy-call-window.c:3208
 msgid "Can't establish video stream"
 msgstr "Can't establish video stream"
 
-#: ../src/empathy-call-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+#: ../src/empathy-call-window.c:3245
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
+
+#: ../src/empathy-call-window.c:3249
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Call the contact again"
+#: ../src/empathy-call-window.c:3251
+msgid "Top Up"
+msgstr "Top Up"
+
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "_Call"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Camera Off"
+msgid "_Microphone"
+msgstr "_Microphone"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Camera On"
+msgid "_Camera"
+msgstr "_Camera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Decoding Codec:"
+msgid "_Settings"
+msgstr "_Settings"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disable camera and stop sending video"
+msgid "_View"
+msgstr "_View"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enable camera and send video"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+msgid "_Help"
+msgstr "_Help"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enable camera but don't send video"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+msgid "_Contents"
+msgstr "_Contents"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Encoding Codec:"
+msgid "_Debug"
+msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Hang up"
+msgid "_GStreamer"
+msgstr "_GStreamer"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Hang up current call"
+msgid "_Telepathy"
+msgstr "_Telepathy"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Local Candidate:"
+msgid "Swap camera"
+msgstr "Swap camera"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Preview"
+msgid "Minimise me"
+msgstr "Minimise me"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Redial"
+msgid "Maximise me"
+msgstr "Maximise me"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Remote Candidate:"
+msgid "Disable camera"
+msgstr "Disable camera"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send Audio"
+msgid "Hang up"
+msgstr "Hang up"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Toggle audio transmission"
+msgid "Hang up current call"
+msgstr "Hang up current call"
 
-#: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Video call"
+msgstr "Video call"
 
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../src/empathy-call-window.ui.h:19
+msgid "Start a video call"
+msgstr "Start a video call"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Off"
+msgid "Start an audio call"
+msgstr "Start an audio call"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Video On"
+msgid "Show dialpad"
+msgstr "Show dialpad"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Preview"
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
 
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "_Call"
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
-msgid "_View"
-msgstr "_View"
+#: ../src/empathy-call-window.ui.h:25
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
+
+#: ../src/empathy-call-window.ui.h:27
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Name"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Room"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Auto-Connect"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Manage Favourite Rooms"
+
+#: ../src/empathy-chat-window.c:287
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:293
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+
+#: ../src/empathy-chat-window.c:306
+#, 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] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:317
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
+
+#: ../src/empathy-chat-window.c:319
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+
+#: ../src/empathy-chat-window.c:338
+msgid "Close window"
+msgstr "Close window"
 
-#: ../src/empathy-chat-window.c:472 ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:338
+msgid "Leave room"
+msgstr "Leave room"
+
+#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d unread)"
 msgstr[1] "%s (%d unread)"
 
-#: ../src/empathy-chat-window.c:484
+#: ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (and %u other)"
 msgstr[1] "%s (and %u others)"
 
-#: ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:708
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d unread from others)"
 msgstr[1] "%s (%d unread from others)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:717
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d unread from all)"
 msgstr[1] "%s (%d unread from all)"
 
-#: ../src/empathy-chat-window.c:711
+#: ../src/empathy-chat-window.c:954
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:962
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sending %d message"
+msgstr[1] "Sending %d messages"
+
+#: ../src/empathy-chat-window.c:982
 msgid "Typing a message."
 msgstr "Typing a message."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "C_lear"
+msgid "_Conversation"
+msgstr "_Conversation"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontact"
+msgid "C_lear"
+msgstr "C_lear"
 
 #: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
-
-#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Insert _Smiley"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invite _Participant…"
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notify for All Messages"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "_Contents"
+msgid "C_ontact"
+msgstr "C_ontact"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversation"
+msgid "_Tabs"
+msgstr "_Tabs"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Next Tab"
 
 #: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favourite Chat Room"
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "_Help"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
 #: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "_Next Tab"
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
 #: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Show a particular service"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy Debugger"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Undo Close Tab"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy Debugger"
 
-#: ../src/empathy-chatrooms-window.c:241
-msgid "Name"
-msgstr "Name"
+#: ../src/empathy-debug-window.c:1599
+msgid "Save"
+msgstr "Save"
 
-#: ../src/empathy-chatrooms-window.c:259
-msgid "Room"
-msgstr "Room"
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr "Pastebin link"
 
-#: ../src/empathy-chatrooms-window.c:267
-msgid "Auto-Connect"
-msgstr "Auto-Connect"
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
+msgstr "Pastebin response"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
-msgid "Manage Favorite Rooms"
-msgstr "Manage Favourite Rooms"
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Data too large for a single paste. Please save logs to file."
+
+#: ../src/empathy-debug-window.c:1857
+msgid "Debug Window"
+msgstr "Debug Window"
+
+#: ../src/empathy-debug-window.c:1917
+msgid "Send to pastebin"
+msgstr "Send to pastebin"
 
-#: ../src/empathy-event-manager.c:472
+#: ../src/empathy-debug-window.c:1961
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/empathy-debug-window.c:1973
+msgid "Level "
+msgstr "Level "
+
+#: ../src/empathy-debug-window.c:1992
+msgid "Debug"
+msgstr "Debug"
+
+#: ../src/empathy-debug-window.c:1997
+msgid "Info"
+msgstr "Info"
+
+#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+msgid "Message"
+msgstr "Message"
+
+#: ../src/empathy-debug-window.c:2007
+msgid "Warning"
+msgstr "Warning"
+
+#: ../src/empathy-debug-window.c:2012
+msgid "Critical"
+msgstr "Critical"
+
+#: ../src/empathy-debug-window.c:2017
+msgid "Error"
+msgstr "Error"
+
+#: ../src/empathy-debug-window.c:2030
+#| msgid ""
+#| "Even if they don't display passwords, logs can contain sensible "
+#| "information such as your list of contacts or the messages you recently "
+#| "sent or received.\n"
+#| "If you don't want to see such information available in a public bug "
+#| "report, you can choose to limit the visibility of your bug to Empathy "
+#| "developpers when reporting it by displaying the advanced fields in the <a "
+#| "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
+#| "report</a>."
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a "
+"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
+"report</a>."
+
+#: ../src/empathy-debug-window.c:2062
+msgid "Time"
+msgstr "Time"
+
+#: ../src/empathy-debug-window.c:2065
+msgid "Domain"
+msgstr "Domain"
+
+#: ../src/empathy-debug-window.c:2068
+msgid "Category"
+msgstr "Category"
+
+#: ../src/empathy-debug-window.c:2071
+msgid "Level"
+msgstr "Level"
+
+#: ../src/empathy-debug-window.c:2100
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+
+#: ../src/empathy-event-manager.c:508
 msgid "Incoming video call"
 msgstr "Incoming video call"
 
-#: ../src/empathy-event-manager.c:472
-msgid "Incoming call"
-msgstr "Incoming call"
-
-#: ../src/empathy-event-manager.c:476
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s is video calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:477
+#: ../src/empathy-event-manager.c:513
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s is calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:480 ../src/empathy-event-manager.c:625
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Incoming call from %s"
-
-#: ../src/empathy-event-manager.c:505
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr "_Answer"
 
-#: ../src/empathy-event-manager.c:625
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "Incoming video call from %s"
+#: ../src/empathy-event-manager.c:557
+msgid "_Answer with video"
+msgstr "_Answer with video"
 
-#: ../src/empathy-event-manager.c:702
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr "Room invitation"
 
-#: ../src/empathy-event-manager.c:704
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation to join %s"
 
-#: ../src/empathy-event-manager.c:711
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s is inviting you to join %s"
 
-#: ../src/empathy-event-manager.c:719
-msgid "_Decline"
-msgstr "_Decline"
-
-#: ../src/empathy-event-manager.c:724
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "_Join"
 
-#: ../src/empathy-event-manager.c:751
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invited you to join %s"
 
-#: ../src/empathy-event-manager.c:757
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "You have been invited to join %s"
 
-#: ../src/empathy-event-manager.c:807
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Incoming file transfer from %s"
 
-#: ../src/empathy-event-manager.c:1018
-#, c-format
-msgid "%s would like permission to see when you are available"
-msgstr "%s would like permission to see when you are available"
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+msgid "Password required"
+msgstr "Password required"
 
-#: ../src/empathy-event-manager.c:1022
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3237,16 +3869,6 @@ msgstr ""
 "\n"
 "Message: %s"
 
-#: ../src/empathy-event-manager.c:1066
-#, c-format
-msgid "%s is now offline."
-msgstr "%s is now offline."
-
-#: ../src/empathy-event-manager.c:1087
-#, c-format
-msgid "%s is now online."
-msgstr "%s is now online."
-
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:99
 #, c-format
@@ -3324,7 +3946,7 @@ msgstr "\"%s\" sent to %s"
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Waiting for the other participant's response"
 
@@ -3338,15 +3960,15 @@ msgstr "Checking integrity of \"%s\""
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:996
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1008
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1030
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Remaining"
 
@@ -3358,7 +3980,11 @@ msgstr "File Transfers"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove completed, cancelled and failed file transfers from the list"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Import"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3366,521 +3992,1069 @@ msgstr ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Import Accounts"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:302
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:311
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:335
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-main-window.c:385
-msgid "No match found"
-msgstr "No match found"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "Invite Participant"
+
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Choose a contact to invite into the conversation:"
+
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "Invite"
+
+#: ../src/empathy-new-chatroom-dialog.c:194
+msgid "Chat Room"
+msgstr "Chat Room"
+
+#: ../src/empathy-new-chatroom-dialog.c:209
+msgid "Members"
+msgstr "Members"
+
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr "Failed to list rooms"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
+msgid "No"
+msgstr "No"
+
+#: ../src/empathy-new-chatroom-dialog.c:784
+msgid "Join Room"
+msgstr "Join Room"
+
+#: ../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 ""
+"Enter the room name to join here or click on one or more rooms in the list."
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Room:"
+msgstr "_Room:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+
+#: ../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 ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Room List"
+msgstr "Room List"
+
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "Answer with video"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr "Accept"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr "Provide"
+
+#: ../src/empathy-preferences.c:143
+msgid "Message received"
+msgstr "Message received"
+
+#: ../src/empathy-preferences.c:144
+msgid "Message sent"
+msgstr "Message sent"
+
+#: ../src/empathy-preferences.c:145
+msgid "New conversation"
+msgstr "New conversation"
+
+#: ../src/empathy-preferences.c:146
+msgid "Contact comes online"
+msgstr "Contact comes online"
+
+#: ../src/empathy-preferences.c:147
+msgid "Contact goes offline"
+msgstr "Contact goes offline"
+
+#: ../src/empathy-preferences.c:148
+msgid "Account connected"
+msgstr "Account connected"
+
+#: ../src/empathy-preferences.c:149
+msgid "Account disconnected"
+msgstr "Account disconnected"
+
+#: ../src/empathy-preferences.c:386
+msgid "Language"
+msgstr "Language"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:637
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:644
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:650
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:654
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:657
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:660
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:663
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:666
+msgid "Juliet has disconnected"
+msgstr "Juliet has disconnected"
+
+#: ../src/empathy-preferences.c:1032
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show groups"
+msgstr "Show groups"
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Show account balances"
+msgstr "Show account balances"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+msgid "Contact List"
+msgstr "Contact List"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "Start chats in:"
+msgstr "Start chats in:"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new ta_bs"
+msgstr "new ta_bs"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "new _windows"
+msgstr "new _windows"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Log conversations"
+msgstr "Log conversations"
+
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "Display incoming events in the notification area"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "Behavior"
+msgstr "Behaviour"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "General"
+msgstr "General"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../src/empathy-preferences.ui.h:22
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Play sound for events"
+msgstr "Play sound for events"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Sounds"
+msgstr "Sounds"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellation to improve call quality"
+
+#: ../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 ""
+"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."
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
-#: ../src/empathy-main-window.c:540
+#: ../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 ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"county and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+
+#. 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 "_Reduce location accuracy"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+msgstr "Privacy"
+
+#: ../src/empathy-preferences.ui.h:35
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:36
+msgid "_Cellphone"
+msgstr "_Mobile phone"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Location sources:"
+msgstr "Location sources:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
+
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "Spell Checking"
+
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
+
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "Themes"
+
+#: ../src/empathy-roster-window.c:244
+msgid "Provide Password"
+msgstr "Provide Password"
+
+#: ../src/empathy-roster-window.c:250
+msgid "Disconnect"
+msgstr "Disconnect"
+
+#: ../src/empathy-roster-window.c:493
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
+
+#: ../src/empathy-roster-window.c:569
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
+
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:674
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s account requires authorisation"
+
+#: ../src/empathy-roster-window.c:700
+msgid "Online Accounts"
+msgstr "Online Accounts"
+
+#: ../src/empathy-roster-window.c:747
+msgid "Update software..."
+msgstr "Update software…"
+
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "Reconnect"
 
-#: ../src/empathy-main-window.c:546
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "Edit Account"
 
-#: ../src/empathy-main-window.c:552
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "Close"
 
-#: ../src/empathy-main-window.c:1258
-msgid "Contact"
-msgstr "Contact"
-
-#: ../src/empathy-main-window.c:1585
-msgid "Contact List"
-msgstr "Contact List"
+#: ../src/empathy-roster-window.c:904
+msgid "Top up account"
+msgstr "Top up account"
 
-#: ../src/empathy-main-window.c:1695
-msgid "Show and edit accounts"
-msgstr "Show and edit accounts"
+#: ../src/empathy-roster-window.c:1590
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contacts on a _Map"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1598
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "You need to enable %s to see contacts here."
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "Context"
+#: ../src/empathy-roster-window.c:1676
+msgid "Change your presence to see contacts here"
+msgstr "Change your presence to see contacts here"
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Find in Contact _List"
+#: ../src/empathy-roster-window.c:1685
+msgid "No match found"
+msgstr "No match found"
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Join _Favorites"
-msgstr "Join _Favourites"
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "You haven't added any contact yet"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "Manage Favorites"
-msgstr "Manage Favourites"
+#: ../src/empathy-roster-window.c:1695
+msgid "No online contacts"
+msgstr "No online contacts"
 
-#: ../src/empathy-main-window.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal Size"
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "_New Conversation…"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
 msgstr "New _Call…"
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal Size With _Avatars"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "Contacts"
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "P_references"
-msgstr "P_references"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "_Add Contacts…"
 
-#: ../src/empathy-main-window.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Show P_rotocols"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "_Search for Contacts…"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "Sort by _Name"
-msgstr "Sort by _Name"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
 
-#: ../src/empathy-main-window.ui.h:12
-msgid "Sort by _Status"
-msgstr "Sort by _Status"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "_Rooms"
 
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "_Join…"
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Compact Size"
-msgstr "_Compact Size"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_Debug"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "_Manage Favourites"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "_File Transfers"
 msgstr "_File Transfers"
 
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Join…"
-msgstr "_Join…"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "P_references"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "Help"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "About Empathy"
+
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
+
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr "Go _Online"
+
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../src/empathy-roster-window.ui.h:4
+#| msgid "_Add Contacts..."
+msgid "_Add Contact..."
+msgstr "_Add Contact…"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
 msgstr "_New Conversation…"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Offline Contacts"
-msgstr "_Offline Contacts"
-
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Personal Information"
-msgstr "_Personal Information"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#: ../src/empathy-main-window.ui.h:27
-msgid "_Room"
-msgstr "_Room"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Status"
 
-#: ../src/empathy-new-chatroom-dialog.c:406
-msgid "Chat Room"
-msgstr "Chat Room"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "Done"
 
-#: ../src/empathy-new-chatroom-dialog.c:422
-msgid "Members"
-msgstr "Members"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+msgid "Please enter your account details"
+msgstr "Please enter your account details"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:634
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
 #, c-format
-msgid ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
+msgid "Edit %s account options"
+msgstr "Edit %s account options"
 
-#: ../src/empathy-new-chatroom-dialog.c:636
-#: ../src/empathy-new-chatroom-dialog.c:637
-msgid "No"
-msgstr "No"
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+msgid "Integrate your IM accounts"
+msgstr "Integrate your IM accounts"
 
-#: ../src/empathy-new-chatroom-dialog.c:665
-msgid "Could not start room listing"
-msgstr "Could not start room listing"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ../src/empathy-new-chatroom-dialog.c:675
-msgid "Could not stop room listing"
-msgstr "Could not stop room listing"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "Manage Messaging and VoIP accounts"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Couldn't load room list"
+#~ msgid "Show avatars"
+#~ msgstr "Show avatars"
 
-#: ../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 ""
-"Enter the room name to join here or click on one or more rooms in the list."
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../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 ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
+#~ msgid "Show protocols"
+#~ msgstr "Show protocols"
+
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "Whether to show protocols for contacts in the contact list."
+
+#~ msgid "Compact contact list"
+#~ msgstr "Compact contact list"
+
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "Whether to show the contact list in compact mode."
+
+#~ msgid "Contact list sort criterion"
+#~ msgstr "Contact list sort criterion"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Network:"
+#~ msgstr "Network:"
+
+#~ msgid "Password:"
+#~ msgstr "Password:"
+
+#~ msgid "Port:"
+#~ msgstr "Port:"
+
+#~ msgid "“%s” is not a valid contact ID"
+#~ msgstr "“%s” is not a valid contact ID"
+
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %d %B %Y"
+
+#~ msgid "_Block User"
+#~ msgstr "_Block User"
+
+#~ msgid "Decide _Later"
+#~ msgstr "Decide _Later"
+
+#~ msgid "Classic"
+#~ msgstr "Classic"
+
+#~ msgid "Simple"
+#~ msgstr "Simple"
+
+#~ msgid "Clean"
+#~ msgstr "Clean"
+
+#~ msgid "Blue"
+#~ msgstr "Blue"
+
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "Failed to retrieve your personal information from the server."
+
+#~ msgid "_Enable"
+#~ msgstr "_Enable"
+
+#~ msgid "_Disable"
+#~ msgstr "_Disable"
+
+#~ msgid "Contrast"
+#~ msgstr "Contrast"
+
+#~ msgid "Brightness"
+#~ msgstr "Brightness"
+
+#~ msgid "Gamma"
+#~ msgstr "Gamma"
+
+#~ msgid "Volume"
+#~ msgstr "Volume"
+
+#~ msgid "_Sidebar"
+#~ msgstr "_Sidebar"
+
+#~ msgid "Audio input"
+#~ msgstr "Audio input"
+
+#~ msgid "Video input"
+#~ msgstr "Video input"
+
+#~ msgid "Dialpad"
+#~ msgstr "Dialpad"
+
+#~ msgid "Details"
+#~ msgstr "Details"
+
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "Connected — %d:%02dm"
+
+#~ msgid "Send Video"
+#~ msgstr "Send Video"
+
+#~ msgid "Send Audio"
+#~ msgstr "Send Audio"
+
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "Top up %s (%s)…"
+
+#~ msgid "Top Up..."
+#~ msgstr "Top Up…"
+
+#~ msgid "_Offline Contacts"
+#~ msgstr "_Offline Contacts"
+
+#~ msgid "Show P_rotocols"
+#~ msgstr "Show P_rotocols"
+
+#~ msgid "Credit Balance"
+#~ msgstr "Credit Balance"
+
+#~ msgid "Contacts on a _Map"
+#~ msgstr "Contacts on a _Map"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "Find in Contact _List"
+
+#~ msgid "Sort by _Name"
+#~ msgstr "Sort by _Name"
+
+#~ msgid "Sort by _Status"
+#~ msgstr "Sort by _Status"
+
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Normal Size With _Avatars"
+
+#~ msgid "N_ormal Size"
+#~ msgstr "N_ormal Size"
+
+#~ msgid "_Compact Size"
+#~ msgstr "_Compact Size"
+
+#~ msgid "_Join…"
+#~ msgstr "_Join…"
+
+#~ msgid "Could not start room listing"
+#~ msgstr "Could not start room listing"
+
+#~ msgid "Could not stop room listing"
+#~ msgstr "Could not stop room listing"
+
+#~ msgid "Appearance"
+#~ msgstr "Appearance"
+
+#~ msgid "Redial"
+#~ msgstr "Redial"
+
+#~ msgid "V_ideo"
+#~ msgstr "V_ideo"
+
+#~ msgid "Video Off"
+#~ msgstr "Video Off"
+
+#~ msgid "Video Preview"
+#~ msgstr "Video Preview"
+
+#~ msgid "Video On"
+#~ msgstr "Video On"
+
+#~ msgid "Call the contact again"
+#~ msgstr "Call the contact again"
+
+#~ msgid "Camera Off"
+#~ msgstr "Camera Off"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "Disable camera and stop sending video"
+
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "Enable camera but don't send video"
+
+#~ msgid "Camera On"
+#~ msgstr "Camera On"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "Enable camera and send video"
+
+#~ msgid "Contact Map View"
+#~ msgstr "Contact Map View"
+
+#~ msgid "Call volume"
+#~ msgstr "Call volume"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Call volume, as a percentage."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Join Room"
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy has migrated butterfly logs"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "Room List"
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Whether Empathy has migrated butterfly logs."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Room:"
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket type not supported"
 
-#: ../src/empathy-preferences.c:139
-msgid "Message received"
-msgstr "Message received"
+#~ msgid "My Web Accounts"
+#~ msgstr "My Web Accounts"
 
-#: ../src/empathy-preferences.c:140
-msgid "Message sent"
-msgstr "Message sent"
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "The account %s is edited via %s."
 
-#: ../src/empathy-preferences.c:141
-msgid "New conversation"
-msgstr "New conversation"
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "The account %s cannot be edited in Empathy."
 
-#: ../src/empathy-preferences.c:142
-msgid "Contact goes online"
-msgstr "Contact goes online"
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Launch My Web Accounts"
 
-#: ../src/empathy-preferences.c:143
-msgid "Contact goes offline"
-msgstr "Contact goes offline"
+#~ msgid "Edit %s"
+#~ msgstr "Edit %s"
 
-#: ../src/empathy-preferences.c:144
-msgid "Account connected"
-msgstr "Account connected"
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncel"
 
-#: ../src/empathy-preferences.c:145
-msgid "Account disconnected"
-msgstr "Account disconnected"
+#~ msgid "Personal Information"
+#~ msgstr "Personal Information"
 
-#: ../src/empathy-preferences.c:446
-msgid "Language"
-msgstr "Language"
+#~ msgid "Favorite People"
+#~ msgstr "Favourite People"
 
-#: ../src/empathy-preferences.c:875
-msgid "Preferences"
-msgstr "Preferences"
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "Appearance"
+#~ msgid "Select contacts to link"
+#~ msgstr "Select contacts to link"
 
-#: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "Behaviour"
+#~ msgid "New contact preview"
+#~ msgstr "New contact preview"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "Chat Th_eme:"
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Contacts selected in the list on the left will be linked together."
 
-#: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "Disable notifications when _away or busy"
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Link Contacts…"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "Disable sounds when _away or busy"
+#~ msgid "Link Contacts"
+#~ msgstr "Link Contacts"
 
-#: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "Display incoming events in the notification area"
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Unlink…"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "Enable notifications when a contact comes online"
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
 
-#: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "Enable notifications when a contact goes offline"
+#~ msgid "_Link"
+#~ msgstr "_Link"
 
-#: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Enable notifications when the _chat is not focused"
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Unlink linked contacts '%s'?"
 
-#: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "Enable spell checking for languages:"
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
 
-#: ../src/empathy-preferences.ui.h:11
-msgid "General"
-msgstr "General"
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Unlink"
 
-#: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "Location sources:"
+#~ msgid "Contact ID:"
+#~ msgstr "Contact ID:"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "Log conversations"
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Notifications"
-msgstr "Notifications"
+#~ msgid "Send _Video"
+#~ msgstr "Send _Video"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Play sound for events"
-msgstr "Play sound for events"
+#~ msgid "C_all"
+#~ msgstr "C_all"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "Privacy"
+#~ msgid "Set your presence and current status"
+#~ msgstr "Set your presence and current status"
 
-#: ../src/empathy-preferences.ui.h:18
-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 ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"county and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "The selected contact cannot receive files."
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "Show _smileys as images"
+#~ msgid "The selected contact is offline."
+#~ msgstr "The selected contact is offline."
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "Show contact _list in rooms"
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "There was an error while importing the accounts."
 
-#: ../src/empathy-preferences.ui.h:21
-msgid "Sounds"
-msgstr "Sounds"
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "There was an error while parsing the account details."
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#~ msgid "There was an error while creating the account."
+#~ msgstr "There was an error while creating the account."
 
-#: ../src/empathy-preferences.ui.h:23
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+#~ msgid "There was an error."
+#~ msgstr "There was an error."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "Themes"
+#~ msgid "The error message was: %s"
+#~ msgstr "The error message was: %s"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "_Automatically connect on startup"
-msgstr "_Automatically connect on startup"
+#~ 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 ""
+#~ "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."
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Cellphone"
-msgstr "_Mobile phone"
+#~ msgid "An error occurred"
+#~ msgstr "An error occurred"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "_Enable bubble notifications"
-msgstr "_Enable bubble notifications"
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Do you have any other chat accounts you want to set up?"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable sound notifications"
-msgstr "_Enable sound notifications"
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "What kind of chat account do you want to create?"
 
-#: ../src/empathy-preferences.ui.h:29
-msgid "_GPS"
-msgstr "_GPS"
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Do you want to create other chat accounts?"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Network (IP, Wi-Fi)"
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Enter the details for the new account"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+#~ 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 ""
+#~ "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."
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Publish location to my contacts"
-msgstr "_Publish location to my contacts"
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Do you have an account you've been using with another chat program?"
 
-#. 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:34
-msgid "_Reduce location accuracy"
-msgstr "_Reduce location accuracy"
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Yes, import my account details from "
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "Status"
-msgstr "Status"
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Yes, I'll enter my account details now"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Quit"
-msgstr "_Quit"
+#~ msgid "No, I want a new account"
+#~ msgstr "No, I want a new account"
 
-#: ../src/empathy-map-view.c:452
-msgid "Contact Map View"
-msgstr "Contact Map View"
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, I just want to see people online nearby for now"
 
-#: ../src/empathy-debug-window.c:1219
-msgid "Save"
-msgstr "Save"
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Select the accounts you want to import:"
 
-#: ../src/empathy-debug-window.c:1395
-msgid "Debug Window"
-msgstr "Debug Window"
+#~ msgid "No, that's all for now"
+#~ msgstr "No, that's all for now"
 
-#: ../src/empathy-debug-window.c:1475
-msgid "Pause"
-msgstr "Pause"
+#~ msgid "Edit->Accounts"
+#~ msgstr "Edit->Accounts"
 
-#: ../src/empathy-debug-window.c:1487
-msgid "Level "
-msgstr "Level "
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "I do _not want to enable this feature for now"
 
-#: ../src/empathy-debug-window.c:1507
-msgid "Debug"
-msgstr "Debug"
+#~ 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 ""
+#~ "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 dialogue"
 
-#: ../src/empathy-debug-window.c:1513
-msgid "Info"
-msgstr "Info"
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Messaging and VoIP Accounts Assistant"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
-msgid "Message"
-msgstr "Message"
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Welcome to Empathy"
 
-#: ../src/empathy-debug-window.c:1525
-msgid "Warning"
-msgstr "Warning"
+#~ msgid "Please enter personal details"
+#~ msgstr "Please enter personal details"
 
-#: ../src/empathy-debug-window.c:1531
-msgid "Critical"
-msgstr "Critical"
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
 
-#: ../src/empathy-debug-window.c:1537
-msgid "Error"
-msgstr "Error"
+#~ msgid "Protocol:"
+#~ msgstr "Protocol:"
 
-#: ../src/empathy-debug-window.c:1556
-msgid "Time"
-msgstr "Time"
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
 
-#: ../src/empathy-debug-window.c:1559
-msgid "Domain"
-msgstr "Domain"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
 
-#: ../src/empathy-debug-window.c:1561
-msgid "Category"
-msgstr "Category"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
 
-#: ../src/empathy-debug-window.c:1563
-msgid "Level"
-msgstr "Level"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
 
-#: ../src/empathy-debug-window.c:1600
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#~ msgid "_Personal Information"
+#~ msgstr "_Personal Information"
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
-msgid "Invite Participant"
-msgstr "Invite Participant"
+#~ msgid "Input level:"
+#~ msgstr "Input level:"
 
-#: ../src/empathy-invite-participant-dialog.c:35
-msgid "Choose a contact to invite into the conversation:"
-msgstr "Choose a contact to invite into the conversation:"
+#~ msgid "Input volume:"
+#~ msgstr "Input volume:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
-msgid "Invite"
-msgstr "Invite"
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Open new chats in separate windows"
 
-#: ../src/empathy-accounts.c:183
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
+#~ msgid "All"
+#~ msgstr "All"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"Don't display any dialogues unless there are only \"People Nearby\" accounts"
+#~ msgid "Date"
+#~ msgstr "Date"
 
-#: ../src/empathy-accounts.c:191
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+#~ msgid "Conversations"
+#~ msgstr "Conversations"
 
-#: ../src/empathy-accounts.c:193
-msgid "<account-id>"
-msgstr "<account-id>"
+#~ msgid "Find Next"
+#~ msgstr "Find Next"
 
-#: ../src/empathy-accounts.c:198
-msgid "- Empathy Accounts"
-msgstr "- Empathy Accounts"
+#~ msgid "Find Previous"
+#~ msgstr "Find Previous"
 
-#: ../src/empathy-accounts.c:237
-msgid "Empathy Accounts"
-msgstr "Empathy Accounts"
+#~ msgid "Previous Conversations"
+#~ msgstr "Previous Conversations"
 
-#: ../src/empathy-debugger.c:66
-msgid "Empathy Debugger"
-msgstr "Empathy Debugger"
+#~ msgid "_For:"
+#~ msgstr "_For:"
 
-#: ../src/empathy-chat.c:104
-msgid "- Empathy Chat Client"
-msgstr "- Empathy Chat Client"
+#~ msgid "Enter Custom Message"
+#~ msgstr "Enter Custom Message"
 
-#: ../src/empathy-notifications-approver.c:184
-msgid "Respond"
-msgstr "Respond"
+#~ msgid "Save _New Status Message"
+#~ msgstr "Save _New Status Message"
 
-#: ../src/empathy-notifications-approver.c:190
-msgid "Reject"
-msgstr "Reject"
+#~ msgid "Saved Status Messages"
+#~ msgstr "Saved Status Messages"
 
-#: ../src/empathy-notifications-approver.c:194
-msgid "Answer"
-msgstr "Answer"
+#~ msgid "Show and edit accounts"
+#~ msgstr "Show and edit accounts"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
-msgid "Decline"
-msgstr "Decline"
+#~ msgid "%s is now offline."
+#~ msgstr "%s is now offline."
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
-msgid "Accept"
-msgstr "Accept"
+#~ msgid "%s is now online."
+#~ msgstr "%s is now online."
+
+#~ msgid "Context"
+#~ msgstr "Context"
 
 #~ msgid "Empathy has asked about importing accounts"
 #~ msgstr "Empathy has asked about importing accounts"
@@ -3924,15 +5098,9 @@ msgstr "Accept"
 #~ msgid "<b>Location</b>, "
 #~ msgstr "<b>Location</b>, "
 
-#~ msgid "<b><span size='xx-large'>Loading account information</span></b>"
-#~ msgstr "<b><span size='xx-large'>Loading account information</span></b>"
-
 #~ msgid "page 1"
 #~ msgstr "page 1"
 
-#~ msgid "page 2"
-#~ msgstr "page 2"
-
 #~ msgid "page 3"
 #~ msgstr "page 3"
 
@@ -3982,30 +5150,18 @@ msgstr "Accept"
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "Failed to reconnect this chat"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "Failed to join chat room"
-
 #~ msgid "Select a destination"
 #~ msgstr "Select a destination"
 
 #~ msgid "%s account"
 #~ msgstr "%s account"
 
-#~ msgid "Accounts"
-#~ msgstr "Accounts"
-
 #~ msgid "_Add&#x2026;"
 #~ msgstr "_Add&#x2026;"
 
 #~ msgid "_Import&#x2026;"
 #~ msgstr "_Import&#x2026;"
 
-#~ msgid " Accounts"
-#~ msgstr " Accounts"
-
-#~ msgid "Salut account is created"
-#~ msgstr "Salut account is created"
-
 #~ msgid "Whether the Salut account has been created on the first Empathy run."
 #~ msgstr ""
 #~ "Whether the Salut account has been created on the first Empathy run."
@@ -4017,18 +5173,9 @@ msgstr "Accept"
 #~ "Try to import any recognised accounts and display an assistant if that "
 #~ "fails"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "Show the accounts dialogue"
-
 #~ msgid "Hidden"
 #~ msgstr "Hidden"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "User requested disconnect"
-
-#~ msgid "_Add Contact..."
-#~ msgstr "_Add Contact…"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>Location</b>"
 
@@ -4062,15 +5209,6 @@ msgstr "Accept"
 #~ msgid "You don't have the needed external application to handle it."
 #~ msgstr "You don't have the needed external application to handle it."
 
-#~ msgid "New _Call..."
-#~ msgstr "New _Call…"
-
-#~ msgid "_Join..."
-#~ msgstr "_Join…"
-
-#~ msgid "_New Conversation..."
-#~ msgstr "_New Conversation…"
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "Unable to start application for service %s: %s"
 
@@ -4151,9 +5289,6 @@ msgstr "Accept"
 #~ msgid "Conversations (%d)"
 #~ msgstr "Conversations (%d)"
 
-#~ msgid "_Contact"
-#~ msgstr "_Contact"
-
 #~ msgid "No error specified"
 #~ msgstr "No error specified"
 
@@ -4169,9 +5304,6 @@ msgstr "Accept"
 #~ msgid "Allow _network usage"
 #~ msgstr "Allow _network usage"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue Settings"
-
 #~ msgid "Forget password and clear the entry."
 #~ msgstr "Forget password and clear the entry."
 
@@ -4190,9 +5322,6 @@ msgstr "Accept"
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "_Check Word Spelling…"
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>Topic:</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "Group Chat"
 
@@ -4214,9 +5343,6 @@ msgstr "Accept"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>Groups</b>"
 
-#~ msgid "Save message"
-#~ msgstr "Save message"
-
 #~ msgid "Status:"
 #~ msgstr "Status:"
 
@@ -4300,12 +5426,6 @@ msgstr "Accept"
 #~ msgid "Join _New..."
 #~ msgstr "Join _New…"
 
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "Show _Offline Contacts"
-
-#~ msgid "Chat Rooms"
-#~ msgstr "Chat Rooms"
-
 #~ msgid "Browse:"
 #~ msgstr "Browse:"
 
@@ -4329,9 +5449,6 @@ msgstr "Accept"
 #~ msgid "Show _avatars"
 #~ msgstr "Show _avatars"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "Show co_mpact contact list"
-
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Enable popup when contact is available"
 
@@ -4453,12 +5570,6 @@ msgstr "Accept"
 #~ msgid "View contact information"
 #~ msgstr "View contact information"
 
-#~ msgid "Re_name"
-#~ msgstr "Re_name"
-
-#~ msgid "Rename"
-#~ msgstr "Rename"
-
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Edit the groups and name for this contact"
 
@@ -4468,9 +5579,6 @@ msgstr "Accept"
 #~ msgid "View previous conversations with this contact"
 #~ msgstr "View previous conversations with this contact"
 
-#~ msgid "Start a voice or video conversation with this contact"
-#~ msgstr "Start a voice or video conversation with this contact"
-
 #~ msgid "Invalid handle"
 #~ msgstr "Invalid handle"
 
@@ -4489,18 +5597,12 @@ msgstr "Accept"
 #~ msgid "Channel banned"
 #~ msgstr "Channel banned"
 
-#~ msgid "Channel full"
-#~ msgstr "Channel full"
-
 #~ msgid "Channel invite only"
 #~ msgstr "Channel invite only"
 
 #~ msgid "Unknown error code"
 #~ msgstr "Unknown error code"
 
-#~ msgid "Start Call"
-#~ msgstr "Start Call"
-
 #~ msgid "gtk-close"
 #~ msgstr "gtk-close"
 
@@ -4522,12 +5624,6 @@ msgstr "Accept"
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_Use for chat rooms"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "ICQ account settings"
-
-#~ msgid "irc account settings"
-#~ msgstr "irc account settings"
-
 #~ msgid "msn account settings"
 #~ msgstr "msn account settings"
 
@@ -4540,9 +5636,6 @@ msgstr "Accept"
 #~ msgid "Input"
 #~ msgstr "Input"
 
-#~ msgid "Mute"
-#~ msgstr "Mute"
-
 #~ msgid "Output"
 #~ msgstr "Output"
 
@@ -4573,9 +5666,6 @@ msgstr "Accept"
 #~ msgid "_New Message..."
 #~ msgstr "_New Message..."
 
-#~ msgid "Disable"
-#~ msgstr "Disable"
-
 #~ msgid "<b>Account</b>"
 #~ msgstr "<b>Account</b>"
 
@@ -4601,9 +5691,6 @@ msgstr "Accept"
 #~ msgid "Clear List..."
 #~ msgstr "Clear List..."
 
-#~ msgid "Are you sure you want to clear the list?"
-#~ msgstr "Are you sure you want to clear the list?"
-
 #~ msgid ""
 #~ "This will remove any custom messages you have added to the list of preset "
 #~ "status messages."
@@ -4645,9 +5732,6 @@ msgstr "Accept"
 #~ msgid "Contact List - Gossip"
 #~ msgstr "Contact List - Gossip"
 
-#~ msgid "Edit Groups"
-#~ msgstr "Edit Groups"
-
 #~ msgid "ID:"
 #~ msgstr "ID:"