Updated en_GB translation (Philip Withnall).

svn path=/trunk/; revision=1029

1 files changed, 911 insertions, 753 deletions

diff --git a/po/en_GB.po b/po/en_GB.po
index 8bafc2afc..a839125eb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-08 10:19+0000\n"
+"POT-Creation-Date: 2008-04-22 07:21+0100\n"
 "PO-Revision-Date: 2008-03-08 10:18+0000\n"
 "Last-Translator: David Lodge <dave@cirt.net>\n"
 "Language-Team: en_GB <en@li.org>\n"
@@ -227,132 +227,111 @@ msgstr ""
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 
-#: ../libempathy/empathy-tp-contact-list.c:724 ../src/empathy.c:149
+#: ../libempathy/empathy-tp-contact-list.c:676 ../src/empathy.c:189
 msgid "People nearby"
 msgstr "People nearby"
 
-#: ../libempathy/empathy-utils.c:541
+#: ../libempathy/empathy-utils.c:475
 msgid "Available"
 msgstr "Available"
 
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:477
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libempathy/empathy-utils.c:546
+#: ../libempathy/empathy-utils.c:480
 msgid "Away"
 msgstr "Away"
 
-#: ../libempathy/empathy-utils.c:548
+#: ../libempathy/empathy-utils.c:482
 msgid "Hidden"
 msgstr "Hidden"
 
-#: ../libempathy/empathy-utils.c:551
+#: ../libempathy/empathy-utils.c:485
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libempathy-gtk/empathy-about-dialog.c:63
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public Licence as published by the Free Software "
-"Foundation; either version 2 of the Licence, or (at your option) any later "
-"version."
-
-#: ../libempathy-gtk/empathy-about-dialog.c:67
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
-"details."
-
-#: ../libempathy-gtk/empathy-about-dialog.c:71
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"You should have received a copy of the GNU General Public Licence along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-
-#: ../libempathy-gtk/empathy-about-dialog.c:99
-msgid "An Instant Messaging client for GNOME"
-msgstr "An Instant Messaging client for GNOME"
-
-#: ../libempathy-gtk/empathy-about-dialog.c:105
-msgid "translator-credits"
-msgstr "David Lodge <dave@cirt.net>"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:337
+#: ../libempathy-gtk/empathy-account-chooser.c:334
 msgid "All"
 msgstr "All"
 
-#: ../libempathy-gtk/empathy-account-widget.c:276
-#: ../libempathy-gtk/empathy-account-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:286
+#: ../libempathy-gtk/empathy-account-widget.c:331
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
 #: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
 #: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
 msgid "<b>Advanced</b>"
 msgstr "<b>Advanced</b>"
 
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
 #: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
 msgid "Forget password and clear the entry."
 msgstr "Forget password and clear the entry."
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
-msgid "ICQ account settings"
-msgstr "ICQ account settings"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
 #: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
-msgid "_Charset:"
-msgstr "_Charset:"
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
 #: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:12
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:11
+#: ../src/empathy-new-chatroom-dialog.glade.h:10
 msgid "_Server:"
 msgstr "_Server:"
 
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+msgid "Login I_D:"
+msgstr "Login I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+msgid "_Charset:"
+msgstr "_Charset:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.c:246
 msgid "New Network"
 msgstr "New Network"
@@ -405,20 +384,10 @@ msgstr "Real name:"
 msgid "Remove the selected IRC network"
 msgstr "Remove the selected IRC network"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:13
-msgid "irc account settings"
-msgstr "irc account settings"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
 msgid "<b>Override  server settings</b>"
 msgstr "<b>Override server settings</b>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
-msgid "Login I_D:"
-msgstr "Login I_D:"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
 msgid "Pri_ority:"
 msgstr "Pri_ority:"
@@ -439,16 +408,8 @@ msgstr "_Encryption required (TLS/SSL)"
 msgid "_Ignore SSL certificate errors"
 msgstr "_Ignore SSL certificate errors"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:13
-msgid "jabber account settings"
-msgstr "jabber account settings"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:7
-msgid "msn account settings"
-msgstr "msn account settings"
-
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
-msgid "_E-mail:"
+msgid "_Email:"
 msgstr "_E-mail:"
 
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
@@ -464,7 +425,7 @@ msgid "_Last Name:"
 msgstr "_Last Name:"
 
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:8
+#: ../src/empathy-chatrooms-window.glade.h:8
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
@@ -472,9 +433,22 @@ msgstr "_Nickname:"
 msgid "_Published Name:"
 msgstr "_Published Name:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:8
-msgid "salut account settings"
-msgstr "Salut account settings"
+#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+msgid "Discover STUN"
+msgstr "Discover STUN"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+msgid "Stun Server:"
+msgstr "STUN Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+msgid "Stun port:"
+msgstr "STUN Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+msgid "_Username:"
+msgstr "_Username:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
 msgid "J_apan server:"
@@ -484,19 +458,15 @@ msgstr "J_apan server:"
 msgid "Use _Yahoo Japan"
 msgstr "Use _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
-msgid "Yahoo! account settings"
-msgstr "Yahoo! account settings"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
 msgid "_Ignore conference and chatroom invitations"
 msgstr "_Ignore conference and chat room invitations"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
 msgid "_Room List locale:"
 msgstr "_Room List locale:"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:225
+#: ../libempathy-gtk/empathy-accounts-dialog.c:226
 msgid ""
 "To add a new account, you can click on the 'Add' button and a new entry will "
 "be created for you to start configuring."
@@ -504,7 +474,7 @@ msgstr ""
 "To add a new account, you can click on the 'Add' button and a new entry will "
 "be created for you to start configuring."
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:229
+#: ../libempathy-gtk/empathy-accounts-dialog.c:230
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -512,12 +482,12 @@ msgstr ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:236
+#: ../libempathy-gtk/empathy-accounts-dialog.c:237
 #: ../libempathy-gtk/empathy-accounts-dialog.glade.h:2
 msgid "<b>No Account Selected</b>"
 msgstr "<b>No Account Selected</b>"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:237
+#: ../libempathy-gtk/empathy-accounts-dialog.c:238
 msgid ""
 "\n"
 "\n"
@@ -529,20 +499,20 @@ msgstr ""
 "If you do not want to add an account, simply click on the account you want "
 "to configure in the list on the left."
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:243
+#: ../libempathy-gtk/empathy-accounts-dialog.c:244
 msgid "<b>No Accounts Configured</b>"
 msgstr "<b>No Accounts Configured</b>"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:411
+#: ../libempathy-gtk/empathy-accounts-dialog.c:425
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:421
+#: ../libempathy-gtk/empathy-accounts-dialog.c:435
 #: ../libempathy-gtk/empathy-accounts-dialog.glade.h:4
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:904
+#: ../libempathy-gtk/empathy-accounts-dialog.c:918
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -551,7 +521,7 @@ msgstr ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:910
+#: ../libempathy-gtk/empathy-accounts-dialog.c:924
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -595,19 +565,19 @@ msgstr ""
 msgid "Type:"
 msgstr "Type:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:458
 msgid "Select Your Avatar Image"
 msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:452
+#: ../libempathy-gtk/empathy-avatar-chooser.c:461
 msgid "No Image"
 msgstr "No Image"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:512
+#: ../libempathy-gtk/empathy-avatar-chooser.c:521
 msgid "Images"
 msgstr "Images"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:516
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "All Files"
 msgstr "All Files"
 
@@ -615,295 +585,104 @@ msgstr "All Files"
 msgid "Click to enlarge"
 msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/empathy-call-window.glade.h:1
-msgid "End Call"
-msgstr "End Call"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:2
-msgid "Input"
-msgstr "Input"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:3
-msgid "Mute"
-msgstr "Mute"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:4
-msgid "Output"
-msgstr "Output"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:5
-msgid "Send Video"
-msgstr "Send Video"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:6
-msgid "Start Call"
-msgstr "Start Call"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:7
-msgid "Volume"
-msgstr "Volume"
-
-#: ../libempathy-gtk/empathy-chat.c:445
+#: ../libempathy-gtk/empathy-chat.c:282 ../src/empathy.c:70
+#: ../src/empathy-call-window.c:355
 msgid "Disconnected"
 msgstr "Disconnected"
 
-#: ../libempathy-gtk/empathy-chat.c:580
+#: ../libempathy-gtk/empathy-chat.c:558
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:583
+#: ../libempathy-gtk/empathy-chat.c:561
 msgid "invalid contact"
 msgstr "invalid contact"
 
-#: ../libempathy-gtk/empathy-chat.c:586
+#: ../libempathy-gtk/empathy-chat.c:564
 msgid "permission denied"
 msgstr "permission denied"
 
-#: ../libempathy-gtk/empathy-chat.c:589
+#: ../libempathy-gtk/empathy-chat.c:567
 msgid "too long message"
 msgstr "too long message"
 
-#: ../libempathy-gtk/empathy-chat.c:592
+#: ../libempathy-gtk/empathy-chat.c:570
 msgid "not implemented"
 msgstr "not implemented"
 
-#: ../libempathy-gtk/empathy-chat.c:595
+#: ../libempathy-gtk/empathy-chat.c:573
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libempathy-gtk/empathy-chat.c:599
+#: ../libempathy-gtk/empathy-chat.c:577
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:607
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Topic set to: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:609
+msgid "No topic defined"
+msgstr "No topic defined"
+
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "_Check Word Spelling..."
 msgstr "_Check Word Spelling..."
 
-#: ../libempathy-gtk/empathy-chat.c:1558
+#: ../libempathy-gtk/empathy-chat.c:1256
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s has joined the room"
+
+#: ../libempathy-gtk/empathy-chat.c:1259
+#, c-format
+msgid "%s has left the room"
+msgstr "%s has left the room"
+
+#: ../libempathy-gtk/empathy-chat.c:1714
 msgid "Connected"
 msgstr "Connected"
 
 #: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "C_lear"
-msgstr "C_lear"
+msgid "<b>Topic:</b>"
+msgstr "<b>Topic:</b>"
 
 #: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Ca_ll"
-msgstr "Ca_ll"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:3
-msgid "Change _Topic..."
-msgstr "Change _Topic..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:4
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
-msgid "Chat"
-msgstr "Chat"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:5
-msgid "Contact Infor_mation"
-msgstr "Contact Infor_mation"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:6
-msgid "Cu_t"
-msgstr "Cu_t"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:7
-msgid "In_vite..."
-msgstr "In_vite..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:8
-msgid "Insert _Smiley"
-msgstr "Insert _Smiley"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:9
-msgid "Invitation _message:"
-msgstr "Invitation _message:"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:10
-msgid "Invite"
-msgstr "Invite"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:11
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Join _New..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:12
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:13
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:14
-msgid "Select who would you like to invite:"
-msgstr "Select who would you like to invite:"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:15
-msgid "You have been invited to join a chat conference."
-msgstr "You have been invited to join a chat conference."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:16
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-msgid "_Add Contact..."
-msgstr "_Add Contact..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:17
-msgid "_Add To Favorites"
-msgstr "_Add To Favourites"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:18
-msgid "_Close"
-msgstr "_Close"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:19
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-msgid "_Contents"
-msgstr "_Contents"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:20
-msgid "_Conversation"
-msgstr "_Conversation"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:21
-msgid "_Copy"
-msgstr "_Copy"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:22
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:23
-#: ../libempathy-gtk/empathy-contact-list-view.c:217
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:24
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
-msgstr "_Help"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:25
-msgid "_Next Tab"
-msgstr "_Next Tab"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:26
-msgid "_Paste"
-msgstr "_Paste"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:27
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:28
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-msgid "_Room"
-msgstr "_Room"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:29
-msgid "_Show Contacts"
-msgstr "_Show Contacts"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:30
-msgid "_Tabs"
-msgstr "_Tabs"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:31
-#: ../libempathy-gtk/empathy-contact-list-view.c:233
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-msgid "_View Previous Conversations"
-msgstr "_View Previous Conversations"
+msgid "Group Chat"
+msgstr "Group Chat"
 
-#: ../libempathy-gtk/empathy-chat-view.c:441
+#: ../libempathy-gtk/empathy-chat-view.c:435
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
-#: ../libempathy-gtk/empathy-chat-view.c:449
+#: ../libempathy-gtk/empathy-chat-view.c:443
 msgid "_Open Link"
 msgstr "_Open Link"
 
-#: ../libempathy-gtk/empathy-chat-window.c:699
-#, c-format
-msgid "Conversations (%d)"
-msgstr "Conversations (%d)"
-
-#: ../libempathy-gtk/empathy-chat-window.c:1299
-msgid "Typing a message."
-msgstr "Typing a message."
-
-#: ../libempathy-gtk/empathy-chatrooms-window.c:258
-msgid "Name"
-msgstr "Name"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.c:276
-msgid "Room"
-msgstr "Room"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.c:285
-msgid "Auto Connect"
-msgstr "Auto-Connect"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:1
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:1
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
-msgid "Account:"
-msgstr "Account:"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "Edit Favourite Room"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "Join room on start_up"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "Join this chat room when Empathy starts and you are connected"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:5
-msgid "Manage Favorite Rooms"
-msgstr "Manage Favourite Rooms"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "N_ame:"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "S_erver:"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:9
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "_Room:"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:176
+#: ../libempathy-gtk/empathy-contact-dialogs.c:180
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:183
 msgid "Edit Contact Information"
 msgstr "Edit Contact Information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:182
+#: ../libempathy-gtk/empathy-contact-dialogs.c:186
 msgid "Contact Information"
 msgstr "Contact Information"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:281
 msgid "I would like to add you to my contact list."
 msgstr "I would like to add you to my contact list."
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:305
 msgid "New Contact"
 msgstr "New Contact"
 
@@ -915,89 +694,119 @@ msgstr "Decide _Later"
 msgid "Subscription Request"
 msgstr "Subscription Request"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:197
+#: ../libempathy-gtk/empathy-contact-list-view.c:198
+#: ../src/empathy-chat-window.glade.h:10
 msgid "_Contact"
 msgstr "_Contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:201
+#: ../libempathy-gtk/empathy-contact-list-view.c:202
 msgid "_Group"
 msgstr "_Group"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:205
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
+#: ../libempathy-gtk/empathy-contact-list-view.c:206
+#: ../src/empathy-main-window.glade.h:9
 msgid "_Chat"
 msgstr "_Chat"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:205
+#: ../libempathy-gtk/empathy-contact-list-view.c:206
 msgid "Chat with contact"
 msgstr "Chat with contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:209
+#: ../libempathy-gtk/empathy-contact-list-view.c:210
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:209
+#: ../libempathy-gtk/empathy-contact-list-view.c:210
 msgid "View contact information"
 msgstr "View contact information"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:213
+#: ../libempathy-gtk/empathy-contact-list-view.c:214
 msgid "Re_name"
 msgstr "Re_name"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:213
+#: ../libempathy-gtk/empathy-contact-list-view.c:214
 msgid "Rename"
 msgstr "Rename"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:217
+#: ../libempathy-gtk/empathy-contact-list-view.c:218
+#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+msgid "_Edit"
+msgstr "_Edit"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:218
 msgid "Edit the groups and name for this contact"
 msgstr "Edit the groups and name for this contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:221
+#: ../libempathy-gtk/empathy-contact-list-view.c:222
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:221
+#: ../libempathy-gtk/empathy-contact-list-view.c:222
 msgid "Remove contact"
 msgstr "Remove contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:225
+#: ../libempathy-gtk/empathy-contact-list-view.c:226
 msgid "_Invite to Chat Room"
 msgstr "_Invite to Chat Room"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:225
+#: ../libempathy-gtk/empathy-contact-list-view.c:226
 msgid "Invite to a currently open chat room"
 msgstr "Invite to a currently open chat room"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:229
+#: ../libempathy-gtk/empathy-contact-list-view.c:230
 msgid "_Send File..."
 msgstr "_Send File..."
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:229
+#: ../libempathy-gtk/empathy-contact-list-view.c:230
 msgid "Send a file"
 msgstr "Send a file"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:233
+#: ../libempathy-gtk/empathy-contact-list-view.c:234
+#: ../src/empathy-main-window.glade.h:17
+msgid "_View Previous Conversations"
+msgstr "_View Previous Conversations"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:234
 msgid "View previous conversations with this contact"
 msgstr "View previous conversations with this contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:238
+#: ../libempathy-gtk/empathy-contact-list-view.c:239
 msgid "_Call"
 msgstr "_Call"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:238
+#: ../libempathy-gtk/empathy-contact-list-view.c:239
 msgid "Start a voice or video conversation with this contact"
 msgstr "Start a voice or video conversation with this contact"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1469
+#: ../libempathy-gtk/empathy-contact-list-view.c:1472
+#, c-format
+msgid "Do you really want to remove the contact '%s' ?"
+msgstr "Do you really want to remove the contact '%s'?"
+
+#. TRUE if user wants to remove the contact. FALSE otherwise.
+#: ../libempathy-gtk/empathy-contact-list-view.c:1476
+msgid "Removing contact"
+msgstr "Removing contact"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 msgid "Sorry, I don't want you in my contact list anymore."
 msgstr "Sorry, I don't want you in my contact list anymore."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:688
+#: ../libempathy-gtk/empathy-contact-list-view.c:1500
+#, c-format
+msgid "Do you really want to remove the group '%s' ?"
+msgstr "Do you really want to remove the group '%s'?"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1502
+msgid "Removing group"
+msgstr "Removing group"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:694
 msgid "Select"
 msgstr "Select"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:698
-#: ../libempathy-gtk/empathy-main-window.c:609
+#: ../libempathy-gtk/empathy-contact-widget.c:704
+#: ../src/empathy-main-window.c:612
 msgid "Group"
 msgstr "Group"
 
@@ -1017,6 +826,13 @@ msgstr "<b>Contact</b>"
 msgid "<b>Groups</b>"
 msgstr "<b>Groups</b>"
 
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
+#: ../src/empathy-chatrooms-window.glade.h:1
+#: ../src/empathy-new-chatroom-dialog.glade.h:1
+msgid "Account:"
+msgstr "Account:"
+
 #: ../libempathy-gtk/empathy-contact-widget.glade.h:6
 msgid "Alias:"
 msgstr "Alias:"
@@ -1041,19 +857,20 @@ msgstr "E-mail:"
 msgid "Fullname:"
 msgstr "Fullname:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:12
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
 msgid "Identifier:"
 msgstr "Identifier:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
 msgid "Information requested..."
 msgstr "Information requested..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
 msgid ""
 "Select the groups you want this contact to appear in, you can select more "
 "than one group or no groups."
@@ -1061,251 +878,70 @@ msgstr ""
 "Select the groups you want this contact to appear in, you can select more "
 "than one group or no groups."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
 msgid "Web site:"
 msgstr "Web site:"
 
-#: ../libempathy-gtk/empathy-group-chat.c:251
-msgid "Enter the new topic you want to set for this room:"
-msgstr "Enter the new topic you want to set for this room:"
-
-#: ../libempathy-gtk/empathy-group-chat.c:361
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s has joined the room"
-
-#: ../libempathy-gtk/empathy-group-chat.c:364
-#, c-format
-msgid "%s has left the room"
-msgstr "%s has left the room"
-
-#: ../libempathy-gtk/empathy-group-chat.c:445
-#, c-format
-msgid "Topic: %s"
-msgstr "Topic: %s"
-
-#: ../libempathy-gtk/empathy-group-chat.c:574
-#, c-format
-msgid "Topic set to: %s"
-msgstr "Topic set to: %s"
-
-#: ../libempathy-gtk/empathy-group-chat.c:576
-msgid "No topic defined"
-msgstr "No topic defined"
-
-#: ../libempathy-gtk/empathy-group-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Topic:</b>"
-
-#: ../libempathy-gtk/empathy-group-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Group Chat"
-
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:287
 msgid "new server"
 msgstr "new server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:512
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:516
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:531
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:540
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:544
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:499
+#: ../libempathy-gtk/empathy-log-window.c:497
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-log-window.c:506
+#: ../libempathy-gtk/empathy-log-window.c:504 ../src/empathy-chat-window.c:279
 msgid "Conversation"
 msgstr "Conversation"
 
-#: ../libempathy-gtk/empathy-log-window.c:516
+#: ../libempathy-gtk/empathy-log-window.c:514
 msgid "Date"
 msgstr "Date"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:2
 msgid "Conversations"
 msgstr "Conversations"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.glade.h:3
 msgid "Previous Conversations"
 msgstr "Previous Conversations"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:5
 msgid "Search"
 msgstr "Search"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.glade.h:7
 msgid "_For:"
 msgstr "_For:"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.c:286
-msgid "Chat Rooms"
-msgstr "Chat Rooms"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "Browse:"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Enter the room name to join here or click on one or more rooms in the list."
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:5
-msgid "Join"
-msgstr "Join"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "Join New"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "Re_fresh"
-
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:8
-msgid ""
-"This list represents all chat rooms hosted on the server you have entered."
-msgstr ""
-"This list represents all chat rooms hosted on the server you have entered."
-
-#: ../libempathy-gtk/empathy-main-window.c:266
-msgid "Show and edit accounts"
-msgstr "Show and edit accounts"
-
-#: ../libempathy-gtk/empathy-main-window.c:630
-msgid "Contact"
-msgstr "Contact"
-
-#: ../libempathy-gtk/empathy-main-window.c:813
-msgid "_Edit account"
-msgstr "_Edit account"
-
-#: ../libempathy-gtk/empathy-main-window.c:896
-msgid "Network error"
-msgstr "Network error"
-
-#: ../libempathy-gtk/empathy-main-window.c:899
-msgid "Authentication failed"
-msgstr "Authentication failed"
-
-#: ../libempathy-gtk/empathy-main-window.c:902
-msgid "Encryption error"
-msgstr "Encryption error"
-
-#: ../libempathy-gtk/empathy-main-window.c:905
-msgid "Name in use"
-msgstr "Name in use"
-
-#: ../libempathy-gtk/empathy-main-window.c:908
-msgid "Certificate not provided"
-msgstr "Certificate not provided"
-
-#: ../libempathy-gtk/empathy-main-window.c:911
-msgid "Certificate untrusted"
-msgstr "Certificate untrusted"
-
-#: ../libempathy-gtk/empathy-main-window.c:914
-msgid "Certificate expired"
-msgstr "Certificate expired"
-
-#: ../libempathy-gtk/empathy-main-window.c:917
-msgid "Certificate not activated"
-msgstr "Certificate not activated"
-
-#: ../libempathy-gtk/empathy-main-window.c:920
-msgid "Certificate hostname mismatch"
-msgstr "Certificate hostname mismatch"
-
-#: ../libempathy-gtk/empathy-main-window.c:923
-msgid "Certificate fingerprint mismatch"
-msgstr "Certificate fingerprint mismatch"
-
-#: ../libempathy-gtk/empathy-main-window.c:926
-msgid "Certificate self signed"
-msgstr "Certificate self-signed"
-
-#: ../libempathy-gtk/empathy-main-window.c:929
-msgid "Certificate error"
-msgstr "Certificate error"
-
-#: ../libempathy-gtk/empathy-main-window.c:932
-msgid "Unknown error"
-msgstr "Unknown error"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-msgid "Contact List"
-msgstr "Contact List"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-msgid "Context"
-msgstr "Context"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-msgid "Join _Favorites"
-msgstr "Join _Favourites"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-msgid "Manage Favorites"
-msgstr "Manage Favourites"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_About"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
-msgstr "_Accounts"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Conversation..."
-msgstr "_New Conversation..."
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
-msgstr "_Personal Information"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-msgid "_Preferences"
-msgstr "_Preferences"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr "_Quit"
-
 #: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
 msgid "Call"
 msgstr "Call"
 
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../src/empathy-chat-window.glade.h:2
+msgid "Chat"
+msgstr "Chat"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
 msgid "Contact ID:"
 msgstr "Contact ID:"
@@ -1314,122 +950,6 @@ msgstr "Contact ID:"
 msgid "New Conversation"
 msgstr "New Conversation"
 
-#: ../libempathy-gtk/empathy-preferences.c:247
-msgid "Language"
-msgstr "Language"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>Appearance</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:2
-msgid "<b>Audio</b>"
-msgstr "<b>Audio</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:3
-msgid "<b>Behaviour</b>"
-msgstr "<b>Behaviour</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:4
-msgid "<b>Contact List</b>"
-msgstr "<b>Contact List</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:5
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>Enable spell checking for languages:</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:6
-msgid "<b>Options</b>"
-msgstr "<b>Options</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:7
-msgid "<b>Visual</b>"
-msgstr "<b>Visual</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:8
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:9
-msgid "Automatically _connect on startup "
-msgstr "Automatically _connect on startup "
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:10
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "Avatars are user chosen images shown in the contact list"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:11
-msgid "Chat Th_eme:"
-msgstr "Chat Th_eme:"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:12
-msgid "Display notifications when contacts come _online"
-msgstr "Display notifications when contacts come _online"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:13
-msgid "Enable sounds when _away"
-msgstr "Enable sounds when _away"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:14
-msgid "Enable sounds when _busy"
-msgstr "Enable sounds when _busy"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:15
-msgid "General"
-msgstr "General"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:16
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:17
-msgid "Preferences"
-msgstr "Preferences"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:18
-msgid "Show _avatars"
-msgstr "Show _avatars"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:19
-msgid "Show _smileys as images"
-msgstr "Show _smileys as images"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:20
-msgid "Show co_mpact contact list"
-msgstr "Show co_mpact contact list"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:21
-msgid "Sort by _name"
-msgstr "Sort by _name"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:22
-msgid "Sort by s_tate"
-msgstr "Sort by s_tate"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:23
-msgid "Spell Checking"
-msgstr "Spell Checking"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:24
-msgid "Themes"
-msgstr "Themes"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:25
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:26
-msgid "_Play sound when messages arrive"
-msgstr "_Play sound when messages arrive"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:27
-msgid "_Use for chat rooms"
-msgstr "_Use for chat rooms"
-
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:691
 msgid "Custom messages..."
@@ -1451,21 +971,11 @@ msgstr "Save message"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../libempathy-gtk/empathy-private-chat.c:229
-#, c-format
-msgid "%s went offline"
-msgstr "%s went offline"
-
-#: ../libempathy-gtk/empathy-private-chat.c:243
-#, c-format
-msgid "%s has come online"
-msgstr "%s has come online"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:85
+#: ../libempathy-gtk/empathy-spell-dialog.c:88
 msgid "Word"
 msgstr "Word"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:258
+#: ../libempathy-gtk/empathy-spell-dialog.c:265
 msgid "Suggestions for the word"
 msgstr "Suggestions for the word"
 
@@ -1477,67 +987,31 @@ msgstr "Spell Checker"
 msgid "Suggestions for the word:"
 msgstr "Suggestions for the word:"
 
-#: ../libempathy-gtk/empathy-status-icon.c:369
-#, c-format
-msgid ""
-"New message from %s:\n"
-"%s"
-msgstr ""
-"New message from %s:\n"
-"%s"
-
-#: ../libempathy-gtk/empathy-status-icon.c:434
-#, c-format
-msgid ""
-"Incoming call from %s:\n"
-"%s"
-msgstr ""
-"Incoming call from %s:\n"
-"%s"
-
-#: ../libempathy-gtk/empathy-status-icon.c:738
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "Subscription requested by %s"
-
-#: ../libempathy-gtk/empathy-status-icon.c:741
-#, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"Message: %s"
-
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
-msgstr "Status"
-
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
-
-#: ../libempathy-gtk/empathy-theme-boxes.c:780
+#: ../libempathy-gtk/empathy-theme-boxes.c:747
 #: ../libempathy-gtk/empathy-theme-irc.c:297
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:77
 msgid "Classic"
 msgstr "Classic"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:79
+#: ../libempathy-gtk/empathy-theme-manager.c:78
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:80
+#: ../libempathy-gtk/empathy-theme-manager.c:79
 msgid "Clean"
 msgstr "Clean"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:81
+#: ../libempathy-gtk/empathy-theme-manager.c:80
 msgid "Blue"
 msgstr "Blue"
 
+#: ../libempathy-gtk/empathy-ui-utils.c:1327
+msgid "Unable to open uri"
+msgstr "Unable to open URI"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "Current Locale"
@@ -1727,23 +1201,713 @@ msgstr "Megaphone"
 msgid "Talk!"
 msgstr "Talk!"
 
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
+#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
+msgid "_About"
+msgstr "_About"
+
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
 msgid "_Information"
 msgstr "_Information"
 
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
+#: ../src/empathy-main-window.glade.h:15
+msgid "_Preferences"
+msgstr "_Preferences"
+
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
 msgid "Presence"
 msgstr "Presence"
 
 #: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:89
+#: ../nothere/src/nothere-applet.c:106
 msgid "Set your own presence"
 msgstr "Set your own presence"
 
-#: ../src/empathy.c:205
+#: ../src/empathy.c:73
+msgid "Invalid handle"
+msgstr "Invalid handle"
+
+#: ../src/empathy.c:76
+msgid "No matching connection"
+msgstr "No matching connection"
+
+#: ../src/empathy.c:79
+msgid "Invalid account"
+msgstr "Invalid account"
+
+#: ../src/empathy.c:82
+msgid "Presence failure"
+msgstr "Presence failure"
+
+#: ../src/empathy.c:85
+msgid "No accounts"
+msgstr "No accounts"
+
+#: ../src/empathy.c:88 ../src/empathy-main-window.c:905
+msgid "Network error"
+msgstr "Network error"
+
+#: ../src/empathy.c:91
+msgid "Contact does not support voice"
+msgstr "Contact does not support voice"
+
+#: ../src/empathy.c:94
+msgid "Lowmem"
+msgstr "Lowmem"
+
+#: ../src/empathy.c:97
+msgid "Channel request generic error"
+msgstr "Channel request generic error"
+
+#: ../src/empathy.c:100
+msgid "Channel banned"
+msgstr "Channel banned"
+
+#: ../src/empathy.c:103
+msgid "Channel full"
+msgstr "Channel full"
+
+#: ../src/empathy.c:106
+msgid "Channel invite only"
+msgstr "Channel invite only"
+
+#: ../src/empathy.c:109
+msgid "Unknown error code"
+msgstr "Unknown error code"
+
+#: ../src/empathy.c:318
+msgid "Don't connect on startup"
+msgstr "Don't connect on startup"
+
+#: ../src/empathy.c:330
 msgid "- Empathy Instant Messenger"
 msgstr "- Empathy Instant Messenger"
 
+#: ../src/empathy-about-dialog.c:64
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public Licence as published by the Free Software "
+"Foundation; either version 2 of the Licence, or (at your option) any later "
+"version."
+
+#: ../src/empathy-about-dialog.c:68
+msgid ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
+"details."
+
+#: ../src/empathy-about-dialog.c:72
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+
+#: ../src/empathy-about-dialog.c:100
+msgid "An Instant Messaging client for GNOME"
+msgstr "An Instant Messaging client for GNOME"
+
+#: ../src/empathy-about-dialog.c:106
+msgid "translator-credits"
+msgstr "David Lodge <dave@cirt.net>"
+
+#: ../src/empathy-call-window.c:329
+msgid "Empathy Call"
+msgstr "Empathy Call"
+
+#: ../src/empathy-call-window.c:330
+msgid "Readying"
+msgstr "Readying"
+
+#: ../src/empathy-call-window.c:341
+#, c-format
+msgid "%s - Empathy Call"
+msgstr "%s - Empathy Call"
+
+#: ../src/empathy-call-window.c:345
+msgid "Ringing"
+msgstr "Ringing"
+
+#: ../src/empathy-call-window.c:357
+msgid "Connecting"
+msgstr "Connecting"
+
+#: ../src/empathy-call-window.c:386
+msgid "Closed"
+msgstr "Closed"
+
+#. Output video label
+#: ../src/empathy-call-window.c:446
+msgid "No video output"
+msgstr "No video output"
+
+#: ../src/empathy-call-window.glade.h:1
+msgid "<b>Volume</b>"
+msgstr "<b>Volume</b>"
+
+#: ../src/empathy-call-window.glade.h:2
+msgid "End Call"
+msgstr "End Call"
+
+#: ../src/empathy-call-window.glade.h:3
+msgid "Send Video"
+msgstr "Send Video"
+
+#: ../src/empathy-call-window.glade.h:4
+msgid "Start Call"
+msgstr "Start Call"
+
+#: ../src/empathy-chat-window.c:319
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Conversations (%d)"
+
+#: ../src/empathy-chat-window.c:386
+msgid "Topic:"
+msgstr "Topic:"
+
+#: ../src/empathy-chat-window.c:389
+msgid "Typing a message."
+msgstr "Typing a message."
+
+#: ../src/empathy-chat-window.glade.h:1
+msgid "C_lear"
+msgstr "C_lear"
+
+#: ../src/empathy-chat-window.glade.h:3
+msgid "Insert _Smiley"
+msgstr "Insert _Smiley"
+
+#: ../src/empathy-chat-window.glade.h:4
+msgid "Invitation _message:"
+msgstr "Invitation _message:"
+
+#: ../src/empathy-chat-window.glade.h:5
+msgid "Invite"
+msgstr "Invite"
+
+#: ../src/empathy-chat-window.glade.h:6
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
+
+#: ../src/empathy-chat-window.glade.h:7
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
+
+#: ../src/empathy-chat-window.glade.h:8
+msgid "Select who would you like to invite:"
+msgstr "Select who would you like to invite:"
+
+#: ../src/empathy-chat-window.glade.h:9
+msgid "You have been invited to join a chat conference."
+msgstr "You have been invited to join a chat conference."
+
+#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+msgid "_Contents"
+msgstr "_Contents"
+
+#: ../src/empathy-chat-window.glade.h:12
+msgid "_Conversation"
+msgstr "_Conversation"
+
+#: ../src/empathy-chat-window.glade.h:13
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
+
+#: ../src/empathy-chat-window.glade.h:15 ../src/empathy-main-window.glade.h:12
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/empathy-chat-window.glade.h:16
+msgid "_Next Tab"
+msgstr "_Next Tab"
+
+#: ../src/empathy-chat-window.glade.h:17
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
+
+#: ../src/empathy-chat-window.glade.h:18
+msgid "_Tabs"
+msgstr "_Tabs"
+
+#: ../src/empathy-chat-window.glade.h:19
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../src/empathy-chat-window.glade.h:20
+msgid "gtk-copy"
+msgstr "gtk-copy"
+
+#: ../src/empathy-chat-window.glade.h:21
+msgid "gtk-cut"
+msgstr "gtk-cut"
+
+#: ../src/empathy-chat-window.glade.h:22
+msgid "gtk-paste"
+msgstr "gtk-paste"
+
+#: ../src/empathy-chatrooms-window.c:262
+msgid "Name"
+msgstr "Name"
+
+#: ../src/empathy-chatrooms-window.c:280
+msgid "Room"
+msgstr "Room"
+
+#: ../src/empathy-chatrooms-window.c:289
+msgid "Auto Connect"
+msgstr "Auto-Connect"
+
+#: ../src/empathy-chatrooms-window.glade.h:2
+msgid "Edit Favorite Room"
+msgstr "Edit Favourite Room"
+
+#: ../src/empathy-chatrooms-window.glade.h:3
+msgid "Join room on start_up"
+msgstr "Join room on start_up"
+
+#: ../src/empathy-chatrooms-window.glade.h:4
+msgid "Join this chat room when Empathy starts and you are connected"
+msgstr "Join this chat room when Empathy starts and you are connected"
+
+#: ../src/empathy-chatrooms-window.glade.h:5
+msgid "Manage Favorite Rooms"
+msgstr "Manage Favourite Rooms"
+
+#: ../src/empathy-chatrooms-window.glade.h:6
+msgid "N_ame:"
+msgstr "N_ame:"
+
+#: ../src/empathy-chatrooms-window.glade.h:7
+msgid "S_erver:"
+msgstr "S_erver:"
+
+#: ../src/empathy-chatrooms-window.glade.h:9
+#: ../src/empathy-new-chatroom-dialog.glade.h:9
+msgid "_Room:"
+msgstr "_Room:"
+
+#: ../src/empathy-filter.c:217
+#, c-format
+msgid ""
+"New message from %s:\n"
+"%s"
+msgstr ""
+"New message from %s:\n"
+"%s"
+
+#: ../src/empathy-filter.c:275
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Incoming call from %s"
+
+#: ../src/empathy-filter.c:333
+#, c-format
+msgid "Subscription requested by %s"
+msgstr "Subscription requested by %s"
+
+#: ../src/empathy-filter.c:336
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Message: %s"
+
+#. Tell the user that the tube can't be handled
+#: ../src/empathy-filter.c:445
+#, c-format
+msgid ""
+"%s offered you an invitation, but you don't have the needed external "
+"application to handle it."
+msgstr ""
+"%s offered you an invitation, but you don't have the needed external "
+"application to handle it."
+
+#: ../src/empathy-filter.c:454
+msgid "Invitation Error"
+msgstr "Invitation Error"
+
+#: ../src/empathy-filter.c:564
+#, c-format
+msgid ""
+"%s is offering you an invitation. An external application will be started to "
+"handle it."
+msgstr ""
+"%s is offering you an invitation. An external application will be started to "
+"handle it."
+
+#: ../src/empathy-filter.c:569
+#, c-format
+msgid ""
+"%s is offering you an invitation, but you don't have the needed external "
+"application to handle it."
+msgstr ""
+"%s is offering you an invitation, but you don't have the needed external "
+"application to handle it."
+
+#: ../src/empathy-main-window.c:271
+msgid "Show and edit accounts"
+msgstr "Show and edit accounts"
+
+#: ../src/empathy-main-window.c:633
+msgid "Contact"
+msgstr "Contact"
+
+#: ../src/empathy-main-window.c:822
+msgid "_Edit account"
+msgstr "_Edit account"
+
+#: ../src/empathy-main-window.c:908
+msgid "Authentication failed"
+msgstr "Authentication failed"
+
+#: ../src/empathy-main-window.c:911
+msgid "Encryption error"
+msgstr "Encryption error"
+
+#: ../src/empathy-main-window.c:914
+msgid "Name in use"
+msgstr "Name in use"
+
+#: ../src/empathy-main-window.c:917
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
+
+#: ../src/empathy-main-window.c:920
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
+
+#: ../src/empathy-main-window.c:923
+msgid "Certificate expired"
+msgstr "Certificate expired"
+
+#: ../src/empathy-main-window.c:926
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
+
+#: ../src/empathy-main-window.c:929
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
+
+#: ../src/empathy-main-window.c:932
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
+
+#: ../src/empathy-main-window.c:935
+msgid "Certificate self signed"
+msgstr "Certificate self-signed"
+
+#: ../src/empathy-main-window.c:938
+msgid "Certificate error"
+msgstr "Certificate error"
+
+#: ../src/empathy-main-window.c:941
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: ../src/empathy-main-window.glade.h:1
+msgid "Contact List"
+msgstr "Contact List"
+
+#: ../src/empathy-main-window.glade.h:2
+msgid "Context"
+msgstr "Context"
+
+#: ../src/empathy-main-window.glade.h:3
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
+
+#: ../src/empathy-main-window.glade.h:4
+msgid "Join _New..."
+msgstr "Join _New..."
+
+#: ../src/empathy-main-window.glade.h:5
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
+
+#: ../src/empathy-main-window.glade.h:6
+msgid "Show _Offline Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../src/empathy-main-window.glade.h:7
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: ../src/empathy-main-window.glade.h:8
+msgid "_Add Contact..."
+msgstr "_Add Contact..."
+
+#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+msgid "_New Conversation..."
+msgstr "_New Conversation..."
+
+#: ../src/empathy-main-window.glade.h:14
+msgid "_Personal Information"
+msgstr "_Personal Information"
+
+#: ../src/empathy-main-window.glade.h:16
+msgid "_Room"
+msgstr "_Room"
+
+#: ../src/empathy-main-window.glade.h:18
+msgid "gtk-about"
+msgstr "gtk-about"
+
+#: ../src/empathy-main-window.glade.h:19
+msgid "gtk-quit"
+msgstr "gtk-quit"
+
+#: ../src/empathy-new-chatroom-dialog.c:290
+msgid "Chat Rooms"
+msgstr "Chat Rooms"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:2
+msgid "Browse:"
+msgstr "Browse:"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Enter the room name to join here or click on one or more rooms in the list."
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:4
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:5
+msgid "Join"
+msgstr "Join"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:6
+msgid "Join New"
+msgstr "Join New"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:7
+msgid "Re_fresh"
+msgstr "Re_fresh"
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:8
+msgid ""
+"This list represents all chat rooms hosted on the server you have entered."
+msgstr ""
+"This list represents all chat rooms hosted on the server you have entered."
+
+#: ../src/empathy-preferences.c:269
+msgid "Language"
+msgstr "Language"
+
+#: ../src/empathy-preferences.glade.h:1
+msgid "<b>Appearance</b>"
+msgstr "<b>Appearance</b>"
+
+#: ../src/empathy-preferences.glade.h:2
+msgid "<b>Audio</b>"
+msgstr "<b>Audio</b>"
+
+#: ../src/empathy-preferences.glade.h:3
+msgid "<b>Behaviour</b>"
+msgstr "<b>Behaviour</b>"
+
+#: ../src/empathy-preferences.glade.h:4
+msgid "<b>Contact List</b>"
+msgstr "<b>Contact List</b>"
+
+#: ../src/empathy-preferences.glade.h:5
+msgid "<b>Enable spell checking for languages:</b>"
+msgstr "<b>Enable spell checking for languages:</b>"
+
+#: ../src/empathy-preferences.glade.h:6
+msgid "<b>Options</b>"
+msgstr "<b>Options</b>"
+
+#: ../src/empathy-preferences.glade.h:7
+msgid "<b>Visual</b>"
+msgstr "<b>Visual</b>"
+
+#: ../src/empathy-preferences.glade.h:8
+msgid ""
+"<small>The list of languages reflects only the languages for which you have "
+"a dictionary installed.</small>"
+msgstr ""
+"<small>The list of languages reflects only the languages for which you have "
+"a dictionary installed.</small>"
+
+#: ../src/empathy-preferences.glade.h:9
+msgid "Automatically _connect on startup "
+msgstr "Automatically _connect on startup "
+
+#: ../src/empathy-preferences.glade.h:10
+msgid "Avatars are user chosen images shown in the contact list"
+msgstr "Avatars are user chosen images shown in the contact list"
+
+#: ../src/empathy-preferences.glade.h:11
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
+
+#: ../src/empathy-preferences.glade.h:12
+msgid "Display notifications when contacts come _online"
+msgstr "Display notifications when contacts come _online"
+
+#: ../src/empathy-preferences.glade.h:13
+msgid "Enable sounds when _away"
+msgstr "Enable sounds when _away"
+
+#: ../src/empathy-preferences.glade.h:14
+msgid "Enable sounds when _busy"
+msgstr "Enable sounds when _busy"
+
+#: ../src/empathy-preferences.glade.h:15
+msgid "General"
+msgstr "General"
+
+#: ../src/empathy-preferences.glade.h:16
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../src/empathy-preferences.glade.h:17
+msgid "Preferences"
+msgstr "Preferences"
+
+#: ../src/empathy-preferences.glade.h:18
+msgid "Show _avatars"
+msgstr "Show _avatars"
+
+#: ../src/empathy-preferences.glade.h:19
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
+
+#: ../src/empathy-preferences.glade.h:20
+msgid "Show co_mpact contact list"
+msgstr "Show co_mpact contact list"
+
+#: ../src/empathy-preferences.glade.h:21
+msgid "Sort by _name"
+msgstr "Sort by _name"
+
+#: ../src/empathy-preferences.glade.h:22
+msgid "Sort by s_tate"
+msgstr "Sort by s_tate"
+
+#: ../src/empathy-preferences.glade.h:23
+msgid "Spell Checking"
+msgstr "Spell Checking"
+
+#: ../src/empathy-preferences.glade.h:24
+msgid "Themes"
+msgstr "Themes"
+
+#: ../src/empathy-preferences.glade.h:25
+msgid "_Open new chats in separate windows"
+msgstr "_Open new chats in separate windows"
+
+#: ../src/empathy-preferences.glade.h:26
+msgid "_Play sound when messages arrive"
+msgstr "_Play sound when messages arrive"
+
+#: ../src/empathy-preferences.glade.h:27
+msgid "_Use for chat rooms"
+msgstr "_Use for chat rooms"
+
+#: ../src/empathy-status-icon.glade.h:1
+msgid "Status"
+msgstr "Status"
+
+#: ../src/empathy-status-icon.glade.h:3
+msgid "_Quit"
+msgstr "_Quit"
+
+#: ../src/empathy-status-icon.glade.h:4
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
+
+#~ msgid "ICQ account settings"
+#~ msgstr "ICQ account settings"
+
+#~ msgid "irc account settings"
+#~ msgstr "irc account settings"
+
+#~ msgid "jabber account settings"
+#~ msgstr "jabber account settings"
+
+#~ msgid "msn account settings"
+#~ msgstr "msn account settings"
+
+#~ msgid "salut account settings"
+#~ msgstr "Salut account settings"
+
+#~ msgid "Yahoo! account settings"
+#~ msgstr "Yahoo! account settings"
+
+#~ msgid "Input"
+#~ msgstr "Input"
+
+#~ msgid "Mute"
+#~ msgstr "Mute"
+
+#~ msgid "Output"
+#~ msgstr "Output"
+
+#~ msgid "Volume"
+#~ msgstr "Volume"
+
+#~ msgid "Ca_ll"
+#~ msgstr "Ca_ll"
+
+#~ msgid "Change _Topic..."
+#~ msgstr "Change _Topic..."
+
+#~ msgid "Contact Infor_mation"
+#~ msgstr "Contact Infor_mation"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cu_t"
+
+#~ msgid "In_vite..."
+#~ msgstr "In_vite..."
+
+#~ msgid "_Add To Favorites"
+#~ msgstr "_Add To Favourites"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copy"
+
+#~ msgid "_Paste"
+#~ msgstr "_Paste"
+
+#~ msgid "_Show Contacts"
+#~ msgstr "_Show Contacts"
+
+#~ msgid "Enter the new topic you want to set for this room:"
+#~ msgstr "Enter the new topic you want to set for this room:"
+
+#~ msgid "%s went offline"
+#~ msgstr "%s went offline"
+
+#~ msgid "%s has come online"
+#~ msgstr "%s has come online"
+
 #, fuzzy
 #~ msgid "Instant Messenger"
 #~ msgstr "- Empathy Instant Messenger"
@@ -1810,9 +1974,6 @@ msgstr "- Empathy Instant Messenger"
 #~ msgid "-"
 #~ msgstr "-"
 
-#~ msgid "<b>About</b>"
-#~ msgstr "<b>About</b>"
-
 #~ msgid "<b>Personal Details</b>"
 #~ msgstr "<b>Personal Details</b>"
 
@@ -1847,9 +2008,6 @@ msgstr "- Empathy Instant Messenger"
 #~ msgid "Ch_at"
 #~ msgstr "Ch_at"
 
-#~ msgid "Connect on S_tartup"
-#~ msgstr "Connect on S_tartup"
-
 #~ msgid "Contact List - Gossip"
 #~ msgstr "Contact List - Gossip"