Updated Basque translation.

[empathy.git] / po / gl.po

diff --git a/po/gl.po b/po/gl.po
index 5b3ff9532e0f7d30bcd9852fe7ccc9681d27b395..a6c4282c1cb5f605e6ebd2a2e8389ce1167bf3e5 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,23 +3,23 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007.
+# Ignacio Casal Quinteiro <icq@svn.gnome.org>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-28 22:06+0100\n"
-"PO-Revision-Date: 2007-10-28 22:07+0100\n"
+"POT-Creation-Date: 2008-08-19 18:09+0200\n"
+"PO-Revision-Date: 2008-08-19 18:10+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <icq@svn.gnome.org>\n"
 "Language-Team: Galego <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type:  text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
-msgstr "Mensaxería na internet de Empathy"
+msgstr "Mensaxería na Internet de Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Send and receive instant messages"
@@ -30,15 +30,20 @@ msgid "Always open a separate chat window for new chats."
 msgstr "Abrir sempre nunha ventá de conversa separada para conversas novas."
 
 #: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
-msgstr "Tema da ventá de conversa"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carácter a engadir despois do alcume cando se usa completado de alcume "
+"(separador) na conversa de grupo."
 
 #: ../data/empathy.schemas.in.h:3
-msgid "Checks if Salut account is created"
-msgstr "Comproba se se creou a conta Salut"
+msgid "Chat window theme"
+msgstr "Tema da ventá de conversa"
 
 #: ../data/empathy.schemas.in.h:4
-msgid "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+msgid ""
+"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
 msgstr ""
 "Lista separada por comas de idiomas que se usarán na revisión ortográfica "
 "(ex. en, gl, es)."
@@ -56,74 +61,121 @@ msgid "Default directory to select an avatar image from"
 msgstr "Directorio predeterminado para seleccionar un avatar"
 
 #: ../data/empathy.schemas.in.h:8
+msgid "Empathy should auto-connect on startup"
+msgstr "Se Empathy debería conectarse automaticamente ao inicio"
+
+#: ../data/empathy.schemas.in.h:9
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy debería usar o avatar do contacto como icona da ventá de conversa"
+
+#: ../data/empathy.schemas.in.h:10
 msgid "Enable popup when contact is available"
 msgstr "Activar ventá emerxente cando un contacto está dispoñible"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:11
 msgid "Enable sound when away"
 msgstr "Activar son ao ausentarse"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:12
 msgid "Enable sound when busy"
 msgstr "Activar son cando se está ocupado"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:13
 msgid "Enable spell checker"
 msgstr "Activar corrector ortográfico"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:14
 msgid "Hide main window"
 msgstr "Ocultar a ventá principal"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:15
 msgid "Hide the main window."
 msgstr "Ocultar a ventá principal."
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:16
+msgid "NetworkManager should be used"
+msgstr "Se se debería usar NetworkManager"
+
+#: ../data/empathy.schemas.in.h:17
+msgid "Nick completed character"
+msgstr "Carácter de completado de alcume"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Open new chats in separate windows"
 msgstr "Abrir conversas novas en ventás separadas"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:19
+msgid "Salut account is created"
+msgstr "A conta Salut está creada"
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Show avatars"
 msgstr "Mostrar avatares"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:21
 msgid "Show hint about closing the main window"
 msgstr "Mostrar consello sobre como pechar a ventá principal"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:22
 msgid "Show offline contacts"
 msgstr "Mostrar os contactos desconectados"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:23
 msgid "Spell checking languages"
 msgstr "Linguas para revisión ortográfica"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:24
 msgid "The last directory that an avatar image was chosen from."
 msgstr "O último directorio do que foi escollido un avatar."
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:25
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema que se usará para mostrar a conversa nas ventás de conversas."
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:26
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:27
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:28
 msgid "Use theme for chat rooms"
 msgstr "Usar tema para salas de conversas"
 
-#: ../data/empathy.schemas.in.h:24
-msgid "Whether or not the Salut account has been created on the first empathy run."
-msgstr "Indica se a conta Salut creouse cando executou por primeira vez Empathy."
+#: ../data/empathy.schemas.in.h:29
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr ""
+"Indica ou non se Empathy debería inciar sesión automaticamente nas súas ao "
+"inicio."
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:30
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
+msgstr ""
+"Indica se Empathy debe usar o avatar do contacto como icona da ventá de "
+"conversa."
+
+#: ../data/empathy.schemas.in.h:31
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr ""
+"Indica se a conta Salut creouse cando executou por primeira vez Empathy."
+
+#: ../data/empathy.schemas.in.h:32
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+"Indica ou non se se debería usar network manager para desconectar/reconectar "
+"automaticamente."
+
+#: ../data/empathy.schemas.in.h:33
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
@@ -131,31 +183,32 @@ msgstr ""
 "Indica se se debe ou non revisar as palabras tecleadas con respecto aos "
 "idiomas cos que quere comprobalo."
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Whether or not to convert smileys into graphical images in conversations."
+#: ../data/empathy.schemas.in.h:34
+msgid ""
+"Whether or not to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se debe ou non converter as emoticonas en imaxes gráficas nas "
 "conversas."
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Whether or not to play a sound when messages arrive."
 msgstr "Indica se debe reproducir un son cando cheguen mensaxes."
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Whether or not to play sounds when away."
 msgstr "Indica se debe ou non reproducir sons cando esté ausente."
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
 msgid "Whether or not to play sounds when busy."
 msgstr "Indica se debe ou non reproducir sons cando esté ocupado."
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:38
 msgid "Whether or not to show a popup when a contact becomes available."
 msgstr ""
 "Indica se debe ou non mostrar unha ventá emerxente cando un contacto volva a "
 "estar dispoñible."
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:39
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
@@ -163,13 +216,13 @@ msgstr ""
 "Indica se debe ou non mostrar os avatares para os contactos na lista de "
 "contactos e ventás de conversas."
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:40
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se debe ou non mostrar os contactos que están deconectados na lista "
 "de contactos"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:41
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
@@ -177,15 +230,15 @@ msgstr ""
 "Indica se debe ou non mostrar unha mensaxe de diálogo sobre como pechar a "
 "ventá principal co botón 'x' na barra de título."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:42
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "Indica se debe ou non mostrar a lista de contactos en modo compacto."
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:43
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "Indica se debe ou non usar o tema para salas de conversa."
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:44
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
@@ -195,132 +248,189 @@ msgstr ""
 "ordenar polo nome do contacto co valor \"name\". Un valor de \"state\" "
 "ordenará a lista polo estado."
 
-#: ../libempathy/empathy-presence.c:185 ../libempathy/empathy-presence.c:285
-msgid "Offline"
-msgstr "Desconectado"
+#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:248
+msgid "People nearby"
+msgstr "Xente máis próxima"
 
-#: ../libempathy/empathy-presence.c:275
+#: ../libempathy/empathy-utils.c:345
 msgid "Available"
 msgstr "Dispoñible"
 
-#: ../libempathy/empathy-presence.c:277
+#: ../libempathy/empathy-utils.c:347
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-presence.c:280
+#: ../libempathy/empathy-utils.c:350
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-presence.c:282
+#: ../libempathy/empathy-utils.c:352
 msgid "Hidden"
 msgstr "Oculto"
 
-#: ../libempathy/empathy-tp-contact-list.c:729 ../src/empathy.c:212
-msgid "People nearby"
-msgstr "Xente máis próxima"
-
-#: ../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 ""
-"O Empathy é software libre; pode redistribuílo ou modificadlo baixo os "
-"termos da Licenza Pública Xeral de GNU publicada pola Free Software "
-"Foundation; xa sexa na versión 2 da Licenza como (segundo a súa escolla) en "
-"calquera versión posterior."
-
-#: ../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 ""
-"O Empathy distribúese coa esperanza de que sexa útil, mais SEN NINGUNHA "
-"GARANTÍA; mesmo sen a garantía implícita de COMERCIALIZACIÓN ou IDONEIDADE "
-"PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza Pública "
-"Xeral de GNU."
-
-#: ../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 ""
-"Debeu recibir unha copia da Licenza Pública Xeral de GNU xunto co Nautilus; "
-"en caso contrario, escriba á 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 "Un cliente de mensaxería instantánea para Gnome"
-
-#: ../libempathy-gtk/empathy-about-dialog.c:105
-msgid "translator-credits"
-msgstr "Ignacio Casal Quinteiro <nacho.resa@gmail.com>"
+#: ../libempathy/empathy-utils.c:355
+msgid "Offline"
+msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:337
+#: ../libempathy-gtk/empathy-account-chooser.c:335
 msgid "All"
 msgstr "Todo"
 
-#: ../libempathy-gtk/empathy-account-widget-generic.c:146
-#: ../libempathy-gtk/empathy-account-widget-generic.c:208
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:347
 #, 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>Avanzado</b>"
+msgstr "<b>Avanzado</b> asdfas "
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
+#: ../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 "Olvidar o contrasinal e limpar a entrada."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
-msgid "Login I_D:"
-msgstr "I_D de sesión:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
+#: ../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
+#: ../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:4
 msgid "Pass_word:"
 msgstr "_Contrasinal:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
-msgid "Reso_urce:"
-msgstr "Rec_urso:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
-msgid "Use encryption (SS_L)"
-msgstr "Usar cifrado (SS_L)"
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+msgid "Screen _Name:"
+msgstr "_Nome en pantalla:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.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:8
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.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-new-chatroom-dialog.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
+#: ../src/empathy-new-chatroom-dialog.glade.h:10
 msgid "_Server:"
 msgstr "_Servidor:"
 
+#: ../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:3
+msgid "Login I_D:"
+msgstr "I_D de sesión:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+msgid "_Charset:"
+msgstr "_Conxunto de caracteres:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+msgid "New Network"
+msgstr "Nova rede"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
+msgid "<b>Network</b>"
+msgstr "<b>Rede</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
+msgid "<b>Servers</b>"
+msgstr "<b>Servidores</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+msgid "Charset:"
+msgstr "Conxunto de caracteres:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
+msgid "Create a new IRC network"
+msgstr "Crear unha rede IRC nova"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
+msgid "Edit the selected IRC network"
+msgstr "Editar a rede IRC seleccionada"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+msgid "Network"
+msgstr "Rede"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+msgid "Network:"
+msgstr "Rede:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+msgid "Nickname:"
+msgstr "Alcume:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+msgid "Quit message:"
+msgstr "Mensaxe de saída:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+msgid "Real name:"
+msgstr "Nome real:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
+msgid "Remove the selected IRC network"
+msgstr "Eliminar a rede IRC seleccionada"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
+msgid "<b>Override server settings</b>"
+msgstr "<b>Substituír a configuración do servidor</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+msgid "Pri_ority:"
+msgstr "Pri_oridade:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+msgid "Reso_urce:"
+msgstr "Rec_urso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+msgid "Use old SS_L"
+msgstr "Usar antigo SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
-msgid "jabber account settings"
-msgstr "axustes da conta jabber"
+msgid "_Encryption required (TLS/SSL)"
+msgstr "É n_ecesario cifrado (TLS/SSL)"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:7
-msgid "msn account settings"
-msgstr "axustes da conta msn"
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+msgid "_Ignore SSL certificate errors"
+msgstr "_Ignorar erros do certificado SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
-msgid "_E-mail:"
+msgid "_Email:"
 msgstr "_Correo-e:"
 
 #: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
@@ -336,7 +446,7 @@ msgid "_Last Name:"
 msgstr "Ape_lidos:"
 
 #: ../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 "Alcu_me:"
 
@@ -344,653 +454,1203 @@ msgstr "Alcu_me:"
 msgid "_Published Name:"
 msgstr "Nome _publicado:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:8
-msgid "salut account settings"
-msgstr "axustes da conta salut"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:218
-msgid "Disable"
-msgstr "Desactivar"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:221
-msgid "Enable"
-msgstr "Activar"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:256
-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."
-msgstr ""
-"Para engadir unha nova conta, pode premer no botón 'Engadir' e crearase unha "
-"nova entrada para que a configure."
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:260
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Para engadir unha nova conta, primeiro debe instalar un \"backend\" para "
-"cada protocolo que queira usar."
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:267
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:2
-msgid "<b>No Account Selected</b>"
-msgstr "<b>Ningunha conta seleccionada</b>"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:268
-msgid ""
-"\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
-msgstr ""
-"\n"
-"\n"
-"Se non quere engadir unha conta, simplemente prema na conta que quere "
-"configurar na lista da esquerda."
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:274
-msgid "<b>No Accounts Configured</b>"
-msgstr "<b>Non hai ningunha conta configurada</b>"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:401
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:4
-msgid "Accounts"
-msgstr "Contas"
-
-#: ../libempathy-gtk/empathy-accounts-dialog.c:898
-#, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"Vai a eliminar a súa conta %s!\n"
-"Está seguro de que quere proceder?"
+#. 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 "Descubrir STUN"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.c:904
-msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"Calquer conversa ou sala de conversa asociada NON se eliminará se decide "
-"proceder.\n"
-"\n"
-"Debería decidir engadir a conta máis tarde, estarán aínda dispoñibles."
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>Nova conta</b>"
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+msgid "STUN port:"
+msgstr "Porto STUN:"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>Axustes</b>"
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+msgid "_Username:"
+msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:5
-msgid "Cr_eate"
-msgstr "Cr_ear"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+msgid "Use _Yahoo Japan"
+msgstr "Usar _Yahoo Japan"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:6
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
-msgstr ""
-"Para engadir unha nova conta, pode premer no botón 'Engadir' e crearase unha "
-"nova entrada para que a configure.\n"
-"\n"
-"Se non quere engadir unha conta, simplemente prema na conta que quere "
-"configurar na lista da esquerda."
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+msgid "_Ignore conference and chatroom invitations"
+msgstr "_Ignorar invitacións a conferencias e salas de conversas"
 
-#: ../libempathy-gtk/empathy-accounts-dialog.glade.h:9
-msgid "Type:"
-msgstr "Tipo:"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+msgid "_Room List locale:"
+msgstr "Configuración da lista de _salas:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:457
 msgid "Select Your Avatar Image"
 msgstr "Seleccione o seu Avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:451
+#: ../libempathy-gtk/empathy-avatar-chooser.c:460
 msgid "No Image"
 msgstr "Sen imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:511
+#: ../libempathy-gtk/empathy-avatar-chooser.c:520
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:515
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:298
+#: ../libempathy-gtk/empathy-avatar-image.c:294
 msgid "Click to enlarge"
 msgstr "Prema para agrandar"
 
-#: ../libempathy-gtk/empathy-call-window.glade.h:1
-msgid "Call"
-msgstr "Chamar"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:2
-msgid "Input"
-msgstr "Entrada"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:3
-msgid "Mute"
-msgstr "Silenciar"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:4
-msgid "Output"
-msgstr "Saída"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:5
-msgid "Send Video"
-msgstr "Envía vídeo"
-
-#: ../libempathy-gtk/empathy-call-window.glade.h:6
-msgid "Volume"
-msgstr "Volume"
-
-#: ../libempathy-gtk/empathy-chat.c:332
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: ../libempathy-gtk/empathy-chat.c:452
+#: ../libempathy-gtk/empathy-chat.c:497
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:455
+#: ../libempathy-gtk/empathy-chat.c:500
 msgid "invalid contact"
 msgstr "contacto inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:458
+#: ../libempathy-gtk/empathy-chat.c:503
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:461
+#: ../libempathy-gtk/empathy-chat.c:506
 msgid "too long message"
 msgstr "mensaxe demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:464
+#: ../libempathy-gtk/empathy-chat.c:509
 msgid "not implemented"
 msgstr "sen implementar"
 
-#: ../libempathy-gtk/empathy-chat.c:467
+#: ../libempathy-gtk/empathy-chat.c:512
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:471
+#: ../libempathy-gtk/empathy-chat.c:516
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro enviando a mensaxe '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:926
+#: ../libempathy-gtk/empathy-chat.c:546
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Tema establecido a: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "No topic defined"
+msgstr "Tema sen definir"
+
+#: ../libempathy-gtk/empathy-chat.c:963
 msgid "Insert Smiley"
 msgstr "Inserir emoticona"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:979
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../libempathy-gtk/empathy-chat.c:1013
 msgid "_Check Word Spelling..."
 msgstr "_Comprobar ortografía..."
 
-#: ../libempathy-gtk/empathy-chat.c:1398
-msgid "Connected"
-msgstr "Conectado"
+#: ../libempathy-gtk/empathy-chat.c:1119
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:1
-msgid "C_lear"
-msgstr "_Limpar"
+#: ../libempathy-gtk/empathy-chat.c:1122
+#, c-format
+msgid "%s has left the room"
+msgstr "%s deixou a sala"
+
+#: ../libempathy-gtk/empathy-chat.c:1236 ../src/empathy-call-window.c:406
+msgid "Disconnected"
+msgstr "Desconectado"
+
+#: ../libempathy-gtk/empathy-chat.c:1608
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:1
+msgid "<b>Topic:</b>"
+msgstr "<b>Tema:</b>"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:2
+msgid "Group Chat"
+msgstr "Grupo de conversa"
+
+#: ../libempathy-gtk/empathy-chat-view.c:430
+msgid "_Copy Link Address"
+msgstr "_Copiar o enderezo da ligazón"
+
+#: ../libempathy-gtk/empathy-chat-view.c:438
+msgid "_Open Link"
+msgstr "_Abrir ligazón"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:180
+msgid "Personal Information"
+msgstr "Información persoal"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+msgid "Edit Contact Information"
+msgstr "Editar a información do contacto"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:186
+msgid "Contact Information"
+msgstr "Información do contacto"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:283
+msgid "I would like to add you to my contact list."
+msgstr "Gustaríame engadirte á miña lista de contactos."
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:307
+msgid "New Contact"
+msgstr "Novo contacto"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+msgid "Decide _Later"
+msgstr "Decidir _despois"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1226
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Está seguro de que quere eliminar o grupo '%s'?"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1228
+msgid "Removing group"
+msgstr "Eliminando grupo"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1275
+#: ../libempathy-gtk/empathy-contact-list-view.c:1354
+msgid "_Remove"
+msgstr "_Eliminar"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1305
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Está seguro de que quere eliminar o contacto '%s'?"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1307
+msgid "Removing contact"
+msgstr "Eliminando contacto"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1312
+msgid "Sorry, I don't want you in my contact list anymore."
+msgstr "Síntoo, non te quero na miña lista de contactos máis."
+
+#: ../libempathy-gtk/empathy-contact-menu.c:109
+#: ../src/empathy-main-window.glade.h:9
+msgid "_Chat"
+msgstr "_Conversa"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:130
+msgid "_Call"
+msgstr "_Chamar"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:169
+#: ../src/empathy-main-window.glade.h:17
+msgid "_View Previous Conversations"
+msgstr "_Ver conversas anteriores"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:197
+msgid "Infor_mation"
+msgstr "Infor_mación"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:224
+#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+msgid "_Edit"
+msgstr "_Editar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:358
+msgid "Save Avatar"
+msgstr "Gardar avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:414
+msgid "Unable to save avatar"
+msgstr "Non se pode gardar o avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:866
+msgid "Select"
+msgstr "Seleccionar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:875
+#: ../src/empathy-main-window.c:853
+msgid "Group"
+msgstr "Grupo"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
+msgid "<b>Client Information</b>"
+msgstr "<b>Información de cliente</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
+msgid "<b>Contact Details</b>"
+msgstr "<b>Detalles do contacto</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
+msgid "<b>Contact</b>"
+msgstr "<b>Contacto</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
+msgid "<b>Groups</b>"
+msgstr "<b>Grupos</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 "Conta:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+msgid "Alias:"
+msgstr "Alcume:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+msgid "Birthday:"
+msgstr "Cumpreanos:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
+msgid "Contact information"
+msgstr "Información do contacto"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+msgid "Email:"
+msgstr "Correo-e:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+msgid "Fullname:"
+msgstr "Nome completo:"
+
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+msgid "Identifier:"
+msgstr "Identificador:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+msgid "Information requested..."
+msgstr "Información solicitada..."
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+msgid "OS:"
+msgstr "SO:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Seleccione os grupos nos que quere que apareza este contacto. Note que pode "
+"seleccionar máis de un ou ningún grupo."
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+msgid "Version:"
+msgstr "Versión:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+msgid "Web site:"
+msgstr "Sitio web:"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+msgid "_Add Group"
+msgstr "_Engadir grupo"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+msgid "new server"
+msgstr "servidor novo"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+msgid "Server"
+msgstr "Servidor"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+msgid "Port"
+msgstr "Porto"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:497
+msgid "Account"
+msgstr "Conta"
+
+#: ../libempathy-gtk/empathy-log-window.c:504 ../src/empathy-chat-window.c:276
+msgid "Conversation"
+msgstr "Conversa"
+
+#: ../libempathy-gtk/empathy-log-window.c:514
+msgid "Date"
+msgstr "Data"
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:2
+msgid "Conversations"
+msgstr "Conversas"
+
+#: ../libempathy-gtk/empathy-log-window.glade.h:3
+msgid "Previous Conversations"
+msgstr "Conversas anteriores"
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:5
+msgid "Search"
+msgstr "Buscar"
+
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.glade.h:7
+msgid "_For:"
+msgstr "_Por:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+msgid "Call"
+msgstr "Chamar"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../src/empathy-chat-window.glade.h:2
+msgid "Chat"
+msgstr "Conversa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+msgid "Contact ID:"
+msgstr "ID de contacto:"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+msgid "New Conversation"
+msgstr "Nova conversa"
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:685
+msgid "Custom messages..."
+msgstr "Mensaxes personalizadas..."
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
+msgid "Custom message"
+msgstr "Mensaxe personalizada"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
+msgid "Message:"
+msgstr "Mensaxe:"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
+msgid "Save message"
+msgstr "Gardar mensaxe"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../libempathy-gtk/empathy-spell-dialog.c:88
+msgid "Word"
+msgstr "Palabra"
+
+#: ../libempathy-gtk/empathy-spell-dialog.c:265
+msgid "Suggestions for the word"
+msgstr "Suxestións para a palabra"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
+msgid "Spell Checker"
+msgstr "Comprobador ortográfico"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
+msgid "Suggestions for the word:"
+msgstr "Suxestións para a palabra:"
+
+#: ../libempathy-gtk/empathy-theme-boxes.c:745
+#: ../libempathy-gtk/empathy-theme-irc.c:293
+msgid "%A %d %B %Y"
+msgstr "%A %d %B %Y"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Classic"
+msgstr "Clásico"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:74
+msgid "Simple"
+msgstr "Sinxela"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
+msgid "Clean"
+msgstr "Limpar"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:76
+msgid "Blue"
+msgstr "Azul"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
+msgid "Unable to open URI"
+msgstr "Non se puido abrir a URI"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "Configuración rexional actual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Árabe"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armenio"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Báltico"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Celta"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Europeo central"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Chinés simplificado"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Chinés tradicional"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Cirílico"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Cirílico/Ruso"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Círilico/Ucraniano"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Xeorxiano"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Grego"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Guxarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Hebreo visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindú"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Islandés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Nórdico"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Persa"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Rumano"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "Europa do sur"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Occidental"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
+msgid ""
+"The contact to display in the applet. Empty means no contact is displayed."
+msgstr ""
+"O contacto a mostrar na applet. Se se deixa baleiro non se mostrará ningún "
+"contacto."
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
+msgid "The contact's avatar token. Empty means contact has no avatar."
+msgstr ""
+"O avatar do contacto. Se se deixa baleiro non se mostrará ningún avatar."
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
+msgid "Megaphone"
+msgstr "Megáfono"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
+#: ../megaphone/src/megaphone-applet.c:417
+msgid "Talk!"
+msgstr "Falar!"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
+#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
+msgid "_About"
+msgstr "_Sobre"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
+msgid "_Information"
+msgstr "_Información"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
+#: ../src/empathy-main-window.glade.h:15
+msgid "_Preferences"
+msgstr "_Preferencias"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
+msgid "Presence"
+msgstr "Presencia"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
+#: ../nothere/src/nothere-applet.c:106
+msgid "Set your own presence"
+msgstr "Establecer a súa presencia"
+
+#: ../src/empathy.c:380
+msgid "Don't connect on startup"
+msgstr "Non conectarse automaticamente ao inicio"
+
+#: ../src/empathy.c:384
+msgid "Don't show the contact list on startup"
+msgstr "Non mostrar a lista de contactos ao inicio"
+
+#: ../src/empathy.c:388
+msgid "Show the accounts dialog"
+msgstr "Mostrar o diálogo de contas"
+
+#: ../src/empathy.c:400
+msgid "- Empathy Instant Messenger"
+msgstr "- Mensaxería instantánea de Empathy"
+
+#: ../src/empathy-about-dialog.c:84
+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 ""
+"O Empathy é software libre; pode redistribuílo ou modificadlo baixo os "
+"termos da Licenza Pública Xeral de GNU publicada pola Free Software "
+"Foundation; xa sexa na versión 2 da Licenza como (segundo a súa escolla) en "
+"calquera versión posterior."
 
-#: ../libempathy-gtk/empathy-chat.glade.h:2
-msgid "Ca_ll"
-msgstr "C_hamar"
+#: ../src/empathy-about-dialog.c:88
+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 ""
+"O Empathy distribúese coa esperanza de que sexa útil, mais SEN NINGUNHA "
+"GARANTÍA; mesmo sen a garantía implícita de COMERCIALIZACIÓN ou IDONEIDADE "
+"PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza Pública "
+"Xeral de GNU."
 
-#: ../libempathy-gtk/empathy-chat.glade.h:3
-msgid "Change _Topic..."
-msgstr "Cambiar _tema..."
+#: ../src/empathy-about-dialog.c:92
+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 ""
+"Debeu recibir unha copia da Licenza Pública Xeral de GNU xunto co Nautilus; "
+"en caso contrario, escriba á Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:4
-msgid "Chat"
-msgstr "Conversa"
+#: ../src/empathy-about-dialog.c:120
+msgid "An Instant Messaging client for GNOME"
+msgstr "Un cliente de mensaxería instantánea para Gnome"
+
+#: ../src/empathy-about-dialog.c:126
+msgid "translator-credits"
+msgstr "Ignacio Casal Quinteiro <nacho.resa@gmail.com>"
+
+#: ../src/empathy-accounts-dialog.c:389
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../src/empathy-accounts-dialog.c:399
+#: ../src/empathy-accounts-dialog.glade.h:4
+msgid "Accounts"
+msgstr "Contas"
+
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:862
+#, c-format
+msgid "New %s account"
+msgstr "Nova conta %s"
+
+#: ../src/empathy-accounts-dialog.c:972
+#, c-format
+msgid ""
+"You are about to remove your %s account!\n"
+"Are you sure you want to proceed?"
+msgstr ""
+"Vai a eliminar a súa conta %s!\n"
+"Está seguro de que quere proceder?"
+
+#: ../src/empathy-accounts-dialog.c:978
+msgid ""
+"Any associated conversations and chat rooms will NOT be removed if you "
+"decide to proceed.\n"
+"\n"
+"Should you decide to add the account back at a later time, they will still "
+"be available."
+msgstr ""
+"Calquer conversa ou sala de conversa asociada NON se eliminará se decide "
+"proceder.\n"
+"\n"
+"Debería decidir engadir a conta máis tarde, estarán aínda dispoñibles."
+
+#: ../src/empathy-accounts-dialog.glade.h:1
+msgid "<b>New Account</b>"
+msgstr "<b>Nova conta</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:2
+msgid "<b>No protocol installed</b>"
+msgstr "<b>Non hai protocolos instalados</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:3
+msgid "<b>Settings</b>"
+msgstr "<b>Axustes</b>"
+
+#: ../src/empathy-accounts-dialog.glade.h:5
+msgid "Cr_eate"
+msgstr "Cr_ear"
+
+#: ../src/empathy-accounts-dialog.glade.h:6
+msgid "I already have an account I want to use"
+msgstr "Xa teño unha conta que quero usar"
+
+#: ../src/empathy-accounts-dialog.glade.h:7
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Para engadir unha nova conta, primeiro debe instalar un \"backend\" para "
+"cada protocolo que queira usar."
+
+#: ../src/empathy-accounts-dialog.glade.h:8
+msgid "Type:"
+msgstr "Tipo:"
+
+#: ../src/empathy-call-window.c:142
+msgid "Closed"
+msgstr "Pechado"
+
+#: ../src/empathy-call-window.c:254
+msgid "End this call?"
+msgstr "Rematar esta chamada?"
+
+#: ../src/empathy-call-window.c:256
+msgid "Closing this window will end the call in progress."
+msgstr "Pechar esta ventá, rematará a chamada en progreso."
+
+#: ../src/empathy-call-window.c:257
+msgid "_End Call"
+msgstr "_Rematar chamada"
+
+#: ../src/empathy-call-window.c:311
+msgid "Incoming call"
+msgstr "Chamada entrante"
+
+#: ../src/empathy-call-window.c:313
+#, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "%s estalle chamando, quere responder?"
+
+#: ../src/empathy-call-window.c:319
+msgid "_Reject"
+msgstr "_Rexeitar"
+
+#: ../src/empathy-call-window.c:324
+msgid "_Answer"
+msgstr "Re_sposta"
+
+#: ../src/empathy-call-window.c:379
+msgid "Empathy Call"
+msgstr "Chamada de Empathy"
+
+#. To translators: Readying is the first state of the call, it is
+#. * preparing the connection and it does not yet ring.
+#: ../src/empathy-call-window.c:382
+msgid "Readying"
+msgstr "Preparándose"
+
+#: ../src/empathy-call-window.c:391
+#, c-format
+msgid "%s - Empathy Call"
+msgstr "Chamada de Empathy - %s"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:5
-msgid "Contact Infor_mation"
-msgstr "Infor_mación do contacto"
+#: ../src/empathy-call-window.c:395
+msgid "Ringing"
+msgstr "Soando"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:6
-msgid "Cu_t"
-msgstr "Cor_tar"
+#: ../src/empathy-call-window.c:408
+msgid "Connecting"
+msgstr "Conectando"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:7
-msgid "In_vite..."
-msgstr "In_vitar..."
+#: ../src/empathy-call-window.c:524
+#, c-format
+msgid "Incoming call from %s rejected because there is already a running call."
+msgstr "Chamada entrada de %s rexeitada porque xa hai unha chamada en curso."
+
+#: ../src/empathy-call-window.glade.h:1
+msgid "#"
+msgstr "#"
+
+#: ../src/empathy-call-window.glade.h:2
+msgid "*"
+msgstr "*"
+
+#: ../src/empathy-call-window.glade.h:3
+msgid "0"
+msgstr "0"
+
+#: ../src/empathy-call-window.glade.h:4
+msgid "1"
+msgstr "1"
+
+#: ../src/empathy-call-window.glade.h:5
+msgid "2"
+msgstr "2"
+
+#: ../src/empathy-call-window.glade.h:6
+msgid "3"
+msgstr "3"
+
+#: ../src/empathy-call-window.glade.h:7
+msgid "4"
+msgstr "4"
+
+#: ../src/empathy-call-window.glade.h:8
+msgid "5"
+msgstr "5"
+
+#: ../src/empathy-call-window.glade.h:9
+msgid "6"
+msgstr "6"
+
+#: ../src/empathy-call-window.glade.h:10
+msgid "7"
+msgstr "7"
+
+#: ../src/empathy-call-window.glade.h:11
+msgid "8"
+msgstr "8"
+
+#: ../src/empathy-call-window.glade.h:12
+msgid "9"
+msgstr "9"
+
+#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone
+#: ../src/empathy-call-window.glade.h:14
+msgid "<b>Keypad</b>"
+msgstr "<b>Teclado numérico</b>"
+
+#: ../src/empathy-call-window.glade.h:15
+msgid "<b>Volume</b>"
+msgstr "<b>Volume</b>"
+
+#: ../src/empathy-call-window.glade.h:16
+msgid "Hang Up"
+msgstr "Colgar"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:8
+#: ../src/empathy-call-window.glade.h:17
+msgid "Send Video"
+msgstr "Envía vídeo"
+
+#: ../src/empathy-chat-window.c:319
+#, c-format
+msgid "Conversations (%d)"
+msgstr "Conversas (%d)"
+
+#: ../src/empathy-chat-window.c:397
+msgid "Topic:"
+msgstr "Tema:"
+
+#: ../src/empathy-chat-window.c:400
+msgid "Typing a message."
+msgstr "Escribindo unha mensaxe."
+
+#: ../src/empathy-chat-window.glade.h:1
+msgid "C_lear"
+msgstr "_Limpar"
+
+#: ../src/empathy-chat-window.glade.h:3
 msgid "Insert _Smiley"
 msgstr "Inserir _emoticona"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:9
+#: ../src/empathy-chat-window.glade.h:4
 msgid "Invitation _message:"
 msgstr "_Mensaxe de invitación:"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:10
+#: ../src/empathy-chat-window.glade.h:5
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:11
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "Unirse a _novo..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:12
+#: ../src/empathy-chat-window.glade.h:6
 msgid "Move Tab _Left"
 msgstr "Mover separador á _esquerda"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:13
+#: ../src/empathy-chat-window.glade.h:7
 msgid "Move Tab _Right"
 msgstr "Mover separador á _dereita"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:14
+#: ../src/empathy-chat-window.glade.h:8
 msgid "Select who would you like to invite:"
 msgstr "Seleccione a quen quere invitar:"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:15
+#: ../src/empathy-chat-window.glade.h:9
 msgid "You have been invited to join a chat conference."
 msgstr "Invitáronlle a unirse a unha conferencia."
 
-#: ../libempathy-gtk/empathy-chat.glade.h:16
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-msgid "_Add Contact..."
-msgstr "_Engadir contacto..."
-
-#: ../libempathy-gtk/empathy-chat.glade.h:17
-msgid "_Add To Favorites"
-msgstr "_Engadir a favoritos"
+#: ../src/empathy-chat-window.glade.h:10
+msgid "_Contact"
+msgstr "_Contacto"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:18
-msgid "_Close"
-msgstr "_Pechar"
+#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+msgid "_Contents"
+msgstr "_Contidos"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:19
+#: ../src/empathy-chat-window.glade.h:12
 msgid "_Conversation"
 msgstr "_Conversa"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:20
-msgid "_Copy"
-msgstr "_Copiar"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:21
+#: ../src/empathy-chat-window.glade.h:13
 msgid "_Detach Tab"
 msgstr "_Desacoplar separador"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:22
-#: ../libempathy-gtk/empathy-contact-list-view.c:218
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-chat-window.glade.h:15 ../src/empathy-main-window.glade.h:12
+msgid "_Help"
+msgstr "A_xuda"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:23
+#: ../src/empathy-chat-window.glade.h:16
 msgid "_Next Tab"
 msgstr "Segui_nte separador"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:24
-msgid "_Paste"
-msgstr "_Pegar"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:25
+#: ../src/empathy-chat-window.glade.h:17
 msgid "_Previous Tab"
-msgstr "separador an_terior"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:26
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-msgid "_Room"
-msgstr "_Sala"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:27
-msgid "_Show Contacts"
-msgstr "_Mostrar contactos"
+msgstr "Separador an_terior"
 
-#: ../libempathy-gtk/empathy-chat.glade.h:28
+#: ../src/empathy-chat-window.glade.h:18
 msgid "_Tabs"
-msgstr "_separadors"
-
-#: ../libempathy-gtk/empathy-chat.glade.h:29
-#: ../libempathy-gtk/empathy-contact-list-view.c:234
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-msgid "_View Previous Conversations"
-msgstr "_Ver conversas anteriores"
-
-#: ../libempathy-gtk/empathy-chat-view.c:468
-msgid "_Copy Link Address"
-msgstr "_Copiar o enderezo da ligazón"
-
-#: ../libempathy-gtk/empathy-chat-view.c:476
-msgid "_Open Link"
-msgstr "_Abrir ligazón"
-
-#: ../libempathy-gtk/empathy-chat-view.c:754
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
-
-#: ../libempathy-gtk/empathy-chat-window.c:695
-#, c-format
-msgid "Conversations (%d)"
-msgstr "Conversas (%d)"
-
-#: ../libempathy-gtk/empathy-chat-window.c:1281
-msgid "Typing a message."
-msgstr "Escribindo unha mensaxe."
+msgstr "_Separadores"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Name"
 msgstr "Nome"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:280
 msgid "Room"
 msgstr "Sala"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.c:285
-msgid "Auto Connect"
+#: ../src/empathy-chatrooms-window.c:289
+msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
-#: ../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
-msgid "Account:"
-msgstr "Conta:"
-
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:2
+#: ../src/empathy-chatrooms-window.glade.h:2
 msgid "Edit Favorite Room"
 msgstr "Editar sala favorita"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:3
+#: ../src/empathy-chatrooms-window.glade.h:3
 msgid "Join room on start_up"
 msgstr "Unirse a unha sala ao _iniciar"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:4
+#: ../src/empathy-chatrooms-window.glade.h:4
 msgid "Join this chat room when Empathy starts and you are connected"
 msgstr "Unirse a esta sala cando se inicie Empathy e esté conectado"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.glade.h:5
 msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas favoritas"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:6
+#: ../src/empathy-chatrooms-window.glade.h:6
 msgid "N_ame:"
 msgstr "N_ome:"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:7
+#: ../src/empathy-chatrooms-window.glade.h:7
 msgid "S_erver:"
 msgstr "S_ervidor:"
 
-#: ../libempathy-gtk/empathy-chatrooms-window.glade.h:9
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:9
+#: ../src/empathy-chatrooms-window.glade.h:9
+#: ../src/empathy-new-chatroom-dialog.glade.h:9
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:176
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-msgid "Edit Contact Information"
-msgstr "Editar a información do contacto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:182
-msgid "Contact Information"
-msgstr "Información do contacto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:277
-msgid "I would like to add you to my contact list."
-msgstr "Gustaríame engadirte á miña lista de contactos."
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
-msgid "New Contact"
-msgstr "Novo contacto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
-msgid "Decide _Later"
-msgstr "Decidir _despois"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:198
-msgid "_Contact"
-msgstr "_Contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:202
-msgid "_Group"
-msgstr "_Grupo"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:206
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-msgid "_Chat"
-msgstr "_Conversa"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:206
-msgid "Chat with contact"
-msgstr "Conversar con contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:210
-msgid "Infor_mation"
-msgstr "Infor_mación"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:210
-msgid "View contact information"
-msgstr "Ver a información do contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:214
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:214
-msgid "Rename"
-msgstr "Renomear"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:218
-msgid "Edit the groups and name for this contact"
-msgstr "Editar grupos e nome para este contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:222
-msgid "_Remove"
-msgstr "_Eliminar"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:222
-msgid "Remove contact"
-msgstr "Eliminar contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:226
-msgid "_Invite to Chat Room"
-msgstr "_Invitar á sala de conversa"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:226
-msgid "Invite to a currently open chat room"
-msgstr "Invitar á sala de conversa aberta actualmente"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:230
-msgid "_Send File..."
-msgstr "_Enviar ficheiro..."
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:230
-msgid "Send a file"
-msgstr "Enviar un ficheiro"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:234
-msgid "View previous conversations with this contact"
-msgstr "Ver as conversas previas deste contacto"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:239
-msgid "_Call"
-msgstr "_Chamar"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:239
-msgid "Start a voice or video conversation with this contact"
-msgstr "Inicia unha conversa de voz ou vídeo con este contacto"
+#: ../src/empathy-event-manager.c:166
+#, c-format
+msgid ""
+"New message from %s:\n"
+"%s"
+msgstr ""
+"Mensaxe nova de %s:\n"
+"%s"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1423
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "Síntoo, non te quero na miña lista de contactos máis."
+#: ../src/empathy-event-manager.c:205
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Chamada entrante de %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:656
-msgid "Select"
-msgstr "Seleccionar"
+#: ../src/empathy-event-manager.c:238
+#, c-format
+msgid ""
+"%s is offering you an invitation, but you don't have the needed external "
+"application to handle it."
+msgstr ""
+"%s estalle ofrecendo unha invitación pero non ten a aplicación externa "
+"necesaria para manexala."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:666
-#: ../libempathy-gtk/empathy-main-window.c:607
-msgid "Group"
-msgstr "Grupo"
+#: ../src/empathy-event-manager.c:263
+msgid "Invitation Error"
+msgstr "Erro na invitación"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>Información de cliente</b>"
+#: ../src/empathy-event-manager.c:289
+#, c-format
+msgid ""
+"%s is offering you an invitation. An external application will be started to "
+"handle it."
+msgstr ""
+"%s estalle ofrecendo unha invitación. Iniciarase unha aplicación externa "
+"para manexala."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>Detalles do contacto</b>"
+#: ../src/empathy-event-manager.c:345
+#, c-format
+msgid "Subscription requested by %s"
+msgstr "Solicitude de subscrición de %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>Contacto</b>"
+#: ../src/empathy-event-manager.c:348
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Mensaxe: %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>Grupos</b>"
+#: ../src/empathy-main-window.c:466
+msgid "Show and edit accounts"
+msgstr "Mostrar e editar contas"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
-msgid "Alias:"
-msgstr "Alcume:"
+#: ../src/empathy-main-window.c:836
+msgid "Contact"
+msgstr "Contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
-msgid "Birthday:"
-msgstr "Cumpreanos:"
+#: ../src/empathy-main-window.c:1038
+msgid "_Edit account"
+msgstr "_Editar conta"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
-msgid "Client:"
-msgstr "Cliente:"
+#: ../src/empathy-main-window.c:1121
+msgid "No error specified"
+msgstr "Ningún erro especificado"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "Información do contacto"
+#: ../src/empathy-main-window.c:1124
+msgid "Network error"
+msgstr "Erro da rede"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
-msgid "Email:"
-msgstr "Correo-e:"
+#: ../src/empathy-main-window.c:1127
+msgid "Authentication failed"
+msgstr "Fallou a autenticación"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
-msgid "Fullname:"
-msgstr "Nome completo:"
+#: ../src/empathy-main-window.c:1130
+msgid "Encryption error"
+msgstr "Erro de cifrado"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:12
-msgid "Identifier:"
-msgstr "Identificador:"
+#: ../src/empathy-main-window.c:1133
+msgid "Name in use"
+msgstr "Nome en uso"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
-msgid "Information requested..."
-msgstr "Información solicitada..."
+#: ../src/empathy-main-window.c:1136
+msgid "Certificate not provided"
+msgstr "Non se proporcionou ningún certificado"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
-msgid "OS:"
-msgstr "SO:"
+#: ../src/empathy-main-window.c:1139
+msgid "Certificate untrusted"
+msgstr "Certificado non fiable"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
-msgid ""
-"Select the groups you want this contact to appear in, you can select more "
-"than one group or no groups."
-msgstr ""
-"Seleccione os grupos nos que quere que apareza este contacto, pode "
-"seleccionar máis de un ou ningún grupo."
+#: ../src/empathy-main-window.c:1142
+msgid "Certificate expired"
+msgstr "Certificado caducado"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
-msgid "Version:"
-msgstr "Versión:"
+#: ../src/empathy-main-window.c:1145
+msgid "Certificate not activated"
+msgstr "Certificado non activado"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
-msgid "Web site:"
-msgstr "Sitio web:"
+#: ../src/empathy-main-window.c:1148
+msgid "Certificate hostname mismatch"
+msgstr "O nome do host do certificado non coincide"
 
-#: ../libempathy-gtk/empathy-group-chat.c:253
-msgid "Enter the new topic you want to set for this room:"
-msgstr "Introduza o novo tema que quere establecer nesta sala:"
+#: ../src/empathy-main-window.c:1151
+msgid "Certificate fingerprint mismatch"
+msgstr "A pegada do certificado non coincide"
 
-#: ../libempathy-gtk/empathy-group-chat.c:366
-#, c-format
-msgid "%s has joined the room"
-msgstr "%s uniuse á sala"
+#: ../src/empathy-main-window.c:1154
+msgid "Certificate self-signed"
+msgstr "O certificado está asinado por si mesmo"
 
-#: ../libempathy-gtk/empathy-group-chat.c:369
-#, c-format
-msgid "%s has left the room"
-msgstr "%s deixou a sala"
+#: ../src/empathy-main-window.c:1157
+msgid "Certificate error"
+msgstr "Erro de certificado"
 
-#: ../libempathy-gtk/empathy-group-chat.c:449
-#, c-format
-msgid "Topic: %s"
-msgstr "Tema: %s"
+#: ../src/empathy-main-window.c:1160
+msgid "Unknown error"
+msgstr "Erro descoñecido"
 
-#: ../libempathy-gtk/empathy-group-chat.c:571
-#, c-format
-msgid "Topic set to: %s"
-msgstr "Tema establecido a: %s"
+#: ../src/empathy-main-window.glade.h:1
+msgid "Contact List"
+msgstr "Lista de contactos"
 
-#: ../libempathy-gtk/empathy-group-chat.c:573
-msgid "No topic defined"
-msgstr "Tema sen definir"
+#: ../src/empathy-main-window.glade.h:2
+msgid "Context"
+msgstr "Contexto"
 
-#: ../libempathy-gtk/empathy-group-chat.glade.h:1
-msgid "<b>Topic:</b>"
-msgstr "<b>Tema:</b>"
+#: ../src/empathy-main-window.glade.h:3
+msgid "Join _Favorites"
+msgstr "Unir a _favoritos"
 
-#: ../libempathy-gtk/empathy-group-chat.glade.h:2
-msgid "Group Chat"
-msgstr "Grupo de conversa"
+#: ../src/empathy-main-window.glade.h:4
+msgid "Join _New..."
+msgstr "Unirse a _novo..."
 
-#: ../libempathy-gtk/empathy-log-window.c:497
-msgid "Account"
-msgstr "Conta"
+#: ../src/empathy-main-window.glade.h:5
+msgid "Manage Favorites"
+msgstr "Xestionar favoritos"
 
-#: ../libempathy-gtk/empathy-log-window.c:504
-msgid "Conversation"
-msgstr "Conversa"
+#: ../src/empathy-main-window.glade.h:6
+msgid "Show _Offline Contacts"
+msgstr "Mostrar contactos _desconectados"
 
-#: ../libempathy-gtk/empathy-log-window.c:514
-msgid "Date"
-msgstr "Data"
+#: ../src/empathy-main-window.glade.h:7
+msgid "_Accounts"
+msgstr "_Contas"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:1
-msgid "Conversations"
-msgstr "Conversas"
+#: ../src/empathy-main-window.glade.h:8
+msgid "_Add Contact..."
+msgstr "_Engadir contacto..."
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
-msgid "Previous Conversations"
-msgstr "Conversas anteriores"
+#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+msgid "_New Conversation..."
+msgstr "_Nova conversa..."
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
-msgid "Search"
-msgstr "Buscar"
+#: ../src/empathy-main-window.glade.h:14
+msgid "_Personal Information"
+msgstr "Información _persoal"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:4
-msgid "_For:"
-msgstr "_Por:"
+#: ../src/empathy-main-window.glade.h:16
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.c:286
+#: ../src/empathy-new-chatroom-dialog.c:290
 msgid "Chat Rooms"
 msgstr "Salas de conversa"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:2
+#: ../src/empathy-new-chatroom-dialog.glade.h:2
 msgid "Browse:"
 msgstr "Examinar:"
 
-#: ../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."
+#: ../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 ""
 "Introduza o nome da sala á que se quere unir aquí ou prema nunha ou máis "
 "salas na lista."
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:4
+#: ../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"
@@ -998,122 +1658,56 @@ msgstr ""
 "Introduza o servidor que aloxa a sala ou déixeo baleiro se a sala está na "
 "conta do servidor actual"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:5
+#: ../src/empathy-new-chatroom-dialog.glade.h:5
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:6
+#: ../src/empathy-new-chatroom-dialog.glade.h:6
 msgid "Join New"
 msgstr "Unirse a nova"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:7
+#: ../src/empathy-new-chatroom-dialog.glade.h:7
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../libempathy-gtk/empathy-new-chatroom-dialog.glade.h:8
-msgid "This list represents all chat rooms hosted on the server you have entered."
+#: ../src/empathy-new-chatroom-dialog.glade.h:8
+msgid ""
+"This list represents all chat rooms hosted on the server you have entered."
 msgstr ""
 "Esta lista representa todas as salas de conversas que están no servidor no "
 "que entrou."
 
-#: ../libempathy-gtk/empathy-main-window.c:275
-msgid "Show and edit accounts"
-msgstr "Mostrar e editar contas"
-
-#: ../libempathy-gtk/empathy-main-window.c:628
-msgid "Contact"
-msgstr "Contacto"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-msgid "Context"
-msgstr "Contexto"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-msgid "Join _Favorites"
-msgstr "Unir a _favoritos"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-msgid "Manage Favorites"
-msgstr "Xestionar favoritos"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Mostrar contactos _desconectados"
-
-#: ../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 "_Sobre"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
-msgstr "_Contas"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-msgid "_Contents"
-msgstr "_Contidos"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
-msgstr "A_xuda"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
-msgstr "_Nova mensaxe..."
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr "_Saír"
-
-#: ../libempathy-gtk/empathy-preferences.c:243
+#: ../src/empathy-preferences.c:264
 msgid "Language"
 msgstr "Lingua"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:1
+#: ../src/empathy-preferences.glade.h:1
 msgid "<b>Appearance</b>"
 msgstr "<b>Aparencia</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:2
+#. To translators: Audio notifications preferences
+#: ../src/empathy-preferences.glade.h:3
 msgid "<b>Audio</b>"
 msgstr "<b>Son</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:3
+#: ../src/empathy-preferences.glade.h:4
 msgid "<b>Behaviour</b>"
 msgstr "<b>Comportamento</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:4
+#: ../src/empathy-preferences.glade.h:5
 msgid "<b>Contact List</b>"
 msgstr "<b>Lista de contactos</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:5
+#: ../src/empathy-preferences.glade.h:6
 msgid "<b>Enable spell checking for languages:</b>"
 msgstr "<b>Activar corrección ortográfica para as linguas:</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:6
-msgid "<b>Options</b>"
-msgstr "<b>Opcións</b>"
-
-#: ../libempathy-gtk/empathy-preferences.glade.h:7
+#. To translators: Visual notifications preferences, like notify bubbles, etc.
+#: ../src/empathy-preferences.glade.h:8
 msgid "<b>Visual</b>"
 msgstr "<b>Visual</b>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:8
+#: ../src/empathy-preferences.glade.h:9
 msgid ""
 "<small>The list of languages reflects only the languages for which you have "
 "a dictionary installed.</small>"
@@ -1121,211 +1715,261 @@ msgstr ""
 "<small>A lista de linguas reflexa só as linguas para as cales ten instalado "
 "un dicionario.</small>"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.glade.h:10
+msgid "Automatically _connect on startup "
+msgstr "_Conectar automaticamente ao inicio"
+
+#: ../src/empathy-preferences.glade.h:11
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr ""
 "Os avatares son imaxes escollidas polo usuario que se mostran na lista de "
 "contactos"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:10
+#: ../src/empathy-preferences.glade.h:12
 msgid "Chat Th_eme:"
 msgstr "T_ema da conversa:"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.glade.h:13
 msgid "Display notifications when contacts come _online"
 msgstr "Mostrar notificacións cando se _conecten os contactos"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.glade.h:14
 msgid "Enable sounds when _away"
 msgstr "Activar sons cando está _ausente"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.glade.h:15
 msgid "Enable sounds when _busy"
 msgstr "Activar sons cando está _ocupado"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:14
+#: ../src/empathy-preferences.glade.h:16
 msgid "General"
 msgstr "Xeral"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.glade.h:17
 msgid "Notifications"
 msgstr "Notificacións"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:16
+#: ../src/empathy-preferences.glade.h:18
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.glade.h:19
 msgid "Show _avatars"
 msgstr "Mostrar _avatares"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:18
+#: ../src/empathy-preferences.glade.h:20
 msgid "Show _smileys as images"
 msgstr "Mostrar _emoticonas como imaxes"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:19
+#: ../src/empathy-preferences.glade.h:21
 msgid "Show co_mpact contact list"
 msgstr "Mostrar lista de contactos co_mpacta"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:20
+#: ../src/empathy-preferences.glade.h:22
 msgid "Sort by _name"
 msgstr "Ordenar por _nome"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.glade.h:23
 msgid "Sort by s_tate"
 msgstr "Ordenar por e_stado"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.glade.h:24
 msgid "Spell Checking"
 msgstr "Comprobación ortográfica"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.glade.h:25
 msgid "Themes"
 msgstr "Temas"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:24
+#: ../src/empathy-preferences.glade.h:26
 msgid "_Open new chats in separate windows"
 msgstr "_Abrir as conversas novas en ventás separadas"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.glade.h:27
 msgid "_Play sound when messages arrive"
 msgstr "_Reproducir son cando cheguen mensaxes"
 
-#: ../libempathy-gtk/empathy-preferences.glade.h:26
-msgid "_Use for chat rooms"
-msgstr "_Usar para salas de conversa"
+#: ../src/empathy-status-icon.glade.h:1
+msgid "Status"
+msgstr "Estado"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:691
-msgid "Custom messages..."
-msgstr "Mensaxes personalizadas..."
+#: ../src/empathy-status-icon.glade.h:3
+msgid "_Quit"
+msgstr "_Saír"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "Mensaxe personalizada"
+#: ../src/empathy-status-icon.glade.h:4
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contactos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "Mensaxe:"
+#~ msgid "Configure Telepathy account settings"
+#~ msgstr "Configurar os axustes da conta de Telephaty"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "Gardar mensaxe"
+#~ msgid "Empathy accounts"
+#~ msgstr "Contas de Empathy"
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "Estado:"
+#~ 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."
+#~ msgstr ""
+#~ "Para engadir unha nova conta, pode premer no botón 'Engadir' e crearase "
+#~ "unha nova entrada para que a configure."
 
-#: ../libempathy-gtk/empathy-private-chat.c:188
-#, c-format
-msgid "%s went offline"
-msgstr "%s desconectouse"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Se non quere engadir unha conta, simplemente prema na conta que quere "
+#~ "configurar na lista da esquerda."
 
-#: ../libempathy-gtk/empathy-private-chat.c:202
-#, c-format
-msgid "%s has come online"
-msgstr "%s conectouse"
+#~ msgid "<b>No Accounts Configured</b>"
+#~ msgstr "<b>Non hai ningunha conta configurada</b>"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:85
-msgid "Word"
-msgstr "Palabra"
+#~ msgid "J_apan server:"
+#~ msgstr "Servidor X_aponés:"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:258
-msgid "Suggestions for the word"
-msgstr "Suxestións para a palabra"
+#~ msgid "Invalid handle"
+#~ msgstr "Manexador inválido"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "Comprobador ortográfico"
+#~ msgid "No matching connection"
+#~ msgstr "Non hai unha conexión coincidinte"
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "Suxestións para a palabra:"
+#~ msgid "Invalid account"
+#~ msgstr "Conta inválida"
 
-#: ../libempathy-gtk/empathy-status-icon.c:310
-#, c-format
-msgid ""
-"New message from %s:\n"
-"%s"
-msgstr ""
-"Mensaxe nova de %s:\n"
-"%s"
+#~ msgid "Presence failure"
+#~ msgstr "Fallo de presencia"
 
-#: ../libempathy-gtk/empathy-status-icon.c:579
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "Solicitude de subscrición de %s"
+#~ msgid "Contact does not support voice"
+#~ msgstr "O contacto non soporta voz"
 
-#: ../libempathy-gtk/empathy-status-icon.c:582
-#, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"Mensaxe: %s"
+#~ msgid "Lowmem"
+#~ msgstr "Memoria baixa"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
-msgstr "Estado"
+#~ msgid "Channel request generic error"
+#~ msgstr "Erro xenérico na petición do canal"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contactos"
+#~ msgid "Channel banned"
+#~ msgstr "Expulsado do canal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:87
-msgid "Classic"
-msgstr "Clásico"
+#~ msgid "Channel full"
+#~ msgstr "Canal cheo"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:88
-msgid "Simple"
-msgstr "Sinxela"
+#~ msgid "Channel invite only"
+#~ msgstr "O canal é só de invitación"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:89
-msgid "Clean"
-msgstr "Limpar"
+#~ msgid "Unknown error code"
+#~ msgstr "Erro de código descoñecido"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:90
-msgid "Blue"
-msgstr "Azul"
+#~ msgid ""
+#~ "To add a new account, you can click on the 'Add' button and a new entry "
+#~ "will be created for you to started configuring.\n"
+#~ "\n"
+#~ "If you do not want to add an account, simply click on the account you "
+#~ "want to configure in the list on the left."
+#~ msgstr ""
+#~ "Para engadir unha nova conta, pode premer no botón 'Engadir' e crearase "
+#~ "unha nova entrada para que a configure.\n"
+#~ "\n"
+#~ "Se non quere engadir unha conta, simplemente prema na conta que quere "
+#~ "configurar na lista da esquerda."
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid "The contact to display in the applet. Empty means no contact is displayed."
-msgstr ""
-"O contacto a mostrar na applet. Se se deixa baleiro non se mostrará ningún "
-"contacto."
+#~ msgid ""
+#~ "%s offered you an invitation, but you don't have the needed external "
+#~ "application to handle it."
+#~ msgstr ""
+#~ "%s ofreceulle unha invitación pero non ten a aplicación externa necesaria "
+#~ "para manexala."
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "O avatar do contacto. Se se deixa baleiro non se mostrará ningún avatar."
+#~ msgid "jabber account settings"
+#~ msgstr "axustes da conta jabber"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megáfono"
+#~ msgid "msn account settings"
+#~ msgstr "axustes da conta msn"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:419
-msgid "Talk!"
-msgstr "Falar!"
+#~ msgid "Input"
+#~ msgstr "Entrada"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "_Información"
+#~ msgid "Mute"
+#~ msgstr "Silenciar"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Presencia"
+#~ msgid "Output"
+#~ msgstr "Saída"
 
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:89
-msgid "Set your own presence"
-msgstr "Establecer a súa presencia"
+#~ msgid "Volume"
+#~ msgstr "Volume"
 
-#: ../src/empathy.c:272
-msgid "Don't connect on startup"
-msgstr "Non contectar ao iniciar"
+#~ msgid "Ca_ll"
+#~ msgstr "C_hamar"
 
-#: ../src/empathy.c:283
-msgid "- Empathy Instant Messenger"
-msgstr "- Mensaxería instantánea de Empathy"
+#~ msgid "Change _Topic..."
+#~ msgstr "Cambiar _tema..."
+
+#~ msgid "Contact Infor_mation"
+#~ msgstr "Infor_mación do contacto"
+
+#~ msgid "Cu_t"
+#~ msgstr "Cor_tar"
+
+#~ msgid "In_vite..."
+#~ msgstr "In_vitar..."
+
+#~ msgid "_Add To Favorites"
+#~ msgstr "_Engadir a favoritos"
+
+#~ msgid "_Copy"
+#~ msgstr "_Copiar"
+
+#~ msgid "_Paste"
+#~ msgstr "_Pegar"
+
+#~ msgid "_Show Contacts"
+#~ msgstr "_Mostrar contactos"
+
+#~ msgid "Chat with contact"
+#~ msgstr "Conversar con contacto"
+
+#~ msgid "View contact information"
+#~ msgstr "Ver a información do contacto"
+
+#~ msgid "Re_name"
+#~ msgstr "Re_nomear"
+
+#~ msgid "Edit the groups and name for this contact"
+#~ msgstr "Editar grupos e nome para este contacto"
+
+#~ msgid "_Invite to Chat Room"
+#~ msgstr "_Invitar á sala de conversa"
+
+#~ msgid "Invite to a currently open chat room"
+#~ msgstr "Invitar á sala de conversa aberta actualmente"
+
+#~ msgid "_Send File..."
+#~ msgstr "_Enviar ficheiro..."
+
+#~ msgid "Send a file"
+#~ msgstr "Enviar un ficheiro"
+
+#~ msgid "View previous conversations with this contact"
+#~ msgstr "Ver as conversas previas deste contacto"
+
+#~ msgid "Start a voice or video conversation with this contact"
+#~ msgstr "Inicia unha conversa de voz ou vídeo con este contacto"
+
+#~ msgid "Enter the new topic you want to set for this room:"
+#~ msgstr "Introduza o novo tema que quere establecer nesta sala:"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>Opcións</b>"
+
+#~ msgid "_Use for chat rooms"
+#~ msgstr "_Usar para salas de conversa"
+
+#~ msgid "%s went offline"
+#~ msgstr "%s desconectouse"
 
+#~ msgid "%s has come online"
+#~ msgstr "%s conectouse"