[empathy] Updated Irish translation.



commit 5be490424430b0ab1425ac25f344a95b4b2d08c8
Author: SeÃn de BÃrca <leftmostcat gmail com>
Date:   Sun Oct 28 14:29:03 2012 -0600

    Updated Irish translation.

 po/ga.po | 4437 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 2139 insertions(+), 2298 deletions(-)
---
diff --git a/po/ga.po b/po/ga.po
index e83365d..e51f427 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,14 +1,14 @@
 # Irish translations for empathy package.
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-# SeÃn de BÃrca <leftmostcat gmail com>, 2009, 2011.
+# SeÃn de BÃrca <leftmostcat gmail com>, 2009-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-25 14:21-0600\n"
-"PO-Revision-Date: 2011-09-25 15:13-0600\n"
+"POT-Creation-Date: 2012-10-28 14:18-0600\n"
+"PO-Revision-Date: 2012-10-28 14:24-0600\n"
 "Last-Translator: SeÃn de BÃrca <leftmostcat gmail com>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
 "Language: ga\n"
@@ -19,1061 +19,1005 @@ msgstr ""
 "%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliant IM"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Cur Teachtaireachtaà Meandaracha Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliant IM"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
+msgid "Connection managers should be used"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
+msgid "Empathy should auto-connect on startup"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
+msgid "Empathy should auto-away when idle"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
+msgid "Empathy default download folder"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
+msgid "The default folder to save file transfers in."
+msgstr ""
+
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show offline contacts"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
+#, fuzzy
+msgid "Show Balance in contact list"
 msgstr "DlÃthliosta teagmhÃlacha"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
+msgid "Whether to show account balances in the contact list."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
+msgid "Hide main window"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
+msgid "Hide the main window."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "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 ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
+msgid "Open new chats in separate windows"
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
+msgid "Always open a separate chat window for new chats."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
+msgid "The position for the chat window side pane"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
+msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
+#, fuzzy
+msgid "Show contact groups"
+msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
+#, fuzzy
+msgid "Whether to show groups in the contact list."
+msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
+msgid "Use notification sounds"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
+msgid "Whether to play a sound to notify of events."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
+msgid "Disable sounds when away"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
+msgid "Play a sound for incoming messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
+msgid "Play a sound for outgoing messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
+msgid "Play a sound for new conversations"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Cumasaigh litreoir"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
+msgid "Whether to play a sound to notify of new conversations."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
+msgid "Play a sound when a contact logs in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
+msgid "Play a sound when a contact logs out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
+msgid "Play a sound when we log in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
+msgid "Whether to play a sound when logging into a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
+msgid "Play a sound when we log out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
+msgid "Whether to play a sound when logging out of a network."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
+msgid "Enable popup notifications for new messages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
+msgid "Disable popup notifications when away"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
+msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-msgid "Show Balance in contact list"
-msgstr "DlÃthliosta teagmhÃlacha"
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
+msgid "Use graphical smileys"
+msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "TaispeÃin abhatÃranna"
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
+msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
+msgid "Chat window theme"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "TaispeÃin prÃtacail"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
+msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
+msgid "Chat window theme variant"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
+msgid "Path of the Adium theme to use"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
+msgid "Enable WebKit Developer Tools"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
-"The theme variant that is used to display the conversation in chat windows."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
+msgid "Inform other users when you are typing to them"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
+msgid "Whether to use the theme for chat rooms."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
+msgid "Spell checking languages"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr ""
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
+msgid "Enable spell checker"
+msgstr "Cumasaigh litreoir"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
+msgid "Nick completed character"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
+msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
+msgid "Last account selected in Join Room dialog"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
+msgid "Camera device"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
+msgid "Camera position"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
+msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
+msgid "Echo cancellation support"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
+msgid "Show hint about closing the main window"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
+msgid "Empathy can publish the user's location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
+msgid "Empathy can use the network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"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.h:96
+msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
+msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
+msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
+#: ../libempathy/empathy-ft-handler.c:733
+msgid "No reason was specified"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-#, fuzzy
-msgid "Whether to show the contact list in chat rooms."
-msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "The change in state was requested"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "You canceled the file transfer"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "The other participant canceled the file transfer"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-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."
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "Error while trying to transfer the file"
 msgstr ""
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "The other participant is unable to transfer the file"
 msgstr ""
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr ""
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+msgid "Unknown reason"
+msgstr "CÃis anaithnid"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:914
 msgid "File transfer completed, but the file was corrupted"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1200
 msgid "File transfer not supported by remote contact"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1256
 msgid "The selected file is not a regular file"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1265
 msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#, fuzzy
+msgid "Password not found"
+msgstr "Focal faire:"
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr ""
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr ""
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr ""
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:407
 #, fuzzy, c-format
 msgid "Called %s"
 msgstr "Glaoch"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:410
 #, c-format
 msgid "Call from %s"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr ""
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr ""
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr ""
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr ""
+#: ../libempathy/empathy-time.c:108
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr ""
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr ""
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
 msgstr ""
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "CÃis anaithnid"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "Ar FÃil"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "GnÃthach"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "Amuigh"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "Dofheicthe"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "As LÃne"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:238
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
 msgid "Status is set to offline"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../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 ""
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate not provided"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not activated"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate hostname mismatch"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate fingerprint mismatch"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate self-signed"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:348
+msgid "This account is already connected to the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:362
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:366
+msgid "Your software is too old"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:368
+msgid "Internal error"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:497
+#: ../libempathy-gtk/empathy-roster-model.h:30
 msgid "People Nearby"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "Yahoo! na SeapÃine"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:531
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:532
 msgid "Facebook Chat"
 msgstr "Comhrà Facebook"
 
-#: ../libempathy/empathy-time.c:88
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../libempathy-gtk/empathy-account-chooser.c:689
+#, fuzzy
+msgid "All accounts"
+msgstr "Cuntais"
 
-#: ../libempathy/empathy-time.c:93
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../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
+#, fuzzy
+msgid "Pass_word"
+msgstr "_Focal faire:"
 
-#: ../libempathy/empathy-time.c:98
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#, fuzzy
+msgid "Screen _Name"
+msgstr "_Ainm TaispeÃna:"
 
-#: ../libempathy/empathy-time.c:103
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr ""
 
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
+#. 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 ""
 
-#: ../libempathy/empathy-time.c:113
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
+#: ../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
+#, fuzzy
+msgid "_Port"
+msgstr "_Port:"
 
-#: ../libempathy/empathy-time.c:136
-msgid "in the future"
+#: ../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
+#, fuzzy
+msgid "_Server"
+msgstr "Frea_stalaÃ:"
+
+#: ../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 "Casta"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr ""
+
+#: ../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
 #, fuzzy
-msgid "All accounts"
-msgstr "Cuntais"
+msgid "Remember Password"
+msgstr "Focal faire:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
 msgid "Account"
 msgstr "Cuntas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "Focal faire"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+#: ../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 "FreastalaÃ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
-#: ../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:529
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
-#, c-format
-msgid "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:762
+#, fuzzy, c-format
+msgid "%s"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-#, fuzzy
-msgid "My Web Accounts"
-msgstr "Cuntais"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr ""
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, fuzzy, c-format
-msgid "Edit %s"
-msgstr "_Eagar"
+msgid "%s:"
+msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1429
 #, fuzzy
 msgid "Username:"
 msgstr "_Ainm ÃsÃideora:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1746
 msgid "A_pply"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1775
 msgid "L_og in"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1845
 msgid "This account already exists on the server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1849
 #, fuzzy
 msgid "Create a new account on the server"
 msgstr "Cr_uthaigh cuntas nua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr ""
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2270
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ar %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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2296
 #, c-format
 msgid "%s Account"
 msgstr "Cuntas %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2300
 msgid "New account"
 msgstr "Cuntas nua"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr ""
-
-#: ../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-irc.ui.h:1
-#: ../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 "Casta"
-
-#: ../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:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Focal faire:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../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:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 #, fuzzy
-msgid "Remember Password"
-msgstr "Focal faire:"
+msgid "Login I_D"
+msgstr "C_A LogÃla Isteach:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../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:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Ainm TaispeÃna:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../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:27
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "Frea_stalaÃ:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr ""
-
-#: ../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 "C_A LogÃla Isteach:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-msgid "What is your GroupWise User ID?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise password?"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#, fuzzy
+msgid "ICQ _UIN"
+msgstr "_UIN ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 #, fuzzy
-msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
 msgstr "Tacar carachtar:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-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:244
-#, fuzzy
-msgid "Register"
-msgstr "Iartharach"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-msgid "None"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "LÃonra"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 #, fuzzy
-msgid "Character set:"
+msgid "Character set"
 msgstr "Tacar carachtar:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Addâ"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "LÃonra"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "LÃonra:"
+#: ../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
+#, fuzzy
+msgid "Remove"
+msgstr "gtk-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 "Nickname:"
-msgstr "Leasainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-msgid "Password:"
-msgstr "Focal faire:"
+msgid "Up"
+msgstr ""
 
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Quit message:"
-msgstr "Teachtaireacht scortha:"
+msgid "Down"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Real name:"
-msgstr "FÃorainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "Freastalaithe"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Which IRC network?"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#, fuzzy
+msgid "Nickname"
+msgstr "Leasainm:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+#, fuzzy
+msgid "Quit message"
+msgstr "Teachtaireacht scortha:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
 #, fuzzy
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Criptià riachtanach (TLS/SSL)"
+msgid "Real name"
+msgstr "FÃorainm:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
 #, fuzzy
-msgid "I_gnore SSL certificate errors"
-msgstr "DÃan _neamhaird ar earrÃidà teastas SSL"
+msgid "Username"
+msgstr "_Ainm ÃsÃideora:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "SÃraigh socruithe freastalaÃ"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "Which IRC network?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+msgid "What is your IRC nickname?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ac_mhainn:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr ""
 
 #. 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:14
+#: ../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"
@@ -1081,212 +1025,286 @@ msgid ""
 "Facebook username if you don't have one."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "ÃsÃid sean-SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "What is your Jabber ID?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#, fuzzy
+msgid "I_gnore SSL certificate errors"
+msgstr "DÃan _neamhaird ar earrÃidà teastas SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#, fuzzy
+msgid "Reso_urce"
+msgstr "Ac_mhainn:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#, fuzzy
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Criptià riachtanach (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Override server settings"
+msgstr "SÃraigh socruithe freastalaÃ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "ÃsÃid sean-SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your desired Jabber ID?"
+msgid "What is your Jabber ID?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber password?"
+msgid "What is your desired Jabber ID?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<b>Example:</b> user hotmail com"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-msgid "What is your Windows Live ID?"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+msgid "What is your desired Jabber password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live password?"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#, fuzzy
+msgid "Nic_kname"
+msgstr "Leasainm:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Seoladh _rÃomhphoist:"
+#, fuzzy
+msgid "_Last Name"
+msgstr "_Sloinne:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 #, fuzzy
-msgid "Nic_kname:"
-msgstr "Leasainm:"
+msgid "_First Name"
+msgstr "_Ainm:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
-msgstr "_Ainm:"
+#, fuzzy
+msgid "_Published Name"
+msgstr "Ainm _Foilsithe:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
+#, fuzzy
+msgid "_Jabber ID"
 msgstr "CA _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sloinne:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Ainm _Foilsithe:"
+#, fuzzy
+msgid "E-_mail address"
+msgstr "Seoladh _rÃomhphoist:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<b>Example:</b> user my sip server"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user hotmail com"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#, fuzzy
+msgid "Register"
+msgstr "Iartharach"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#, fuzzy
+msgid "_Username"
+msgstr "_Ainm ÃsÃideora:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user my sip server"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "NAT Traversal Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Proxy Options"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Miscellaneous Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#, fuzzy
+msgid "STUN Server"
 msgstr "Freastalaà STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "FreastalaÃ:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Discover the STUN server automatically"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Discover Binding"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#, fuzzy
+msgid "Authentication username"
+msgstr "Cliant IM Empathy"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #, fuzzy
-msgid "Transport:"
+msgid "Transport"
 msgstr "Port STUN:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Loose Routing"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#, fuzzy
+msgid "Local IP Address"
+msgstr "Seoladh _rÃomhphoist:"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Ainm ÃsÃideora:"
+msgid "What is your SIP account password?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Focal faire:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "C_A Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 #, fuzzy
 msgid "I_gnore conference and chat room invitations"
 msgstr "DÃan _neamhaird ar chuirà comhdhÃla agus seomra comhrÃ"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lo_gchaighdeÃn an Liosta SeomraÃ:"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr ""
+#, fuzzy
+msgid "Ch_aracter set:"
+msgstr "Tacar carachtar:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr ""
+msgid "_Port:"
+msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "C_A Yahoo!:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lo_gchaighdeÃn an Liosta SeomraÃ:"
+msgid "What is your Yahoo! password?"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "Roghnaigh d'Ãomhà AbhatÃr"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "Gan ÃomhÃ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "ÃomhÃnna"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "Gach Comhad"
 
@@ -1294,206 +1312,249 @@ msgstr "Gach Comhad"
 msgid "Click to enlarge"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentication failed for account <b>%s</b>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3724
+msgid "Retry"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:727
 msgid "Failed to open private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:785
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:975
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:967
+#, fuzzy
+msgid "Invalid contact ID"
+msgstr "CA TeagmhÃla:"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1054
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1057
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1110
 #, c-format
 msgid "Usage: %s"
 msgstr "ÃsÃid: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "Unknown command"
 msgstr "Ordà anaithnid"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1281
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-chat.c:1538
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1619
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1623
+#, c-format
+msgid "Error sending message: %s"
+msgstr ""
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1550
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1590
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1597
 msgid "offline"
 msgstr "as lÃne"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "invalid contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "permission denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "too long message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "not implemented"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "unknown"
 msgstr "anaithnid"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+msgid "Topic:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1490
+#: ../libempathy-gtk/empathy-chat.c:1695
 #, c-format
-msgid "Error sending message: %s"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
-msgid "Topic:"
+msgid "Topic set to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, c-format
-msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1702
 msgid "No topic defined"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2218
 msgid "(No Suggestions)"
 msgstr ""
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2286
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr ""
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2323
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2393
 msgid "Insert Smiley"
 msgstr "IonsÃigh Straiseog"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2411
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "_Seol"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2468
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2718
 #, c-format
 msgid "%s has disconnected"
 msgstr ""
@@ -1501,12 +1562,12 @@ msgstr ""
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2725
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2728
 #, c-format
 msgid "%s was kicked"
 msgstr ""
@@ -1514,17 +1575,17 @@ msgstr ""
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2736
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2739
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s has left the room"
 msgstr ""
@@ -1534,17 +1595,17 @@ msgstr ""
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2752
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2777
 #, c-format
 msgid "%s has joined the room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2802
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
@@ -1552,92 +1613,86 @@ msgstr ""
 #. 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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
+#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2573
+#: ../src/empathy-call-window.c:2879 ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Would you like to store this password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3670
 #, fuzzy
 msgid "Remember"
 msgstr "Baill"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3680
 msgid "Not now"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3488
-msgid "Retry"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3728
 msgid "Wrong password; please try again:"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3858
 msgid "This room is protected by a password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3885
+#: ../src/empathy-new-chatroom-dialog.c:780
 #, fuzzy
 msgid "Join"
 msgstr "C_eangail"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4132
 msgid "Conversation"
 msgstr "ComhrÃ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4137
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr ""
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "Cuntas:"
 
@@ -1646,598 +1701,522 @@ msgstr "Cuntas:"
 msgid "Blocked Contacts"
 msgstr "_TeagmhÃlacha As LÃne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 #, fuzzy
-msgid "Remove"
-msgstr "gtk-remove"
-
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "CÃipeÃil _Seoladh an Naisc"
+msgid "Full name"
+msgstr "Ainm IomlÃn:"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Oscail Nasc"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr ""
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
-msgid "%A %B %d %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#, fuzzy
+msgid "E-mail address"
+msgstr "Seoladh _rÃomhphoist:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Cuir Eolas TeagmhÃla in Eagar"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#, fuzzy
+msgid "Website"
+msgstr "SuÃomh grÃasÃin:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Eolas Pearsanta"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
-msgid "New Contact"
-msgstr "TeagmhÃil Nua"
+#. 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
+#, fuzzy
+msgid "Last seen:"
+msgstr "_Sloinne:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
-#, c-format
-msgid "Block %s?"
-msgstr ""
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "FreastalaÃ:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Connected from:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
-msgid "_Block"
-msgstr "_Bac"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#, fuzzy
+msgid "Away message:"
+msgstr "Teachtaireacht scortha:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#, fuzzy
+msgid "work"
+msgstr "LÃonra"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr ""
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#, fuzzy
+msgid "preferred"
+msgstr "Sainroghanna"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr ""
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#, fuzzy
+msgid "Search contacts"
+msgstr "Roghnaigh teagmhÃil..."
 
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Bain"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+msgid "Search: "
+msgstr "Cuardaigh: "
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr ""
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#, fuzzy
+msgid "_Add Contact"
+msgstr "_Cuir TeagmhÃil Leis..."
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+msgid "No contacts found"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "Cuir TeagmhÃil _Leisâ"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+msgid "Your message introducing yourself:"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+msgid "Please let me see when you're online. Thanks!"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:168
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:224
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr ""
+
+#. 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
+#, fuzzy
+msgid "Identifier"
+msgstr "AitheantÃir:"
+
+#. Setup nickname entry
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-user-info.c:449
+#, fuzzy
+msgid "Alias"
+msgstr "Ailias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#, fuzzy
+msgid "Information requestedâ"
+msgstr "_Eolas"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#, fuzzy
+msgid "OS"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#, fuzzy
+msgid "Version"
+msgstr "Leagan:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#, fuzzy
+msgid "Client"
+msgstr "Cliant:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:327
+msgid "Groups"
+msgstr "GrÃpaÃ"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:339
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-groups-widget.c:358
+msgid "_Add Group"
+msgstr "Cuir GrÃpa _Leis"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:393
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-groups-widget.c:403
+msgid "Group"
+msgstr "GrÃpa"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "TeagmhÃil Nua"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../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] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "_Bac"
+
+#: ../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] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Cuir Eolas TeagmhÃla in Eagar"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#, fuzzy
+msgid "Linked Contacts"
+msgstr "_TeagmhÃlacha As LÃne"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#. 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 ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Glaoch"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:422
+msgid "Mobile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:424
+msgid "Work"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:426
+msgid "HOME"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:669
 msgid "_Block Contact"
 msgstr "_Bac TeagmhÃil"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+msgid "Delete and _Block"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:787
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr ""
+
+#: ../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 ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:807
+msgid "Removing contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "_Bain"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1234
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "_ComhrÃ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
+#. 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 "Glaoch _Fuaime"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
+#: ../libempathy-gtk/empathy-individual-menu.c:1335
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Glaoch FÃ_se"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "ComhrÃite _Roimhe Seo"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
+#: ../libempathy-gtk/empathy-individual-menu.c:1405
 msgid "Send File"
 msgstr "Seol Comhad"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
+#: ../libempathy-gtk/empathy-individual-menu.c:1435
 msgid "Share My Desktop"
 msgstr "Comhroinn Mo Dheasc"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-individual-menu.c:1461
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
-msgstr "CeanÃn"
+msgstr "Cuir Leis na CeanÃin"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
+#: ../libempathy-gtk/empathy-individual-menu.c:1490
 msgid "Infor_mation"
 msgstr "_Eolas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-#, fuzzy
-msgctxt "Edit contact (contextual menu)"
+#: ../libempathy-gtk/empathy-individual-menu.c:1539
+msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
-msgstr "_Eagar"
+msgstr "Cuir in E_agar"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1655
+#: ../src/empathy-chat-window.c:1246
 msgid "Inviting you to this room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
+#: ../libempathy-gtk/empathy-individual-menu.c:1701
 msgid "_Invite to Chat Room"
 msgstr "_Tabhair Cuireadh Seomra ComhrÃ"
 
-#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
-#, fuzzy
-msgid "Search contacts"
-msgstr "Roghnaigh teagmhÃil..."
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
-msgid "Search: "
-msgstr "Cuardaigh: "
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
-#, fuzzy
-msgid "_Add Contact"
-msgstr "_Cuir TeagmhÃil Leis..."
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
-msgid "No contacts found"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
-msgid "Your message introducing yourself:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
-msgid "Please let me see when you're online. Thanks!"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-#, fuzzy
-msgid "Full name:"
-msgstr "Ainm IomlÃn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-#, fuzzy
-msgid "Website:"
-msgstr "SuÃomh grÃasÃin:"
+#: ../libempathy-gtk/empathy-individual-menu.c:1897
+msgid "_Add Contactâ"
+msgstr "Cuir TeagmhÃil _Leisâ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
+#: ../libempathy-gtk/empathy-individual-view.c:2373
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
 msgstr ""
 
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-#, fuzzy
-msgid "Last seen:"
-msgstr "_Sloinne:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
+#: ../libempathy-gtk/empathy-individual-view.c:2376
+msgid "Removing group"
 msgstr ""
 
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
+#: ../libempathy-gtk/empathy-individual-view.c:2444
 #, fuzzy
-msgid "Away message:"
-msgstr "Teachtaireacht scortha:"
+msgid "Re_name"
+msgstr "FÃorainm:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "SuÃomh"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
-msgid "Save Avatar"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
-msgid "Unable to save avatar"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr ""
-
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
 msgid "Alias:"
 msgstr "Ailias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliant:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr ""
-
-#. 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:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
 msgid "Identifier:"
 msgstr "AitheantÃir:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-#, fuzzy
-msgid "Information requestedâ"
-msgstr "_Eolas"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "OS:"
-msgstr "OS:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Version:"
-msgstr "Leagan:"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:333
-msgid "Groups"
-msgstr "GrÃpaÃ"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:345
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-groups-widget.c:364
-msgid "_Add Group"
-msgstr "Cuir GrÃpa _Leis"
-
-#: ../libempathy-gtk/empathy-groups-widget.c:399
-msgctxt "verb in a column header displaying group names"
-msgid "Select"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
-msgid "Group"
-msgstr "GrÃpa"
-
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
-msgid "The following identity will be blocked:"
-msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
-msgid "The following identity can not be blocked:"
-msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-#, fuzzy
-msgid "Linked Contacts"
-msgstr "_TeagmhÃlacha As LÃne"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-#, fuzzy
-msgid "Select contacts to link"
-msgstr "Roghnaigh teagmhÃil..."
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-#, fuzzy
-msgid "New contact preview"
-msgstr "TeagmhÃil Nua"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-
-#. 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:145
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:309
-msgid "Select account to use to place the call"
-msgstr ""
-
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "Glaoch"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:378
-msgid "Mobile"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-individual-menu.c:380
-msgid "Work"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-individual-menu.c:382
-msgid "HOME"
-msgstr ""
-
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
-msgid "_SMS"
-msgstr "_SMS"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
-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:1168
-#, fuzzy
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contactsâ"
-msgstr "_TeagmhÃlacha As LÃne"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2341
-msgid "Delete and _Block"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-individual-view.c:2510
-#, 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 ""
-
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2252,23 +2231,23 @@ msgstr[4] ""
 msgid "<b>Location</b> at (date)"
 msgstr "<b>SuÃomh</b>, "
 
-#: ../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 ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "LÃonra Nua"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr ""
@@ -2277,95 +2256,70 @@ msgstr ""
 msgid "new server"
 msgstr "freastalaà nua"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
 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
-#, fuzzy
-msgid "Link Contacts"
-msgstr "_TeagmhÃlacha As LÃne"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlinkâ"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
 msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-
-#. 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"
+"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 ""
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+msgid "People nearby"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
 msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 #, fuzzy
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr ""
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2375,7 +2329,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2385,196 +2339,242 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1720
 #, fuzzy
 msgid "Yesterday"
 msgstr "Iartharach"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1735
 #, fuzzy
 msgid "%e %B %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 #, fuzzy
 msgid "Calls"
 msgstr "Glaoch"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3759
 #, fuzzy
 msgid "Clear All"
 msgstr "G_lan"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgid "_File"
+msgstr "_Comhad"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "ComhrÃ"
+#: ../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 "_Eagar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+msgid "Chat"
+msgstr "ComhrÃ"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:24
 #, fuzzy
 msgid "Video"
 msgstr "Glaoch FÃ_se"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Eagar"
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Comhad"
+msgid "page 2"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "page 2"
+msgid "<span size=\"x-large\">Loading...</span>"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "CA TeagmhÃla:"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr ""
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_omhrÃ"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+#, fuzzy
+msgid "Adding new account"
+msgstr "Cuntas nua"
 
-#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
-msgid "New Conversation"
-msgstr "Comhrà Nua"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr ""
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 #, fuzzy
-msgid "Send _Video"
-msgstr "Seol comhad"
+msgid "_Video Call"
+msgstr "Glaoch FÃ_se"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Glaoch"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#, fuzzy
+msgid "_Audio Call"
+msgstr "Glaoch _Fuaime"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
 msgid "New Call"
 msgstr "Glaoch Nua"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#, fuzzy
+msgid "The contact is offline"
+msgstr "Roghnaigh teagmhÃil..."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+msgid "The specified contact is either invalid or unknown"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+msgid "The contact does not support this kind of conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+msgid "You are banned from this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+msgid "This channel is full"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+msgid "You must be invited to join this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+msgid "Can't proceed while disconnected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+msgid "Permission denied"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+msgid "There was an error starting the conversation"
 msgstr ""
 
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+msgid "New Conversation"
+msgstr "Comhrà Nua"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:164
+#: ../libempathy-gtk/empathy-presence-chooser.c:200
 msgid "Custom Messageâ"
 msgstr "Teachtaireacht Saincheapthaâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:217
+#: ../libempathy-gtk/empathy-presence-chooser.c:219
 msgid "Edit Custom Messagesâ"
 msgstr "Cuir Teachtaireachtaà Saincheaptha in Eagarâ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
-msgid "Set status"
+#. 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 ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
+msgid "Set status"
 msgstr ""
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 #, fuzzy
 msgid "Custom messagesâ"
 msgstr "Teachtaireachtaà saincheaptha..."
@@ -2583,29 +2583,33 @@ msgstr "Teachtaireachtaà saincheaptha..."
 #. 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 "Cuntas %s nua"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
+msgid "_Previous"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
+msgid "_Next"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "_Next"
+msgid "Mat_ch case"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
+msgid "Phrase not found"
 msgstr ""
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
@@ -2652,34 +2656,38 @@ msgstr ""
 msgid "Edit Custom Messages"
 msgstr "Cuir Teachtaireachtaà Saincheaptha in Eagar"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1104
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#, fuzzy
+msgid "_Accept"
+msgstr "_Cuntais"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1125
 #, fuzzy, c-format
 msgid "Message edited at %s"
 msgstr ""
 "\n"
 "Teachtaireacht: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1841
 #, fuzzy
 msgid "Normal"
 msgstr "_GnÃthmhÃid"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "Clasaiceach"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "SimplÃ"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "Glan"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "Gorm"
-
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
@@ -2737,45 +2745,68 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
 #, fuzzy
-msgid "Continue"
+msgid "C_ontinue"
 msgstr "ComhthÃacs"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../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 ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr ""
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+#, fuzzy
+msgid "<b>Personal Details</b>"
+msgstr "Eolas Pearsanta"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "CÃipeÃil _Seoladh an Naisc"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "_Oscail Nasc"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "LogchaighdeÃn Reatha"
@@ -2943,47 +2974,23 @@ msgstr "Iartharach"
 msgid "Vietnamese"
 msgstr "VÃtneamach"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr ""
+#: ../libempathy-gtk/empathy-roster-model.h:29
+#, fuzzy
+msgid "Top Contacts"
+msgstr "TeagmhÃil"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr ""
+#: ../libempathy-gtk/empathy-roster-model.h:31
+msgid "Ungrouped"
+msgstr "Gan GrÃpa"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr ""
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr ""
 
-#: ../src/empathy.c:431
-msgid "Don't connect on startup"
-msgstr ""
-
-#: ../src/empathy.c:435
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-
-#: ../src/empathy.c:450
-msgid "- Empathy IM Client"
-msgstr "- Cliant IM Empathy"
-
-#: ../src/empathy.c:637
-msgid "Error contacting the Account Manager"
-msgstr ""
-
-#: ../src/empathy.c:639
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3016,439 +3023,338 @@ msgstr ""
 "Empathy; mura bhfuair tà Ã, scrÃobh chuig an Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Cliant Cur Teachtaireachtaà Meandaracha do GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr "SeÃn de BÃrca <leftmostcat gmail com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-accounts.c:186
 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 ""
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-accounts.c:192
 #, fuzzy
-msgid "No, I want a new account"
-msgstr "Cr_uthaigh cuntas nua"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "TÃ"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
+msgid "<account-id>"
+msgstr "Cuntas"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-accounts.c:197
 #, fuzzy
-msgid "Edit->Accounts"
-msgstr "Cuntais"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:1143
-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 ""
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr ""
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr ""
+msgid "- Empathy Accounts"
+msgstr "IompÃrtÃil Cuntais"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-accounts.c:240
 #, fuzzy
-msgid "Import your existing accounts"
-msgstr "_AthÃsÃid cuntas atà ann"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr ""
+msgid "Empathy Accounts"
+msgstr "IompÃrtÃil Cuntais"
 
 #. 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 ""
 
 #. 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 ""
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
 msgid "Connectingâ"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:445
 #, fuzzy, c-format
 msgid "Offline â %s"
 msgstr "As LÃne"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:457
 #, c-format
 msgid "Disconnected â %s"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline â No Network Connection"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:475
 #, fuzzy
 msgid "Unknown Status"
 msgstr "CÃis anaithnid"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../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 ""
+
+#: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"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 ""
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:733
+msgid "_Edit Connection Parameters..."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1266
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1270
 msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1475
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1666
 #, fuzzy
-msgid "_Enable"
+msgid "_Enabled"
 msgstr "Cumasaithe"
 
-#: ../src/empathy-accounts-dialog.c:1644
-msgid "_Disable"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1689
+#, fuzzy
+msgid "Rename"
+msgstr "FÃorainm:"
+
+#: ../src/empathy-accounts-dialog.c:2105
+msgid "_Skip"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2109
+#, fuzzy
+msgid "_Connect"
+msgstr "_Inneachar"
+
+#: ../src/empathy-accounts-dialog.c:2288
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Addâ"
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2431
+msgid "Messaging and VoIP Accounts"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-#, fuzzy
-msgid "Loading account information"
-msgstr "Cuir Eolas TeagmhÃla in Eagar"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr ""
+#, fuzzy
+msgid "_Importâ"
+msgstr "IompÃrtÃil"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 #, fuzzy
-msgid "Protocol:"
-msgstr "PrÃtacal"
+msgid "Loading account information"
+msgstr "Cuir Eolas TeagmhÃla in Eagar"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-#, fuzzy
-msgid "_Importâ"
-msgstr "IompÃrtÃil"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr ""
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:296
 #, fuzzy
 msgid " - Empathy authentication client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:312
 #, fuzzy
 msgid "Empathy authentication client"
 msgstr "Cliant IM Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr ""
+
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr ""
+
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr "- Cliant IM Empathy"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr ""
+
+#: ../src/empathy.c:625
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
 msgstr ""
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-call.c:193
 #, fuzzy
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-call.c:217
 #, fuzzy
 msgid "Empathy Audio/Video Client"
 msgstr "Cliant IM Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
-msgid "Contrast"
-msgstr "Codarsnacht"
-
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Brightness"
-msgstr "Gile"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Gamma"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:542
-msgid "Volume"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+msgid "i"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1110
-msgid "_Sidebar"
+#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1130
-msgid "Audio input"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1134
-msgid "Video input"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Dialpad"
+#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1151
-msgid "Details"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
 msgstr ""
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-call-window.c:1861
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-call-window.c:2113
 msgid "The IP address as seen by the machine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-call-window.c:2115
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-call-window.c:2117
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-call-window.c:2119
 msgid "The IP address of a relay server"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-call-window.c:2121
 msgid "The IP address of the multicast group"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1843
-#, fuzzy
-msgctxt "encoding video codec"
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.c:2527 ../src/empathy-call-window.c:2528
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../src/empathy-streamed-media-window.c:1846
-#, fuzzy
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Anaithnid"
+#: ../src/empathy-call-window.c:2877
+msgid "On hold"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1849
-#, fuzzy
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Anaithnid"
+#: ../src/empathy-call-window.c:2881
+msgid "Mute"
+msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1852
+#: ../src/empathy-call-window.c:2883
 #, fuzzy
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "Anaithnid"
+msgid "Duration"
+msgstr "SuÃomh"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2886
 #, c-format
-msgid "Connected â %d:%02dm"
+msgid "%s â %d:%02dm"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-call-window.c:2982
 msgid "Technical Details"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-call-window.c:3021
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-call-window.c:3032
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-call-window.c:3038
 msgid "There was a failure on the network"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-call-window.c:3042
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-call-window.c:3045
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-call-window.c:3057
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3456,67 +3362,70 @@ msgid ""
 "the Help menu."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:3066
 msgid "There was a failure in the call engine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:3069
 msgid "The end of the stream was reached"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish audio stream"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-call-window.c:3119
 msgid "Can't establish video stream"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-#, fuzzy
-msgid "Audio"
-msgstr "Glaoch _Fuaime"
+#: ../src/empathy-call-window.c:3156
+#, c-format
+msgid "Your current balance is %s."
+msgstr ""
 
-#: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
+#: ../src/empathy-call-window.c:3160
+msgid "Sorry, you donât have enough credit for that call."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3162
+msgid "Top Up"
 msgstr ""
 
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "_Glaoch"
+
+#: ../src/empathy-call-window.ui.h:3
+#, fuzzy
+msgid "_Microphone"
+msgstr "MeigeafÃn"
+
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
+msgid "_Camera"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "_Socruithe"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr ""
+msgid "_View"
+msgstr "_Amharc"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr ""
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+msgid "_Help"
+msgstr "Cab_hair"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr ""
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+msgid "_Contents"
+msgstr "_Inneachar"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr ""
+msgid "_Debug"
+msgstr "_DÃfhabhtaigh"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
+msgid "Swap camera"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:11
@@ -3524,97 +3433,137 @@ msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
+msgid "Maximise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
+msgid "Disable camera"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-msgid "Send Video"
-msgstr "Seol comhad"
+msgid "Hang up"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
+msgid "Hang up current call"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:16
+#, fuzzy
+msgid "Video call"
+msgstr "Glaoch FÃ_se"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Toggle video transmission"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Anaithnid"
-
 #: ../src/empathy-call-window.ui.h:23
-#, fuzzy
-msgid "Video call"
-msgstr "Glaoch FÃ_se"
-
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Glaoch"
+msgid "Toggle audio transmission"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
+msgid "Encoding Codec:"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Inneachar"
-
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_DÃfhabhtaigh"
+msgid "Decoding Codec:"
+msgstr ""
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Cab_hair"
+#: ../src/empathy-call-window.ui.h:28
+msgid "Remote Candidate:"
+msgstr ""
 
-#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:29
+msgid "Local Candidate:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 #, fuzzy
-msgid "_Microphone"
-msgstr "MeigeafÃn"
+msgid "Audio"
+msgstr "Glaoch _Fuaime"
 
-#: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Socruithe"
+#: ../src/empathy-chat.c:102
+#, fuzzy
+msgid "- Empathy Chat Client"
+msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Amharc"
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Ainm"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Seomra"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr ""
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:288
+msgid "Close this window?"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:307
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+
+#: ../src/empathy-chat-window.c:318
+#, c-format
+msgid "Leave %s?"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:320
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:339
+msgid "Close window"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:339
+msgid "Leave room"
+msgstr ""
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3624,7 +3573,7 @@ msgstr[2] "%s (%d gan lÃamh)"
 msgstr[3] "%s (%d gan lÃamh)"
 msgstr[4] "%s (%d gan lÃamh)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:693
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3634,7 +3583,7 @@ msgstr[2] "%s (agus %u dhuine eile)"
 msgstr[3] "%s (agus %u duine eile)"
 msgstr[4] "%s (agus %u duine eile)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3644,7 +3593,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:718
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3654,11 +3603,11 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:955
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:963
 #, fuzzy, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3668,178 +3617,226 @@ msgstr[2] "Seol agus faigh teachtaireachtaÃ"
 msgstr[3] "Seol agus faigh teachtaireachtaÃ"
 msgstr[4] "Seol agus faigh teachtaireachtaÃ"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:983
 msgid "Typing a message."
 msgstr "Teachtaireacht à scrÃobh."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "G_lan"
+msgid "_Conversation"
+msgstr "_ComhrÃ"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_TeagmhÃil"
+msgid "C_lear"
+msgstr "G_lan"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "IonsÃigh _Straiseog"
 
+#: ../src/empathy-chat-window.ui.h:4
+#, fuzzy
+msgid "_Favorite Chat Room"
+msgstr "Seomra ComhrÃ"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "Tabhair Cuireadh do _RannphÃirtÃâ"
+msgid "Notify for All Messages"
+msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Bog CluaisÃn ar _ChlÃ"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_TaispeÃin Liosta TeagmhÃlacha"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Bog CluaisÃn ar _Dheis"
+msgid "Invite _Participantâ"
+msgstr "Tabhair Cuireadh do _RannphÃirtÃâ"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr ""
+msgid "C_ontact"
+msgstr "_TeagmhÃil"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_ComhrÃ"
+msgid "_Tabs"
+msgstr "C_luaisÃnÃ"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "DÃchean_gail CluaisÃn"
+msgid "_Previous Tab"
+msgstr "An CluaisÃn _Roimhe Seo"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "An ChÃad ChluaisÃn _Eile"
 
 #: ../src/empathy-chat-window.ui.h:13
-#, fuzzy
-msgid "_Favorite Chat Room"
-msgstr "Seomra ComhrÃ"
+msgid "_Undo Close Tab"
+msgstr "Cea_laigh DÃnadh CluaisÃn"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Bog CluaisÃn ar _ChlÃ"
 
 #: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "An ChÃad ChluaisÃn _Eile"
+msgid "Move Tab _Right"
+msgstr "Bog CluaisÃn ar _Dheis"
 
 #: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "An CluaisÃn _Roimhe Seo"
+msgid "_Detach Tab"
+msgstr "DÃchean_gail CluaisÃn"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_TaispeÃin Liosta TeagmhÃlacha"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "C_luaisÃnÃ"
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr ""
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Cea_laigh DÃnadh CluaisÃn"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr ""
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "Ainm"
+#: ../src/empathy-debug-window.c:1599
+msgid "Save"
+msgstr "SÃbhÃil"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "Seomra"
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr ""
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
 msgstr ""
 
-#: ../src/empathy-chatrooms-window.ui.h:2
-msgid "Manage Favorite Rooms"
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 
-#: ../src/empathy-event-manager.c:521
-msgid "Incoming video call"
+#: ../src/empathy-debug-window.c:1856
+msgid "Debug Window"
+msgstr "Fuinneog DÃfhabhtaithe"
+
+#: ../src/empathy-debug-window.c:1916
+msgid "Send to pastebin"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
-msgid "Incoming call"
+#: ../src/empathy-debug-window.c:1960
+msgid "Pause"
+msgstr "Sos"
+
+#: ../src/empathy-debug-window.c:1972
+msgid "Level "
+msgstr "LeibhÃal"
+
+#: ../src/empathy-debug-window.c:1991
+msgid "Debug"
+msgstr "DÃfhabhtÃ"
+
+#: ../src/empathy-debug-window.c:1996
+msgid "Info"
+msgstr "Eolas"
+
+#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+msgid "Message"
+msgstr "Teachtaireacht"
+
+#: ../src/empathy-debug-window.c:2006
+msgid "Warning"
+msgstr "Rabhadh"
+
+#: ../src/empathy-debug-window.c:2011
+msgid "Critical"
+msgstr "CriticiÃil"
+
+#: ../src/empathy-debug-window.c:2016
+msgid "Error"
+msgstr "EarrÃid"
+
+#: ../src/empathy-debug-window.c:2035
+msgid "Time"
+msgstr "Am"
+
+#: ../src/empathy-debug-window.c:2038
+msgid "Domain"
+msgstr "Fearann"
+
+#: ../src/empathy-debug-window.c:2041
+msgid "Category"
+msgstr "CatagÃir"
+
+#: ../src/empathy-debug-window.c:2044
+msgid "Level"
+msgstr "LeibhÃal"
+
+#: ../src/empathy-debug-window.c:2073
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 msgstr ""
 
-#: ../src/empathy-event-manager.c:525
-#, c-format
-msgid "%s is video calling you. Do you want to answer?"
+#: ../src/empathy-event-manager.c:508
+msgid "Incoming video call"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:512
 #, c-format
-msgid "%s is calling you. Do you want to answer?"
+msgid "%s is video calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:513
 #, c-format
-msgid "Incoming call from %s"
+msgid "%s is calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:557
 msgid "_Answer with video"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
-#, c-format
-msgid "Incoming video call from %s"
-msgstr ""
-
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:853
-msgid "_Decline"
-msgstr ""
-
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "C_eangail"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
 #, fuzzy
 msgid "Password required"
 msgstr "Focal faire:"
 
-#: ../src/empathy-event-manager.c:1190
-#, c-format
-msgid "%s would like permission to see when you are online"
-msgstr ""
-
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3849,105 +3846,105 @@ msgstr ""
 "Teachtaireacht: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Comhad"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "FÃgtha"
 
@@ -3959,179 +3956,60 @@ msgstr "Aistrithe Comhad"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#, fuzzy
+msgid "_Import"
+msgstr "IompÃrtÃil"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "IompÃrtÃil Cuntais"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:302
 msgid "Import"
 msgstr "IompÃrtÃil"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:311
 msgid "Protocol"
 msgstr "PrÃtacal"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:335
 msgid "Source"
 msgstr "Foinse"
 
-#: ../src/empathy-main-window.c:392
-#, fuzzy
-msgid "Provide Password"
-msgstr "Focal faire:"
-
-#: ../src/empathy-main-window.c:398
-msgid "Disconnect"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
 msgstr ""
 
-#: ../src/empathy-main-window.c:622
-msgid "No match found"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
 msgstr ""
 
-#: ../src/empathy-main-window.c:777
-msgid "Reconnect"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
 msgstr ""
 
-#: ../src/empathy-main-window.c:783
-#, fuzzy
-msgid "Edit Account"
-msgstr "Cuir Cuntas Leis"
+#: ../src/empathy-new-chatroom-dialog.c:194
+msgid "Chat Room"
+msgstr "Seomra ComhrÃ"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr ""
-
-#. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr ""
-
-#: ../src/empathy-main-window.c:975
-msgid "Top up account credit"
-msgstr ""
-
-#. top up button
-#: ../src/empathy-main-window.c:1046
-msgid "Top Up..."
-msgstr ""
-
-#: ../src/empathy-main-window.c:1789
-msgid "Contact"
-msgstr "TeagmhÃil"
-
-#: ../src/empathy-main-window.c:2121
-msgid "Contact List"
-msgstr "Liosta TeagmhÃlacha"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr ""
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr ""
-
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Aimsigh sa _Liosta TeagmhÃlacha"
-
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Ceangail le C_eanÃin"
-
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Bainistigh CeanÃin"
-
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_GnÃthmhÃid"
-
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "_Glaoch Nuaâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "GnÃthmhÃid le hA_bhatÃir"
-
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Sainroghanna"
-
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "TaispeÃin _PrÃtacail"
-
-#: ../src/empathy-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "SÃrtÃil de RÃir _Ainm"
-
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "SÃrtÃil de RÃir _StÃdas"
-
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Cuntais"
-
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "TeagmhÃlacha _Bactha"
-
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_DlÃthmhÃid"
-
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Aistrithe _Comhad"
-
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Joinâ"
-msgstr "_Ceangailâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_Comhrà Nuaâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_TeagmhÃlacha as LÃne"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Eolas _Pearsanta"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Seomra"
-
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contactsâ"
-msgstr "Cuar_daigh ar TheagmhÃlachaâ"
-
-#: ../src/empathy-new-chatroom-dialog.c:337
-msgid "Chat Room"
-msgstr "Seomra ComhrÃ"
-
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:209
 msgid "Members"
 msgstr "Baill"
 
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:410
+msgid "Failed to list rooms"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4140,26 +4018,33 @@ msgid ""
 "Members: %s"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
+msgid "Yes"
+msgstr "TÃ"
+
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "NÃl"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
-msgid "Could not start room listing"
-msgstr ""
+#: ../src/empathy-new-chatroom-dialog.c:784
+msgid "Join Room"
+msgstr "Ceangail le Seomra"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
-msgid "Could not stop room listing"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr ""
+msgid "_Room:"
+msgstr "_Seomra:"
 
 #: ../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."
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
 msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
@@ -4169,499 +4054,455 @@ msgid ""
 msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Ceangail le Seomra"
+msgid "_Server:"
+msgstr "Frea_stalaÃ:"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Couldn't load room list"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "Liosta SeomraÃ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Seomra:"
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr ""
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+msgid "Accept"
+msgstr ""
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:240
+msgid "Provide"
+msgstr ""
+
+#: ../src/empathy-preferences.c:143
 msgid "Message received"
 msgstr ""
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:144
 msgid "Message sent"
 msgstr ""
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:145
 msgid "New conversation"
-msgstr ""
+msgstr "Comhrà nua"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr ""
+#: ../src/empathy-preferences.c:146
+#, fuzzy
+msgid "Contact comes online"
+msgstr "Roghnaigh teagmhÃil..."
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:147
 msgid "Contact goes offline"
 msgstr ""
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:148
 msgid "Account connected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:149
 msgid "Account disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:386
 msgid "Language"
 msgstr ""
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr ""
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:650
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:654
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:657
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:660
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:663
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:666
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1032
 msgid "Preferences"
 msgstr "Sainroghanna"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "Cuma"
+#: ../src/empathy-preferences.ui.h:2
+#, fuzzy
+msgid "Show groups"
+msgstr "TaispeÃin liosta teagmhÃlacha i seomraÃ"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "OibriÃ"
+#, fuzzy
+msgid "Show account balances"
+msgstr "DlÃthliosta teagmhÃlacha"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+msgid "Contact List"
+msgstr "Liosta TeagmhÃlacha"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
+msgid "Start chats in:"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
+msgid "new ta_bs"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
+msgid "new _windows"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Display incoming events in the notification area"
-msgstr ""
+msgid "Show _smileys as images"
+msgstr "TaispeÃin _straoiseoga mar ÃomhÃnna"
 
 #: ../src/empathy-preferences.ui.h:9
-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 ""
+msgid "Show contact _list in rooms"
+msgstr "TaispeÃin _liosta teagmhÃlacha i seomraÃ"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr ""
+#, fuzzy
+msgid "Log conversations"
+msgstr "ComhrÃite"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
+msgid "Display incoming events in the notification area"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Cumasaigh litrià do theangacha:"
+#, fuzzy
+msgid "_Automatically connect on startup"
+msgstr "_Nasc go huathoibrÃoch ag am tosaithe "
 
 #: ../src/empathy-preferences.ui.h:14
+msgid "Behavior"
+msgstr "OibriÃ"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "GinearÃlta"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
+#: ../src/empathy-preferences.ui.h:16
+msgid "_Enable bubble notifications"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
+#: ../src/empathy-preferences.ui.h:17
+msgid "Disable notifications when _away or busy"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:18
-#, fuzzy
-msgid "Location sources:"
-msgstr "SuÃomh"
+msgid "Enable notifications when the _chat is not focused"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:19
-#, fuzzy
-msgid "Log conversations"
-msgstr "ComhrÃite"
+msgid "Enable notifications when a contact comes online"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "FÃgairtÃ"
+msgid "Enable notifications when a contact goes offline"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Play sound for events"
-msgstr "Seinn fuaim do theagmhais"
+msgid "Notifications"
+msgstr "FÃgairtÃ"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "PrÃobhÃideachas"
+msgid "_Enable sound notifications"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:23
-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."
+msgid "Disable sounds when _away or busy"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "TaispeÃin _straoiseoga mar ÃomhÃnna"
+msgid "Play sound for events"
+msgstr "Seinn fuaim do theagmhais"
 
 #: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "TaispeÃin _liosta teagmhÃlacha i seomraÃ"
-
-#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "Fuaimeanna"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "LitriÃ"
+#: ../src/empathy-preferences.ui.h:26
+msgid "Use _echo cancellation to improve call quality"
+msgstr ""
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "TÃamaÃ"
-
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
+msgid "_Publish location to my contacts"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:31
-#, fuzzy
-msgid "_Automatically connect on startup"
-msgstr "_Nasc go huathoibrÃoch ag am tosaithe "
-
-#: ../src/empathy-preferences.ui.h:32
-#, fuzzy
-msgid "_Cellphone"
-msgstr "MeigeafÃn"
+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 ""
 
+#. 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 "_Enable bubble notifications"
+msgid "_Reduce location accuracy"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr ""
+msgid "Privacy"
+msgstr "PrÃobhÃideachas"
 
 #: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr ""
+#, fuzzy
+msgid "_Cellphone"
+msgstr "MeigeafÃn"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Oscail comhrÃite nua i bhfuinneoga faoi leith"
+msgid "_Network (IP, Wi-Fi)"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr ""
+#, fuzzy
+msgid "Location sources:"
+msgstr "SuÃomh"
 
-#. 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:40
-msgid "_Reduce location accuracy"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "Status"
-msgstr "StÃdas"
-
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Quit"
-msgstr "_Scoir"
+#: ../src/empathy-preferences.ui.h:41
+msgid "Enable spell checking for languages:"
+msgstr "Cumasaigh litrià do theangacha:"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-#, fuzzy
-msgid "Call the contact again"
-msgstr "DlÃthliosta teagmhÃlacha"
+#: ../src/empathy-preferences.ui.h:42
+msgid "Spell Checking"
+msgstr "LitriÃ"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
+#: ../src/empathy-preferences.ui.h:43
+msgid "Chat Th_eme:"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
+#: ../src/empathy-preferences.ui.h:44
+msgid "Variant:"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr ""
+#: ../src/empathy-preferences.ui.h:45
+msgid "Themes"
+msgstr "TÃamaÃ"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr ""
+#: ../src/empathy-roster-window.c:242
+#, fuzzy
+msgid "Provide Password"
+msgstr "Focal faire:"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
+#: ../src/empathy-roster-window.c:248
+msgid "Disconnect"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
+#: ../src/empathy-roster-window.c:441
+msgid "You need to setup an account to see contacts here."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
+#: ../src/empathy-roster-window.c:517
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
+#: ../src/empathy-roster-window.c:635
+msgid "Update software..."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
+#: ../src/empathy-roster-window.c:641
+msgid "Reconnect"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-roster-window.c:645
 #, fuzzy
-msgid "Video On"
-msgstr "Glaoch FÃ_se"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr ""
+msgid "Edit Account"
+msgstr "Cuir Cuntas Leis"
 
-#: ../src/empathy-map-view.c:448
-msgid "Contact Map View"
+#: ../src/empathy-roster-window.c:650
+msgid "Close"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1228
-msgid "Save"
-msgstr "SÃbhÃil"
-
-#: ../src/empathy-debug-window.c:1435
-msgid "Debug Window"
-msgstr "Fuinneog DÃfhabhtaithe"
-
-#: ../src/empathy-debug-window.c:1517
-msgid "Pause"
-msgstr "Sos"
-
-#: ../src/empathy-debug-window.c:1529
-msgid "Level "
-msgstr "LeibhÃal"
-
-#: ../src/empathy-debug-window.c:1549
-msgid "Debug"
-msgstr "DÃfhabhtÃ"
-
-#: ../src/empathy-debug-window.c:1555
-msgid "Info"
-msgstr "Eolas"
-
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
-msgid "Message"
-msgstr "Teachtaireacht"
-
-#: ../src/empathy-debug-window.c:1567
-msgid "Warning"
-msgstr "Rabhadh"
-
-#: ../src/empathy-debug-window.c:1573
-msgid "Critical"
-msgstr "CriticiÃil"
-
-#: ../src/empathy-debug-window.c:1579
-msgid "Error"
-msgstr "EarrÃid"
-
-#: ../src/empathy-debug-window.c:1598
-msgid "Time"
-msgstr "Am"
-
-#: ../src/empathy-debug-window.c:1601
-msgid "Domain"
-msgstr "Fearann"
-
-#: ../src/empathy-debug-window.c:1603
-msgid "Category"
-msgstr "CatagÃir"
-
-#: ../src/empathy-debug-window.c:1605
-msgid "Level"
-msgstr "LeibhÃal"
+#: ../src/empathy-roster-window.c:787
+#, fuzzy
+msgid "Top up account"
+msgstr "Cuntas %s nua"
 
-#: ../src/empathy-debug-window.c:1642
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../src/empathy-roster-window.c:1469
+msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
-msgid "Invite Participant"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1477
+#, c-format
+msgid "You need to enable %s to see contacts here."
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:180
-msgid "Choose a contact to invite into the conversation:"
+#: ../src/empathy-roster-window.c:1555
+msgid "Change your presence to see contacts here"
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:201
-msgid "Invite"
+#: ../src/empathy-roster-window.c:1564
+msgid "No match found"
 msgstr ""
 
-#: ../src/empathy-accounts.c:183
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
+#: ../src/empathy-roster-window.c:1569
+#, fuzzy
+msgid "No online contacts"
+msgstr "_TeagmhÃlacha as LÃne"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "_Comhrà Nua..."
 
-#: ../src/empathy-accounts.c:191
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
+msgstr "_Glaoch Nua..."
 
-#: ../src/empathy-accounts.c:193
-#, fuzzy
-msgid "<account-id>"
-msgstr "Cuntas"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "TeagmhÃlacha"
 
-#: ../src/empathy-accounts.c:198
-#, fuzzy
-msgid "- Empathy Accounts"
-msgstr "IompÃrtÃil Cuntais"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "Cuir TeagmhÃlacha _Leis..."
 
-#: ../src/empathy-accounts.c:237
-#, fuzzy
-msgid "Empathy Accounts"
-msgstr "IompÃrtÃil Cuntais"
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
+msgstr "Cuar_daigh ar TheagmhÃlacha..."
 
-#: ../src/empathy-debugger.c:70
-msgid "Show a particular service"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "TeagmhÃlacha _Bactha"
 
-#: ../src/empathy-debugger.c:75
-msgid "- Empathy Debugger"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "_SeomraÃ"
 
-#: ../src/empathy-debugger.c:114
-msgid "Empathy Debugger"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "C_eangail..."
 
-#: ../src/empathy-chat.c:107
-#, fuzzy
-msgid "- Empathy Chat Client"
-msgstr "- Cliant IM Empathy"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "Ceangail le Cea_nÃin"
 
-#: ../src/empathy-notifications-approver.c:203
-msgid "Respond"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "_Bainistigh CeanÃin"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
-msgid "Reject"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "_Aistrithe Comhad"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
-msgid "Answer"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "C_untais"
 
-#: ../src/empathy-notifications-approver.c:227
-msgid "Answer with video"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "_Sainroghanna"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
-msgid "Decline"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "Cabhair"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
-msgid "Accept"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "Maidir le Empathy"
 
-#. 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:260
-msgid "Provide"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Scoir"
 
-#: ../src/empathy-call-observer.c:134
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+#: ../src/empathy-roster-window.ui.h:1
+#, fuzzy
+msgid "Account settings"
+msgstr "_Cuntais"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
-msgid "i"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2775
-msgid "On hold"
-msgstr ""
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Comhrà Nuaâ"
 
-#: ../src/empathy-call-window.c:2778
-msgid "Mute"
-msgstr ""
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "_Glaoch Nuaâ"
 
-#: ../src/empathy-call-window.c:2780
-#, fuzzy
-msgid "Duration"
-msgstr "SuÃomh"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "StÃdas"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
-#, c-format
-msgid "%s â %d:%02dm"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+msgid "Please enter your account details"
 msgstr ""
+
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, fuzzy, c-format
+msgid "Edit %s account options"
+msgstr "Cuir Eolas TeagmhÃla in Eagar"
+
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+#, fuzzy
+msgid "Integrate your IM accounts"
+msgstr "_AthÃsÃid cuntas atà ann"



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