Fixed headers in galician translation file

[empathy.git] / po / gl.po

diff --git a/po/gl.po b/po/gl.po
index fcfb96713ea28cd2c83dd68a50502bb6ebc6bb0a..ec34723fa05a5a9bece916dd3b3999ae5f65bb87 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,616 +1,746 @@
-# translation of empathy.master.po to Galician
+# translation of empathy to Galego
 # This file is distributed under the same license as the EMPATHY package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Copyright (C) 2010 Fran Diéguez.
 #
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
-# Suso Baleato <suso.baleato@xunta.es>, 2009.
-# Fran Diéguez <fran.dieguez@glug.es>,2009.
 # Antón Méixome <meixome@mancomun.org>, 2009.
+# Fran Dieguez <fran.dieguez@glug.es>, 2009.
+# Antón Méixome <meixome@certima.net>, 2010.
+# Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
+# Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-20 14:42+0200\n"
-"PO-Revision-Date: 2009-08-20 12:03+0200\n"
-"Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
-"Language-Team: Galician <gnome@mancomun.org>\n"
+"Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
+"Report-Msgid-Bugs-To: gnome-gl-list@gnome.org\n"
+"POT-Creation-Date: 2010-07-18 18:10+0200\n"
+"PO-Revision-Date: 2010-07-18 18:13+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
+"Language-Team: Galician <gnome-gl-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr "Cliente de mensaxaría Empathy"
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr ""
+"Converse usando Google Talk, Facebook, MSN e moitos máis servizos de conversa"
 
-# rever
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive messages"
-msgstr "Envíe e reciba mensaxes"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Mensaxaría na Internet Empathy"
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "Cliente de MI"
 
 # rever
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
 
 # rever
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"O carácter para engadir despois do alcume cando se use o completamento do "
+"O carácter para engadir despois do alcume cando se use o completado de "
 "alcume (tabulador) nunha conversa de grupo."
 
 # rever
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "Tema da xanela de conversa"
 
 # rever
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Unha lista separada por vírgulas dos verificadores ortográficos para usar "
-"(por exemplo, gl, pt, en)."
+"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p."
+"ex., «gl, pt, en»)."
 
 # rever
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "Lista de contactos compacta"
 
 # rever
-#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Connection managers should be used"
+msgstr "Se se deberían usar xestores de conexión"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación da lista de contactos"
 
 # rever
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
-msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
+msgstr "O cartafol predefinido desde o que seleccionar unha imaxe de avatar"
 
 # rever
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "Desactivar os sons cando se está ausente"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "Mostrar os eventos de entrada na área de estado"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false present them right away "
+"to the user."
+msgstr ""
+"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
+"directamente ao usuario."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
-msgstr "Empathy pode usar a rede para seguir a localización"
+msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
-msgstr "Cartafol de descargas predeterminado do Empathy"
+msgstr "Cartafol de descargas predefinido do Empathy"
 
 # rever
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy has asked about importing accounts"
 msgstr "O Empathy preguntou sobre a importación de contas"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy migrou os seus rexistros de butterfly"
+
 # rever
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should auto-connect on startup"
 msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
 # rever
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 # rever
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide main window"
 msgstr "Ocultar a xanela principal"
 
 # rever
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Hide the main window."
 msgstr "Ocultar a xanela principal."
 
 # rever
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "Se se debería usar o NetworkManager"
-
-# rever
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Open new chats in separate windows"
-msgstr "Abrir as conversas novas en xanelas separadas"
+msgstr "Abrir as novas conversas en xanelas separadas"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use"
-msgstr "Camiño do tema adium para usar"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Path of the Adium theme to use"
+msgstr "Camiño do tema de Adium para usar"
 
 # rever
-#: ../data/empathy.schemas.in.h:28
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "Camiño do tema adium para usar se o tema usado para o chat é adium."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Camiño do tema de Adium para usar se o tema usado para o chat é de Adium."
 
 # rever
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for incoming messages"
 msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound for outgoing messages"
 msgstr "Reproducir un son para as mensaxes saíntes"
 
 # rever
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs in"
 msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un son cando un contacto termina a sesión"
+msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log in"
 msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando terminamos a sesión"
+msgstr "Reproducir un son cando saímos da sesión"
 
 # rever
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Pop up notifications when a contact logs in"
 msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Pop up notifications when a contact logs out"
 msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
-#: ../data/empathy.schemas.in.h:39
-msgid "Salut account is created"
-msgstr "A conta Salut foi creada"
-
-# rever
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show avatars"
 msgstr "Mostrar os avatares"
 
 # rever
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show contact list in rooms"
 msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show offline contacts"
 msgstr "Mostrar os contactos desconectados"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Show protocols"
+msgstr "Mostrar os protocolos"
+
 # rever
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Spell checking languages"
-msgstr "Idiomas para a verificación ortográfica"
+msgstr "Idiomas para a corrección ortográfica"
 
 # rever
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The default folder to save file transfers in."
-msgstr ""
-"O cartafol predeterminado en que gardar as transferencias de ficheiros."
+msgstr "O cartafol predefinido en que gardar as transferencias de ficheiros."
 
 # rever
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The last directory that an avatar image was chosen from."
-msgstr "O último cartafol do que foi escollida unha imaxe de avatar."
+msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "A posición do panel lateral da xanela de conversa"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
 # rever
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
-#: ../data/empathy.schemas.in.h:51
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
-"deberían ser activadas."
-
 # rever
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
 "contactos."
 
 # rever
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Indica se o Empathy pode usar ou non o GPS para seguir a localización."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr ""
+"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
-#: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Indica se o Empathy pode ou non usar a rede de telefonía móbil para seguir a "
-"localización."
+"Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
+"a localización."
 
 # rever
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
-"Indica se o Empathy debería ou non usar a rede para seguir a localización."
+"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
 # rever
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr ""
 "Indica se o Empathy preguntou sobre a importación de contas doutros "
 "programas ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Indica se Empathy migrou os seus rexistros de butterfly."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Indica se o Empathy debería iniciar unha sesión nas súas contas "
-"automaticamente ao inicio ou non."
+"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
+"ao inicio ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr ""
+"Indica se o Empathy debería iniciar pórse no estado de ausente se o usuario "
+"está inactivo."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se o Empathy debería ou non reducir a precisión de localización por "
 "motivos de privacidade."
 
 # rever
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se o Empathy debería usar o avatar dos contactos como a icona da "
 "xanela da conversa ou non."
 
-# rever
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Indica se a conta Salut debería ser creada na primeira execución do Empathy "
-"ou non."
+"Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
+"deberían ser activadas."
 
 # rever
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Indica se o Network Manager debería usarse para conectarse ou desconectarse "
-"automaticamente ou non."
+"Indica se deberían usarse xestores de conectividade para conectarse ou "
+"desconectarse automaticamente ou non."
 
 # rever
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica se se deberían verificar ou non as palabras escritas no idioma co que "
 "as quere verificar."
 
 # rever
-#: ../data/empathy.schemas.in.h:63
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
-"Indica see converter ou non as emoticonas en imaxes gráficas nas conversas."
+"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se reproducir ou non un son para notificar que os contactos inician "
 "unha sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica se reproducir ou non un son para notificar que os contactos terminan "
 "unha sesión na rede."
 
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether to play a sound to notify of events."
 msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
-#: ../data/empathy.schemas.in.h:67
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr ""
 "Indica se reproducir ou non un son para notificar as mensaxes entrantes."
 
 # rever
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
 
 # rever
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for outgoing messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to play a sound when logging into a network."
 msgstr ""
 "Indica se reproducir ou non un son cando se inicia unha sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound when logging off a network."
-msgstr ""
-"Indica se reproducir ou non un son cando se termina unha sesión na rede."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
 
 # rever
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se reproducir ou non un son para notificar cando se está ocupado ou "
 "ausente."
 
 # rever
-#: ../data/empathy.schemas.in.h:73
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova."
 
 # rever
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
 "das xanelas de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se mostrar ou non os contactos que están desconectados na lista de "
 "contactos."
 
 # rever
-#: ../data/empathy.schemas.in.h:79
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
 "ou ocupado."
 
 # rever
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show the contact list in chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Indica se mostrar ou non os protocolos para os contacto na lista de "
+"contactos."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica se mostrar ou non a lista de contactos nas salas de chat."
 
 # rever
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to show the contact list in compact mode."
+msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
 "Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
 "principal co botón 'x' da barra de título."
 
 # rever
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
-
-# rever
-#: ../data/empathy.schemas.in.h:83
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 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 "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
-"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
-"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado"
-"\"  ordenará a lista de contactos por estado."
-
-#: ../libempathy/empathy-ft-handler.c:838
+"Que criterio usará ao ordenar a lista de contactos. O predefinido é usar a "
+"ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
+"ordenará a lista de contactos por estado."
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
+#: ../src/cc-empathy-accounts-panel.c:91
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e VoIP"
+
+#: ../libempathy/empathy-ft-handler.c:843
 msgid "The hash of the received file and the sent one do not match"
-msgstr "O hash do ficheiro recibido e o enviado non coinciden"
+msgstr "O hash do ficheiro recibido e o do enviado non coinciden"
 
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1103
 msgid "File transfer not supported by remote contact"
 msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1161
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1170
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
-# rever
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
-msgid "People nearby"
-msgstr "Persoas próximas"
-
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:281
 msgid "Socket type not supported"
-msgstr "O tipo de sócket non é compatíbel"
+msgstr "O tipo de socket non é compatíbel"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:400
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:403
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:406
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:409
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:412
 msgid "Error while trying to transfer the file"
-msgstr "Erro ao tentar transferir o ficheiro"
+msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:415
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:238
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:240
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:243
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:272
-msgid "Hidden"
-msgstr "Oculto"
+#: ../libempathy/empathy-utils.c:245
+msgid "Invisible"
+msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:247
 msgid "Offline"
 msgstr "Desconectado"
 
+#: ../libempathy/empathy-utils.c:249 ../src/empathy-call-window.c:1763
+#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
+#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+msgid "Unknown"
+msgstr "Descoñecido"
+
+# rever
+#: ../libempathy/empathy-utils.c:287
+msgid "No reason specified"
+msgstr "Non se especificou un motivo"
+
+#: ../libempathy/empathy-utils.c:289
+msgid "Status is set to offline"
+msgstr "O estado está definido a desconectado"
+
+# rever
+#: ../libempathy/empathy-utils.c:291
+msgid "Network error"
+msgstr "Erro de rede"
+
+#: ../libempathy/empathy-utils.c:293
+msgid "Authentication failed"
+msgstr "Fallou a autenticación"
+
+# rever
+#: ../libempathy/empathy-utils.c:295
+msgid "Encryption error"
+msgstr "Erro de cifrado"
+
+# rever
+#: ../libempathy/empathy-utils.c:297
+msgid "Name in use"
+msgstr "Nome en uso"
+
+# rever
+#: ../libempathy/empathy-utils.c:299
+msgid "Certificate not provided"
+msgstr "Non se proporcionou o certificado"
+
+#: ../libempathy/empathy-utils.c:301
+msgid "Certificate untrusted"
+msgstr "Certificado non fiábel"
+
+# rever
+#: ../libempathy/empathy-utils.c:303
+msgid "Certificate expired"
+msgstr "O certificado caducou"
+
+# rever
+#: ../libempathy/empathy-utils.c:305
+msgid "Certificate not activated"
+msgstr "O certificado non está activado"
+
+# rever
+#: ../libempathy/empathy-utils.c:307
+msgid "Certificate hostname mismatch"
+msgstr "O nome do host do certificado non coincide"
+
+# rever
+#: ../libempathy/empathy-utils.c:309
+msgid "Certificate fingerprint mismatch"
+msgstr "A impresión dixital do certificado non coincide"
+
+# rever
+#: ../libempathy/empathy-utils.c:311
+msgid "Certificate self-signed"
+msgstr "Certificado autoasinado"
+
+# rever
+#: ../libempathy/empathy-utils.c:313
+msgid "Certificate error"
+msgstr "Erro de certificado"
+
+# rever
+#: ../libempathy/empathy-utils.c:430
+msgid "People Nearby"
+msgstr "Persoas próximas"
+
+# rever
+#: ../libempathy/empathy-utils.c:435
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japan"
+
+#: ../libempathy/empathy-utils.c:436
+msgid "Facebook Chat"
+msgstr "Chat de Facebook"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -657,86 +787,207 @@ msgstr[1] "Hai %d meses"
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
-msgstr "Todo"
+msgstr "Todas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
+#: ../libempathy-gtk/empathy-account-widget.c:1136
+msgid "Username:"
+msgstr "Nome de _usuario:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1479
+msgid "L_og in"
+msgstr "Iniciar sesi_ón"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1547
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "Conta:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1558
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1623
+msgid "This account already exists on the server"
+msgstr "Esta conta xa existe no servidor"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1626
+msgid "Create a new account on the server"
+msgstr "Crear unha nova conta no servidor"
+
+# rever
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:1995
+#, c-format
+msgid "%1$s on %2$s"
+msgstr "%1$s sobre %2$s"
+
+#. To translators: The parameter is the protocol name. The resulting
+#. * string will be something like: "Jabber Account"
+#: ../libempathy-gtk/empathy-account-widget.c:2021
+#, c-format
+msgid "%s Account"
+msgstr "Conta %s"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget.c:2025
+msgid "New account"
+msgstr "Conta nova"
+
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "Con_trasinal:"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
 msgstr "_Nome en pantalla:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr "Cal e o seu contrasinal para AIM?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr "Cal é o seu nome en patalla para AIM?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "_Servidor:"
 
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<b>Example:</b> username"
+msgstr "<b>Exemplo:</b> nomeusuario"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "I_D de sesión:"
 
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "Cal é o seu ID de usuario en GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "Cal é o seu contrasinal en GroupWise?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Exemplo:</b> 123456789"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
 msgstr "_UIN ICQ:"
 
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr "Cal é o seu UIN para ICQ?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr "Cal é o seu contrasinal pra ICQ?"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "_Charset:"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Character set:"
 msgstr "_Codificación de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "Rede nova"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "Auto"
+msgstr "Auto"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+msgid "Register"
+msgstr "Rexistrar"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+msgid "Options"
+msgstr "Opcións"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+msgid "None"
+msgstr "Ningún"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
 msgstr "Codificación de caracteres:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -768,200 +1019,403 @@ msgstr "Nome real:"
 msgid "Servers"
 msgstr "Servidores"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Examplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exemplo:</b> user@jabber.org"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
 msgstr "Ignorar as configuracións do servidor"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "Pri_oridade:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "Rec_urso:"
 
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+"Este é o seu nome de usuario, non os datos de acceso de Facebook normais.\n"
+"Se vostede é facebook.com/<b>marca</b>, insira <b>marca</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">esta páxina</a> para "
+"seleccioar o nome de usuario de Facebook se non ten ningún."
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
 msgstr "Usar o SS_L antigo"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook password?"
+msgstr "Cal é o seu contrasinal para Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "What is your Facebook username?"
+msgstr "Cal é o seu nome de usuario para Facebook?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "What is your Google ID?"
+msgstr "Cal é o seu ID de Google?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "What is your Google password?"
+msgstr "Cal é o seu contrasinal de Google?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Jabber ID?"
+msgstr "Cal é o seu identificador de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Jabber password?"
+msgstr "Cal é o seu contrasinal de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your desired Jabber ID?"
+msgstr "Cal é o ID de Jabber que desexa?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your desired Jabber password?"
+msgstr "Cal é o contrasinal de Jabber que desexa?"
+
 # rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "_Encryption required (TLS/SSL)"
 msgstr "Requírese un c_ifrado (TLS/SSL)"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "_Ignore SSL certificate errors"
-msgstr "_Ignorar os erros de certificado SSL"
+msgstr "_Ignorar os erros do certificado SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Exemplo:</b> usuario@hotmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live ID?"
+msgstr "Cal é o seu contrasinal para Windows Live?"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live password?"
+msgstr "Cal é o seu contrasinal para Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
-msgid "_Email:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_E-mail address:"
 msgstr "Correo _electrónico:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nome:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
-msgstr "ID do _Jabber:"
+msgstr "ID para _Jabber:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
 msgstr "_Apelidos:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
 msgstr "Al_cume:"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "Nome _publicado:"
 
-# rever
-#. 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.ui.h:1
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Exemplo:</b> usuaruio@meu.servidor.sip"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Discover STUN"
-msgstr "Descubrir STUN"
+msgid "Authentication username:"
+msgstr "Nome de usuario para a autenticación:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
+msgstr "Descubrir ligazón"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir o servidor STUN automaticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN port:"
-msgstr "Porto STUN:"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "_Username:"
-msgstr "Nome de _usuario:"
+msgid "Keep-Alive Options"
+msgstr "Opcións de Keep-Alive"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Use _Yahoo Japan"
-msgstr "Usar o _Yahoo Japan"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Loose Routing"
+msgstr "Enrutado aberto"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Yahoo I_D:"
-msgstr "I_D do Yahoo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Mechanism:"
+msgstr "Mecanismo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr "Opcións varias"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr "Opcións do NAT transversal"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Port:"
+msgstr "Porto:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr "Opcións do proxy"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "What is your SIP account password?"
+msgstr "Cal é o contrasinal da súa conta SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "What is your SIP login ID?"
+msgstr "Cal é o seu ID de inicio de sesión SIP?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "_Username:"
+msgstr "Nome de _usuario:"
 
 # rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+msgid "Use _Yahoo! Japan"
+msgstr "Usar o _Yahoo Japan"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr "Cal é o seu ID para Yahoo!?"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Ignore conference and chatroom invitations"
+msgid "What is your Yahoo! password?"
+msgstr "Cal é o seu contrasinal para Yahoo!?"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "_Ignore conference and chat room invitations"
 msgstr "_Ignorar os convites para conferencias e salas de conversa"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "Configuración da lista de _salas:"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
-msgstr "Non se puido converter a imaxe"
+msgstr "Non foi posíbel converter a imaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+msgid "None of the accepted image formats are supported on your system"
 msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
-msgstr "Seleccione a imaxe de avatar para si"
+msgstr "Seleccione a súa imaxe de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "Sen imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:325
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "Ocorreu un fallo ao reconectar á conversa"
+#: ../libempathy-gtk/empathy-chat.c:645
+msgid "Failed to open private chat"
+msgstr "Produciuse un fallo ao abrir un chat privado"
+
+#: ../libempathy-gtk/empathy-chat.c:685
+msgid "Topic not supported on this conversation"
+msgstr "Ese asunto non se admite nesta conversación"
+
+#: ../libempathy-gtk/empathy-chat.c:691
+msgid "You are not allowed to change the topic"
+msgstr "Non se lle permite cambiar o asunto"
+
+#: ../libempathy-gtk/empathy-chat.c:825
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear, limpa todas as mensaxes da conversa actual"
+
+#: ../libempathy-gtk/empathy-chat.c:828
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>, estabelece o asunto da conversa actual"
+
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:412
-msgid "Unsupported command"
-msgstr "Orde non compatíbel"
+#: ../libempathy-gtk/empathy-chat.c:834
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:839
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact id> [<message>], abre unha conversa privada"
+
+#: ../libempathy-gtk/empathy-chat.c:842
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact id> <message>, abre unha conversa privada"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
+
+#: ../libempathy-gtk/empathy-chat.c:849
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
+
+#: ../libempathy-gtk/empathy-chat.c:852
+msgid ""
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+msgstr ""
+"/say <message>, enviar <message> á conversa actual. Isto úsase para enviar "
+"unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
+"unirse a unha nova sala de conversa\""
+
+#: ../libempathy-gtk/empathy-chat.c:857
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
+"definida, mostra o seu uso."
+
+#: ../libempathy-gtk/empathy-chat.c:867
+#, c-format
+msgid "Usage: %s"
+msgstr "Uso: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:896
+msgid "Unknown command"
+msgstr "Orde descoñecida"
+
+#: ../libempathy-gtk/empathy-chat.c:1017
+msgid "Unknown command; see /help for the available commands"
+msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
+
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "invalid contact"
-msgstr "contacto non válido"
+msgstr "contacto incorrecto"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:560
+#: ../libempathy-gtk/empathy-chat.c:1167
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:563
+#: ../libempathy-gtk/empathy-chat.c:1170
 msgid "unknown"
 msgstr "descoñecido"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:567
+#: ../libempathy-gtk/empathy-chat.c:1174
 #, c-format
 msgid "Error sending message '%s': %s"
-msgstr "Erro ao enviar a mensaxe '%s': %s"
+msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:597
+#: ../libempathy-gtk/empathy-chat.c:1296
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:599
+#: ../libempathy-gtk/empathy-chat.c:1298
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:1777
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1831
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1041
-#: ../libempathy-gtk/empathy-ui-utils.c:1483
+#: ../libempathy-gtk/empathy-chat.c:1849
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1883
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
+#: ../libempathy-gtk/empathy-chat.c:1960
+msgid "Failed to retrieve recent logs"
+msgstr "Produciuse un fallo ao obter os rexistros recentes"
+
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:2066
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -969,12 +1423,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:2073
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:2076
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -982,17 +1436,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1208
+#: ../libempathy-gtk/empathy-chat.c:2084
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:1211
+#: ../libempathy-gtk/empathy-chat.c:2087
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:1215
+#: ../libempathy-gtk/empathy-chat.c:2091
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1002,62 +1456,78 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1224
+#: ../libempathy-gtk/empathy-chat.c:2100
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1247
+#: ../libempathy-gtk/empathy-chat.c:2125
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:1380 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:2150
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s agora é coñecido como %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1815
+#: ../libempathy-gtk/empathy-chat.c:2927
+msgid "Wrong password; please try again:"
+msgstr "O contrasinal é incorrecto, ténteo de novo:"
+
+#: ../libempathy-gtk/empathy-chat.c:2928
+msgid "Retry"
+msgstr "Reintentar"
+
+#: ../libempathy-gtk/empathy-chat.c:2933
+msgid "This room is protected by a password:"
+msgstr "Esta sala está protexida por un contrasinal:"
+
+#: ../libempathy-gtk/empathy-chat.c:2934
+msgid "Join"
+msgstr "Unirse"
+
+#: ../libempathy-gtk/empathy-chat.c:3074
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1865
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-log-window.c:639
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
-msgid "Topic:"
-msgstr "Asunto:"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:785
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:792
 msgid "_Open Link"
-msgstr "_Abrir ligazón"
+msgstr "_Abrir a ligazón"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
 msgid "Edit Contact Information"
 msgstr "Editar a información de contacto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
 msgid "New Contact"
 msgstr "Contacto novo"
 
@@ -1072,283 +1542,289 @@ msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Add Contact…"
 msgstr "Eng_adir un contacto..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "_Conversa"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:261
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:291
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "_Ver as conversas previas"
+#: ../libempathy-gtk/empathy-contact-menu.c:331
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Previous Conversations"
+msgstr "Conversas _previas"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:353
+msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:376
+msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+# rever
+#: ../libempathy-gtk/empathy-contact-menu.c:416
+#: ../libempathy-gtk/empathy-contact-widget.c:1819
+msgid "Favorite"
+msgstr "Favorito"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:445
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:491
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "Convidando a esta sala"
+#: ../libempathy-gtk/empathy-contact-menu.c:545
+#: ../src/empathy-chat-window.c:903
+msgid "Inviting you to this room"
+msgstr "Invítao a vostede a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr "Conv_idar á sala de conversa"
+#: ../libempathy-gtk/empathy-contact-menu.c:576
+msgid "_Invite to Chat Room"
+msgstr "Conv_idar a sala de conversa"
 
 # rever
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "Seleccione un contacto"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "Gardar o avatar"
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+msgid "Full name:"
+msgstr "Nome completo:"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "Non foi posíbel gardar o avatar"
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+msgid "Phone number:"
+msgstr "Número de teléfono:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+msgid "E-mail address:"
+msgstr "Enderezo de correo electrónico:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:222
+msgid "Website:"
+msgstr "Sitio web:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:223
+msgid "Birthday:"
+msgstr "Aniversario:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:614
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../src/empathy-main-window.c:1171
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:856
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:858
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:866
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:868
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:870
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:874
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:876
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:878
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:880
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:882
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:884
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:886
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:888
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:890
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:892
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:894
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:896
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:898
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:900
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>Localización</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:963
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "Localización"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
+#: ../libempathy-gtk/empathy-contact-widget.c:979
 msgid "<b>Location</b>, "
 msgstr "<b>Localización</b>, "
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:1030
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1113
+msgid "Save Avatar"
+msgstr "Gardar o avatar"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1169
+msgid "Unable to save avatar"
+msgstr "Non foi posíbel gardar o avatar"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Localización</b> o (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "Conta:"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "Aniversario:"
-
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Client Information"
 msgstr "Información do cliente"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
-msgid "Contact"
-msgstr "Contacto"
-
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Contact Details"
 msgstr "Detalles do contacto"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "Correo electrónico:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "Groups"
 msgstr "Grupos"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "Solicitude de información..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Information requested…"
+msgstr "Información solicitada..."
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1356,41 +1832,37 @@ msgstr ""
 "Seleccione os grupos en que quere que aparezan estes contactos. Note que "
 "pode seleccionar máis dun grupo ou ningún."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "Sitio web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
 # rever
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "servidor novo"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-log-window.c:649
 msgid "Date"
 msgstr "Data"
 
@@ -1412,120 +1884,147 @@ msgstr "Buscar"
 msgid "_For:"
 msgstr "_Por:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "Ch_amar"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
-msgid "C_hat"
-msgstr "Con_versa"
-
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "ID do contacto:"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
+msgid "C_hat"
+msgstr "Con_versa"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "Conversa nova"
 
+# rever
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
+msgid "Send _Video"
+msgstr "Enviar _Vídeo"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
+#: ../src/empathy-call-window.ui.h:22
+msgid "_Call"
+msgstr "_Chamar"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
+msgid "New Call"
+msgstr "Nova chamada"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
-msgid "Custom Message..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
 msgstr "Mensaxe personalizada..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "Editar mensaxe personalizada..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
+msgstr "Editar mensaxes personalizadas..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
 msgid "Click to remove this status as a favorite"
 msgstr "Faga clic para eliminar este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
 msgid "Click to make this status a favorite"
 msgstr "Faga clic para facer este estado un dos favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
 msgid "Set status"
-msgstr "Establecer status"
+msgstr "Estabelecer status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
 msgid "Set your presence and current status"
-msgstr "Estableza a súa presenza e estado actual"
+msgstr "Estabeleza a súa presenza e estado actual"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+msgid "Custom messages…"
 msgstr "Mensaxes personalizadas..."
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Buscar:"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr "Coincidir maiúsculas e minúsculas"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr "Frase non encontrada"
+
 # rever
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "Recibir unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "Enviar unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "Solicitude de conversa entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "Conectado co servidor"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "Chamada de voz entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "Chamada de voz saínte"
 
 # rever
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "Insira unha mensaxe personalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 msgid "Add _New Preset"
-msgstr "Engada _nova configuración preestablecida"
+msgstr "Engada a _nova configuración preestabelecida"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
 msgid "Saved Presets"
@@ -1547,18 +2046,18 @@ msgstr "Limpo"
 msgid "Blue"
 msgstr "Azul"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1475
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-# rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1535
-msgid "Select a destination"
-msgstr "Seleccione un destinatario"
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Ficheiro entrante de %s"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -1727,91 +2226,42 @@ msgstr "Occidental"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-# rever
-#.
-#. * 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 para mostrar no miniaplicativo. Baleiro significa que non se "
-"mostra ningún contacto."
-
-# rever
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr ""
-"O token do avatar do contacto. Baleiro significa que o contacto non ten un "
-"avatar."
-
-# rever
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "Megáfono"
-
-# rever
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
-msgid "Talk!"
-msgstr "Fale!"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "_Acerca de"
-
-#: ../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.ui.h:23
-msgid "_Preferences"
-msgstr "_Preferencias"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "O contacto seleccionado non pode recibir ficheiros."
 
 # rever
-#: ../megaphone/src/megaphone-applet.c:168
-msgid "Please configure a contact."
-msgstr "Configure un contacto."
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "O contacto seleccionado desconectouse."
 
 # rever
-#: ../megaphone/src/megaphone-applet.c:258
-msgid "Select contact..."
-msgstr "Seleccionar un contacto..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "Presenza"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "Non hai mensaxe de erro"
 
-# rever
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
-msgid "Set your own presence"
-msgstr "Defina a súa propia presenza"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+msgid "Instant Message (Empathy)"
+msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:567
+#: ../src/empathy.c:474
 msgid "Don't connect on startup"
-msgstr "Non se conectar ao inicio"
-
-# rever
-#: ../src/empathy.c:571
-msgid "Don't show the contact list on startup"
-msgstr "Non mostrar a lista de contactos ao inicio"
+msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:575
-msgid "Show the accounts dialog"
-msgstr "Mostra o diálogo de conta"
+#: ../src/empathy.c:478
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
-#: ../src/empathy.c:587
+#: ../src/empathy.c:490
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensaxaría instantánea Empathy"
 
 # rever
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -1824,7 +2274,7 @@ msgstr ""
 "versión posterior."
 
 # rever
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:89
 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 "
@@ -1836,7 +2286,7 @@ msgstr ""
 "PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública xeral GNU."
 
 # rever
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:93
 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 "
@@ -1847,206 +2297,548 @@ msgstr ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 # rever
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
-msgstr "Un cliente de mensaxería instantánea para o Gnome"
+msgstr "Un cliente de mensaxaría instantánea para o GNOME"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
-"Suso Baleato <suso.baleato@xunta.es>, 2009;\n"
-"Fran Diéguez <fran.dieguez@glug.es>, 2009;\n"
-"Antón Méixome <meixome@mancomun.org>,2009. "
+"Francisco Diéguez <frandieguez@ubuntu.com>, 2009, 2010.\n"
+"Antón Méixome <meixome@certima.net>, 2010.\n"
+"Fran Diéguez <frandieguez@ubuntu.com>,2009, 2010.\n"
+"Fran Dieguez <fran.dieguez@glug.es>, 2009.\n"
+"Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun."
+"org>, 2009.\n"
+"Antón Méixome <meixome@mancomun.org>, 2009."
 
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "Activado"
+# rever
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "Produciuse un erro ao importar as contas."
+
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "Produciuse un erro ao procesar os detalles da conta."
+
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "Produciuse un erro ao crear a conta."
+
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "Produciuse un erro."
+
+# rever
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr "A mensaxe do erro foi: %s"
+
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
+"deste asistente e engadir as contas máis tarde desde o menú Editar."
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "Contas"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1315
+msgid "An error occurred"
+msgstr "Produciuse un erro"
 
 # rever
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:606
 #, c-format
 msgid "New %s account"
 msgstr "Conta nova de %s"
 
+#: ../src/empathy-account-assistant.c:510
+msgid "What kind of chat account do you have?"
+msgstr "Que clase de conta de chat ten?"
+
+#: ../src/empathy-account-assistant.c:516
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Ten algunha outra conta de chat que queira estabelecer?"
+
+#: ../src/empathy-account-assistant.c:522
+msgid "Enter your account details"
+msgstr "Introduza os seus detalles de conta"
+
 # rever
-#: ../src/empathy-accounts-dialog.c:950
-#, c-format
+#: ../src/empathy-account-assistant.c:527
+msgid "What kind of chat account do you want to create?"
+msgstr "Que clase de conta de chat quere crear?"
+
+# rever
+#: ../src/empathy-account-assistant.c:533
+msgid "Do you want to create other chat accounts?"
+msgstr "Quere crear outras contas de chat?"
+
+#: ../src/empathy-account-assistant.c:540
+msgid "Enter the details for the new account"
+msgstr "Introduza os detalles para a nova conta"
+
+#: ../src/empathy-account-assistant.c:655
 msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
 msgstr ""
-"Vai eliminar a súa conta %s!\n"
-"Está seguro de que quere proceder?"
+"Con Empathy pode falar en liña con xente próxima e con amigos e colegas que "
+"usen Google Talk, AIM, Windows Live e calquera outro programa de chat. Cun "
+"micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
+
+#: ../src/empathy-account-assistant.c:672
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
+
+#: ../src/empathy-account-assistant.c:695
+msgid "Yes, import my account details from "
+msgstr "Si, importar os detalles da miña conta desde "
+
+#: ../src/empathy-account-assistant.c:716
+msgid "Yes, I'll enter my account details now"
+msgstr "Si, introducirei os meus detalles de conta agora"
+
+#: ../src/empathy-account-assistant.c:738
+msgid "No, I want a new account"
+msgstr "Non, quero crear unha conta nova"
+
+#: ../src/empathy-account-assistant.c:748
+msgid "No, I just want to see people online nearby for now"
+msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
+
+#: ../src/empathy-account-assistant.c:769
+msgid "Select the accounts you want to import:"
+msgstr "Seleccione as contas que quere importar:"
+
+#: ../src/empathy-account-assistant.c:853
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
+msgid "Yes"
+msgstr "Si"
+
+#: ../src/empathy-account-assistant.c:860
+msgid "No, that's all for now"
+msgstr "Non, isto é todo por agora"
+
+#: ../src/empathy-account-assistant.c:1129
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy pode descubrir automaticamente e conversar con xente conectada na "
+"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
+"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
+"detalles máis tarde ou desactivar esta característica usando o diálogo "
+"\"Contas\""
+
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
+msgid "Edit->Accounts"
+msgstr "Editar->Contas"
+
+#: ../src/empathy-account-assistant.c:1151
+msgid "I don't want to enable this feature for now"
+msgstr "Non quero activar esta característica agora"
+
+#: ../src/empathy-account-assistant.c:1187
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"Vostede non poderá conversar con xente conectada á súa rede local xa que "
+"telepathy-salut non está instalado.\n"
+"Se quere activar esta característica, instale o paquete telepathy-salut e "
+"cree unha conta de Xente próxima desde o diálogo Contas"
+
+#: ../src/empathy-account-assistant.c:1193
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut non está instalado"
+
+#: ../src/empathy-account-assistant.c:1239
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Asistente de contas de mensaxaría e VoIP"
+
+#: ../src/empathy-account-assistant.c:1273
+msgid "Welcome to Empathy"
+msgstr "Benvido/a ao Empathy"
+
+# rever
+#: ../src/empathy-account-assistant.c:1282
+msgid "Import your existing accounts"
+msgstr "_Importar as súas contas existentes"
+
+#: ../src/empathy-account-assistant.c:1300
+msgid "Please enter personal details"
+msgstr "Insira os detalles persoais"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:65
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "Hai modificacións sen gardar respecto da súa conta %s."
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:69
+msgid "Your new account has not been saved yet."
+msgstr "A súa nova conta aínda non foi gardada."
+
+#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:799
+msgid "Connecting…"
+msgstr "Conectando..."
+
+#: ../src/empathy-accounts-dialog.c:314
+#, c-format
+msgid "Offline — %s"
+msgstr "Desconectado — %s"
+
+#: ../src/empathy-accounts-dialog.c:326
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Desconectado — %s"
+
+#: ../src/empathy-accounts-dialog.c:337
+msgid "Offline — No Network Connection"
+msgstr "Desconectado — Sen conexión de rede"
+
+#: ../src/empathy-accounts-dialog.c:344
+msgid "Unknown Status"
+msgstr "Estado descoñecido"
+
+#: ../src/empathy-accounts-dialog.c:356
+msgid "Offline — Account Disabled"
+msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:797
 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."
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 msgstr ""
-"Calquera conversa asociada e salas de conversa NON serán eliminadas se "
-"decide proceder.\n"
-"\n"
-"Vostede podería decidir engadir a conta de novo máis adiante e elas estarán "
-"aínda dispoñíbeis."
+"Vai crear unha conta nova, e descartaranse os seus cambios \n"
+"Está seguro de que quere proceder?"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "Engadir conta"
+# rever
+#: ../src/empathy-accounts-dialog.c:1144
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "Cr_ear"
+#: ../src/empathy-accounts-dialog.c:1148
+msgid "This will not remove your account on the server."
+msgstr "Isto non eliminará a súa conta no servidor."
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+# rever
+#: ../src/empathy-accounts-dialog.c:1385
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Vai seleccionar outra conta, e descartaranse os seus cambios\n"
+"Está seguro de que quere proceder?"
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "Importar contas..."
+#: ../src/empathy-accounts-dialog.c:1962
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"Vai cerrar a xanela, e descartaranse os cambios que realizou.\n"
+"Está seguro de que quere proceder?"
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
 msgstr "Non hai ningún protocolo instalado"
 
-# rever
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "Configuracións"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Protocol:"
+msgstr "Protocolo:"
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"Para engadir unha conta nova primeiro ten que instalar un backend para cada "
-"protocolo que quere usar."
-
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "Tipo:"
+"Para engadir unha conta nova primeiro ten que instalar unha infraestrutura "
+"para cada protocolo que quere usar."
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "_Add…"
 msgstr "Eng_adir..."
 
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "_Crear unha nova conta"
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Import…"
+msgstr "_Importar..."
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr "_Reusar unha conta existente"
+#: ../src/empathy-auto-salut-account-helper.c:78
+msgid "People nearby"
+msgstr "Persoas próximas"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:470
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-call-window.c:473
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-call-window.c:476
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-call-window.c:581
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-call-window.c:1146
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-call-window.c:797
-msgid "Dialpad"
-msgstr "Marcador"
-
 # rever
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-call-window.c:1165
 msgid "Audio input"
 msgstr "Entrada de audio"
 
 # rever
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-call-window.c:1169
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#. translators: Call is a noun and %s is the contact name. This string is used
-#. * in the window title
-#: ../src/empathy-call-window.c:868
+#: ../src/empathy-call-window.c:1173
+msgid "Dialpad"
+msgstr "Marcador"
+
+# rever
+#: ../src/empathy-call-window.c:1178
+msgid "Details"
+msgstr "Detalles do contacto"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1246
 #, c-format
 msgid "Call with %s"
 msgstr "Chamar con %s"
 
-#. translators: Call is a noun. This string is used in the window title
-#: ../src/empathy-call-window.c:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1325
 msgid "Call"
 msgstr "Chamar"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-call-window.c:2117
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
+# rever
+#: ../src/empathy-call-window.c:2178
+msgid "Technical Details"
+msgstr "Detalles técnicos"
+
+#: ../src/empathy-call-window.c:2216
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"O software de %s non entende algúns dos formatos de video admitidos polo seu "
+"computador"
+
+#: ../src/empathy-call-window.c:2221
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
+"computador"
+
+#: ../src/empathy-call-window.c:2227
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
+"que non permite conexións directas."
+
+#: ../src/empathy-call-window.c:2233
+msgid "There was a failure on the network"
+msgstr "Produciuse un fallo na rede"
+
+#: ../src/empathy-call-window.c:2237
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "Non ten instalados os formatos de audio necesarios neste computador"
+
+#: ../src/empathy-call-window.c:2240
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
+
+#: ../src/empathy-call-window.c:2250
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Produciuse un fallo non esperado no compoñente Telepathy. <a href=«%"
+"s»>Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
+"«Depurar» no menú Axuda."
+
+#: ../src/empathy-call-window.c:2258
+msgid "There was a failure in the call engine"
+msgstr "Produciuse un fallo ao chamar ao motor"
+
+#: ../src/empathy-call-window.c:2297
+msgid "Can't establish audio stream"
+msgstr "Non é posíbel estabelecer un fluxo de audio"
+
+#: ../src/empathy-call-window.c:2307
+msgid "Can't establish video stream"
+msgstr "Non é posíbel estabelecer un fluxo de vídeo"
+
 #: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "Auto"
+
+# rever
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call the contact again"
+msgstr "Chamar ao contacto de novo"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr "Cámara desactivada"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr "Cámara activada"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar cámara e deter o envío do vídeo"
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "Activar cámara e enviar o vídeo"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "Activar cámara pero non enviar o vídeo"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr ""
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "Colgar"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr "Colgar chamada actual"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../src/empathy-call-window.ui.h:13
 msgid "Redial"
-msgstr "Redial"
+msgstr "Remarcación"
 
 # rever
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:14
 msgid "Send Audio"
 msgstr "Enviar audio"
 
+#: ../src/empathy-call-window.ui.h:15
+msgid "Toggle audio transmission"
+msgstr "Activar/desactivar transmisión de audio"
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-call-window.ui.h:18
+msgid "Video"
+msgstr "V_ídeo"
+
 # rever
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "Enviar vídeo"
+#: ../src/empathy-call-window.ui.h:19
+msgid "Video Off"
+msgstr "Vídeo desactivado"
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "Previsualización de vídeo"
+# rever
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video On"
+msgstr "Vídeo activado"
 
-#: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "_Chamar"
+#: ../src/empathy-call-window.ui.h:21
+msgid "Video Preview"
+msgstr "Previsualizar o vídeo"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "_Ver"
 
-# rever
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d non lido)"
+msgstr[1] "%s (%d non lidos)"
+
+#: ../src/empathy-chat-window.c:464
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (e outro %u)"
+msgstr[1] "%s (e outros %u)"
+
+#: ../src/empathy-chat-window.c:480
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d non lido de outros)"
+msgstr[1] "%s (%d non lidos de outros)"
+
+#: ../src/empathy-chat-window.c:489
 #, c-format
-msgid "Conversations (%d)"
-msgstr "Conversas (%d)"
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d non lido de todos)"
+msgstr[1] "%s (%d non lidos de todos)"
 
 # rever
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:695
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -2055,74 +2847,91 @@ msgid "C_lear"
 msgstr "_Limpo"
 
 #: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "C_ontacto"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "Inse_rir unha emoticona"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "Invitar _participante..."
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
-msgstr "Mover o separador _Esquerda"
+msgstr "Mover o separador á _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
-msgstr "Mover o separador _Dereita"
+msgstr "Mover o separador á _dereita"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "_Contacto"
+# rever
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "Notificar todas as mensaxes"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "_Conversa"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "Se_parar o separador"
 
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Edit"
+msgstr "_Editar"
+
 # rever
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
 msgstr "Sala de conversa _favorita"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "Separador _seguinte"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
-msgstr "Separador _previo"
+msgstr "Separador _anterior"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "Mo_strar a lista de contactos"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "_Separadores"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "_Desfacer o peche do separador"
+
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "Sala"
 
 # rever
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
@@ -2132,84 +2941,91 @@ msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas preferidas"
 
 # rever
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:473
+msgid "Incoming video call"
+msgstr "Chamada de vídeo entrante"
+
+# rever
+#: ../src/empathy-event-manager.c:473
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:477
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s estao chamando. Quérelle responder?"
-
-#: ../src/empathy-event-manager.c:331
-msgid "_Reject"
-msgstr "_Rexeitar"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
 
 # rever
-#: ../src/empathy-event-manager.c:337
-msgid "_Answer"
-msgstr "_Responder"
+#: ../src/empathy-event-manager.c:478
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s estao chamando. Quérelle responder?"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
-# rever
-#: ../src/empathy-event-manager.c:496
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s estalle a ofrecer un convite"
+#: ../src/empathy-event-manager.c:506
+msgid "_Reject"
+msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:502
-msgid "An external application will be started to handle it."
-msgstr "Un aplicativo externo será iniciada para manipulalo."
+#: ../src/empathy-event-manager.c:512
+msgid "_Answer"
+msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:507
-msgid "You don't have the needed external application to handle it."
-msgstr "Non precisa dun aplicativo externo para manipulalo."
+#: ../src/empathy-event-manager.c:623
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:700
 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:702
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitación a unirse a %s"
+
+# rever
+#: ../src/empathy-event-manager.c:709
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estao convidando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:717
 msgid "_Decline"
 msgstr "_Declinar"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:722
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:988
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Subscrición solicitada por %s"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:992
 #, c-format
 msgid ""
 "\n"
@@ -2218,128 +3034,126 @@ msgstr ""
 "\n"
 "Mensaxe: %s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:1035
 #, c-format
 msgid "%s is now offline."
 msgstr "%s está agora desconectado."
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:1055
 #, c-format
 msgid "%s is now online."
 msgstr "%s está agora conectado."
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s en %s/s"
 
 # rever
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr "Recibindo \"%s\" de %s"
+msgstr "Recibindo «%s» de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
-msgstr "Enviando \"%s\" a %s"
+msgstr "Enviando «%s» a %s"
 
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
-msgstr "Produciuse un erro ao recibir \"%s\" de %s"
+msgstr "Produciuse un erro ao recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
-msgstr "Erro ao recibir un ficheiro"
+msgstr "Produciuse un erro ao recibir un ficheiro"
 
 # rever
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
-msgstr "Erro ao enviar \"%s\" a %s"
+msgstr "Produciuse un erro ao enviar «%s» a %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
-msgstr "Erro ao enviar un ficheiro"
+msgstr "Produciuse un erro ao enviar un ficheiro"
 
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr "recibiuse \"%s\" de %s"
+msgstr "recibiuse «%s» de %s"
 
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr "enviado \"%s\" a %s"
+msgstr "enviado «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
-msgstr "Transferencia de ficheiros terminada"
+msgstr "Transferencia de ficheiros rematada"
 
 # rever
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "Agardando pola resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr "Verificando a integridade de \"%s\""
+msgstr "Verificando a integridade de «%s»"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
-msgstr "Hashing \"%s\""
+msgstr "Aplicando o hash «%s»"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:990
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1002
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1024
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -2351,24 +3165,11 @@ msgstr "Transferencias de ficheiros"
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
-"Eliminar da lista as transferencias de ficheiros terminadas, canceladas e as "
+"Eliminar da lista as transferencias de ficheiros rematadas, canceladas e as "
 "que fallaron"
 
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
-msgid "Import"
-msgstr "Importar"
-
-#: ../src/empathy-import-dialog.c:272
-msgid "Protocol"
-msgstr "Protocolo"
-
-#: ../src/empathy-import-dialog.c:298
-msgid "Source"
-msgstr "Orixe"
-
 # rever
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2377,182 +3178,145 @@ msgstr ""
 "permite a importación de contas do Pidgin."
 
 # rever
-#: ../src/empathy-import-dialog.ui.h:1
+#: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
 msgstr "Importar contas"
 
-#: ../src/empathy-main-window.c:402
-msgid "_Edit account"
-msgstr "_Editar a conta"
-
-# rever
-#: ../src/empathy-main-window.c:505
-msgid "No error specified"
-msgstr "Non se especificou ningún erro"
-
-# rever
-#: ../src/empathy-main-window.c:508
-msgid "Network error"
-msgstr "Erro de rede"
-
-#: ../src/empathy-main-window.c:511
-msgid "Authentication failed"
-msgstr "Fallou a autenticación"
-
-# rever
-#: ../src/empathy-main-window.c:514
-msgid "Encryption error"
-msgstr "Erro de cifrado"
-
-# rever
-#: ../src/empathy-main-window.c:517
-msgid "Name in use"
-msgstr "Nome en uso"
-
-# rever
-#: ../src/empathy-main-window.c:520
-msgid "Certificate not provided"
-msgstr "Non se proporcionou o certificado"
-
-#: ../src/empathy-main-window.c:523
-msgid "Certificate untrusted"
-msgstr "Certificado non fiábel"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:292
+msgid "Import"
+msgstr "Importar"
 
-# rever
-#: ../src/empathy-main-window.c:526
-msgid "Certificate expired"
-msgstr "O certificado caducou"
+#: ../src/empathy-import-widget.c:301
+msgid "Protocol"
+msgstr "Protocolo"
 
-# rever
-#: ../src/empathy-main-window.c:529
-msgid "Certificate not activated"
-msgstr "O certificado non está activado"
+#: ../src/empathy-import-widget.c:325
+msgid "Source"
+msgstr "Orixe"
 
-# rever
-#: ../src/empathy-main-window.c:532
-msgid "Certificate hostname mismatch"
-msgstr "O nome do host do certificado non coincide"
+#: ../src/empathy-main-window.c:457
+msgid "Reconnect"
+msgstr "Reconectar"
 
-# rever
-#: ../src/empathy-main-window.c:535
-msgid "Certificate fingerprint mismatch"
-msgstr "A impresión dixital do certificado non coincide"
+#: ../src/empathy-main-window.c:463
+msgid "Edit Account"
+msgstr "Editar a conta"
 
-# rever
-#: ../src/empathy-main-window.c:538
-msgid "Certificate self-signed"
-msgstr "Certificado autoasinado"
+#: ../src/empathy-main-window.c:469
+msgid "Close"
+msgstr "Pechar"
 
-# rever
-#: ../src/empathy-main-window.c:541
-msgid "Certificate error"
-msgstr "Erro de certificado"
+#: ../src/empathy-main-window.c:1154
+msgid "Contact"
+msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:544
-msgid "Unknown error"
-msgstr "Erro descoñecido"
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "Lista de contactos"
 
 # rever
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1583
 msgid "Show and edit accounts"
 msgstr "Mostrar e editar contas"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "Contactos no mapa"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "Contexto"
 
 # rever
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
-msgstr "Unirse a pre_feridas"
+msgstr "Unirse a pre_feridos"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
-msgstr "Xestionar os preferidos"
+msgstr "Xestionar as preferidas"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "Nova _chamada..."
+
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 
-# rever
 #: ../src/empathy-main-window.ui.h:8
+msgid "P_references"
+msgstr "P_referencias"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Mostrar os p_rotocolos"
+
+# rever
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "_Depuración"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "Trans_ferencias de ficheiros"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Join…"
 msgstr "_Unirse..."
 
-# rever
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "Conversa _nova..."
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "_Nova conversa..."
 
 # rever
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "Mostrar os contactos _desconectados"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "Información _persoal"
 
-# rever
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "Conversas _previas"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "Sa_la"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:379
 msgid "Chat Room"
 msgstr "Salas de conversa"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:395
 msgid "Members"
 msgstr "Membros"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:605
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
 "<b>%s</b>\n"
 "Invite required: %s\n"
@@ -2564,27 +3328,22 @@ msgstr ""
 "Contrasinal requirido: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "Si"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:635
 msgid "Could not start room listing"
-msgstr "Non se puido arrancar a lista da sala"
+msgstr "Non foi posíbel arrincar a lista da sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:645
 msgid "Could not stop room listing"
-msgstr "Non se puido deter a lista da sala"
+msgstr "Non foi posíbel deter a lista da sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "Couldn't load room list"
-msgstr "Non se puido ler a lista da sala"
+msgstr "Non foi posíbel ler a lista da sala"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
@@ -2616,132 +3375,115 @@ msgstr "Lista de _salas"
 msgid "_Room:"
 msgstr "Sa_la:"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:136
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:137
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:138
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:139
 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:140
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:141
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:142
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:437
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "Permitir o uso de _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "Permitir o uso de _móbiles"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "Permitir o uso da _rede"
+#: ../src/empathy-preferences.c:873
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "Aparencia"
 
-# rever
-#: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "_Conectar automaticamente ao iniciar "
-
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "Comportamento"
 
 # rever
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "T_ema da conversa:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "Mostrar os eventos de entrada na área de notificación"
+
 # rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificacións cando un contacto está desconectado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
 # rever
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Xeral"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Configuración de Geoclue"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "Localización"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "Fontes de localización:"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:14
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:15
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:16
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:17
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -2752,46 +3494,64 @@ msgstr ""
 "aproximadas a 1 valor decimal."
 
 # rever
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:18
 msgid "Show _smileys as images"
 msgstr "Mostrar as _emoticonas como imaxes"
 
 # rever
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show contact _list in rooms"
 msgstr "Mostrar a _lista de contactos nas salas"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:20
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:21
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:22
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
-"A lista de idiomas reflicte só aqueles idiomas para os que ten un dicionario "
-"instalado."
+"A lista de idiomas reflicte só naqueles idiomas para os que ten un "
+"dicionario instalado."
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:23
 msgid "Themes"
 msgstr "Temas"
 
 # rever
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:24
+msgid "_Automatically connect on startup"
+msgstr "_Conectar automaticamente ao iniciar"
+
+# rever
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Cellphone"
+msgstr "_Teléfono móbil"
+
+# rever
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable bubble notifications"
 msgstr "_Activar as burbullas de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable sound notifications"
 msgstr "_Activar as notificacións de son"
 
+#: ../src/empathy-preferences.ui.h:28
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rede (IP, Wifi)"
+
 # rever
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -2799,100 +3559,231 @@ msgstr "A_brir as conversas novas en xanelas separadas"
 
 #: ../src/empathy-preferences.ui.h:31
 msgid "_Publish location to my contacts"
-msgstr "_Publicar localización aos meus contactos"
+msgstr "_Publicar a miña localización aos meus contactos"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión de localización"
 
-#: ../src/empathy-status-icon.ui.h:1
-msgid "Status"
-msgstr "stado"
+#: ../src/empathy-status-icon.c:141
+msgid "Respond"
+msgstr "Responder"
 
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_Quit"
-msgstr "_Saír"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-tube-dispatch.c:375
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "Non foi posíbel iniciar o aplicativo para o servizo %s: %s"
-
-#: ../src/empathy-tube-dispatch.c:446
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr ""
-"Foille ofrecido un convite para o servizo %s, mais non ten o aplicativo "
-"necesario para manipulalo"
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Responder"
 
-#: ../src/empathy-map-view.ui.h:1
-msgid "Contact Map View"
-msgstr "Vista de mapa de contactos"
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Declinar"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "Erro"
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Aceptar"
 
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "Crítico"
-
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "Aviso"
-
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "Mensaxe"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "Status"
+msgstr "Estado"
 
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
-msgid "Info"
-msgstr "Info"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "_Quit"
+msgstr "_Saír"
 
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
-msgid "Debug"
-msgstr "Depuración"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1507
+msgid "Debug"
+msgstr "Depuración"
+
+#: ../src/empathy-debug-window.c:1513
+msgid "Info"
+msgstr "Información"
+
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+msgid "Message"
+msgstr "Mensaxe"
+
+#: ../src/empathy-debug-window.c:1525
+msgid "Warning"
+msgstr "Aviso"
+
+#: ../src/empathy-debug-window.c:1531
+msgid "Critical"
+msgstr "Crítico"
+
+#: ../src/empathy-debug-window.c:1537
+msgid "Error"
+msgstr "Erro"
+
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "O xestor de conexión seleccionado non é compatíbel coa extensión de "
 "depuración remota."
+
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "Invitar participante"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Seleccione o contacto que quere invitar á conversa:"
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
+
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-salut accounts"
+msgstr "Non mostrar ningún diálogo se hai algunha conta non-salut"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
+"foo_40exemplo_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<account-id>"
+
+# rever
+#: ../src/empathy-accounts.c:200
+msgid "- Empathy Accounts"
+msgstr "- Contas de Empathy"
+
+# rever
+#: ../src/empathy-accounts.c:216
+msgid "Empathy Accounts"
+msgstr "Contas de Empathy"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Depurador de Empathy"
+
+# rever
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Cliente de son/vídeo Empathy"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Cliente de son/vídeo Empathy"
+
+# rever
+#~ msgid "Send and receive messages"
+#~ msgstr "Envíe e reciba mensaxes"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "Produciuse un fallo ao reconectar á conversa"
+
+# rever
+#~ msgid "Failed to join chat room"
+#~ msgstr "Produciuse un fallo ao unirse á sala de conversa"
+
+# rever
+#~ msgid "Select a destination"
+#~ msgstr "Seleccione un destinatario"
+
+# rever
+#~ msgid "Important Room"
+#~ msgstr "Salas importante"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "Importáronse as contas MC 4"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "Importáronse as contas MC 4."
+
+# rever
+#~ msgid "%s account"
+#~ msgstr "Conta %s"
+
+#~ msgid "Hostname of the proxy for outbound requests."
+#~ msgstr "Nome de equipo do proxy para as peticións de saída."
+
+#~ msgid ""
+#~ "Look up the DNS SRV record at the service's domain for the host name of a "
+#~ "STUN server."
+#~ msgstr ""
+#~ "Buscar o rexistro SRV do DNS no dominio do servizo polo nome de equipo "
+#~ "dun servidor STUN."
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "Porto do proxy para as consultas saíntes."
+
+#~ msgid ""
+#~ "The username for SIP authentication, if different from the SIP URI\n"
+#~ "username."
+#~ msgstr ""
+#~ "O nome de usuario para a autenticación SIP, se é diferente do \n"
+#~ "nome de usuario para a URI SIP."
+
+#~ msgid ""
+#~ "Update the registration binding if the external address for the client is "
+#~ "discovered to be different from the local binding."
+#~ msgstr ""
+#~ "Actualizar o rexistro de ligazón se se descobre que o enderezo externo "
+#~ "para o cliente é diferente da ligazón local."
+
+#~ msgid ""
+#~ "Use the loose routing behavior and the Route header as recommended in RFC "
+#~ "3261."
+#~ msgstr ""
+#~ "Empregar o comportamento de enrutado aberto e a cabeceira Route como se "
+#~ "recomenta no RFC 3261."
+
+#~ msgid "_Add&#x2026;"
+#~ msgstr "_Engadir&#x2026;"
+
+#~ msgid "_Import&#x2026;"
+#~ msgstr "_Importar&#x2026;"
+
+#~ msgid " Accounts"
+#~ msgstr " Contas"