local-xmpp-assistant-widget: increase row-spacing

[empathy.git] / po / gl.po

diff --git a/po/gl.po b/po/gl.po
index ed3e88bdce8731ec43633c3747819591ff31fc5c..1b4e80d96e990f32fc405d7d8c8f909a24b5600e 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,546 +6,568 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Francisco Diéguez <frandieguez@ubuntu.com>, 2010.
-# Fran Dieguez <frandieguez@ubuntu.com>, 2009, 2010.
 # Fran Diéguez <frandieguez@gnome.org>,2009, 2010, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-06 00:23+0200\n"
-"PO-Revision-Date: 2011-06-06 00:24+0200\n"
-"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"POT-Creation-Date: 2012-02-14 21:58+0100\n"
+"PO-Revision-Date: 2012-02-14 22:00+0100\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de MI"
+
 #: ../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"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
 
 # rever
 #: ../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."
+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:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"O carácter para engadir despois do alcume cando se use o completado de "
-"alcume (tabulador) nunha conversa de grupo."
+"Indica se deberían usarse xestores de conectividade para conectarse ou "
+"desconectarse automaticamente ou non."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "Tema da xanela de conversa"
+msgid "Empathy should auto-connect on startup"
+msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p."
-"ex., «gl, pt, en»)."
+"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
+"ao inicio ou non."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "Lista de contactos compacta"
+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:6
-msgid "Connection managers should be used"
-msgstr "Se se deberían usar xestores de conexión"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
+"inactivo."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Contact list sort criterion"
-msgstr "Criterio de ordenación da lista de contactos"
+msgid "Empathy default download folder"
+msgstr "Cartafol de descargas predeterminado do Empathy"
 
 # rever
 #: ../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"
+msgid "The default folder to save file transfers in."
+msgstr ""
+"O cartafol predeterminado en que gardar as transferencias de ficheiros."
 
 # rever
 #: ../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"
+msgid "Show offline contacts"
+msgstr "Mostrar os contactos desconectados"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable sounds when away"
-msgstr "Desactivar os sons cando se está ausente"
+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/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"
+msgid "Show avatars"
+msgstr "Mostrar os avatares"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
-"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
-"directamente ao usuario."
+"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
+"das xanelas de conversa."
 
 #: ../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"
+msgid "Show protocols"
+msgstr "Mostrar os protocolos"
 
+# rever
 #: ../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"
+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: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"
+msgid "Show Balance in contact list"
+msgstr "Mostrar o balance na lista de contactos"
 
+# rever
 #: ../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 adiviñar a localización"
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica se mostrar ou non os balances na lista de contactos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy default download folder"
-msgstr "Cartafol de descargas predeterminado do Empathy"
+msgid "Compact contact list"
+msgstr "Lista de contactos compacta"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy migrou os seus rexistros de butterfly"
+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:19
-msgid "Empathy should auto-away when idle"
-msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
+msgid "Hide main window"
+msgstr "Agochar a xanela principal"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-connect on startup"
-msgstr "O Empathy debería conectarse automaticamente ao inicio"
+msgid "Hide the main window."
+msgstr "Agochar a xanela principal."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should reduce the location's accuracy"
-msgstr "O Empathy debería reducir a precisión da localización"
+msgid "Default directory to select an avatar image from"
+msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-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"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Enable WebKit Developer Tools"
-msgstr "Activar as ferramentas de desenvolvedor WebKit"
+msgid "Open new chats in separate windows"
+msgstr "Abrir as novas conversas en xanelas separadas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable popup notifications for new messages"
-msgstr "Activar as notificacións emerxentes para as mensaxes novas"
+msgid "Always open a separate chat window for new chats."
+msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable spell checker"
-msgstr "Activar a verificación ortográfica"
+msgid "Display incoming events in the status area"
+msgstr "Mostrar os eventos de entrada na área de estado"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Hide main window"
-msgstr "Agochar a xanela principal"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
+"directamente ao usuario."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide the main window."
-msgstr "Agochar a xanela principal."
+msgid "The position for the chat window side pane"
+msgstr "A posición do panel lateral da xanela de conversa"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Nick completed character"
-msgstr "Carácter de completado de alcume"
+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/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Open new chats in separate windows"
-msgstr "Abrir as novas conversas en xanelas separadas"
+msgid "Show contact groups"
+msgstr "Mostrar os grupos de contactos"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Path of the Adium theme to use"
-msgstr "Ruta do tema de Adium para usar"
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se mostrar ou non os grupos na lista de contactos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
+msgid "Contact list sort criterion"
+msgstr "Criterio de ordenación da lista de contactos"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Play a sound for incoming messages"
-msgstr "Reproducir un son para as mensaxes entrantes"
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Que criterio usar ao ordenar a lista de contactos. O predeterminado é usar a "
+"ordenación polo estado co valor \"state\" (estado). Un valor de \"name"
+"\" (nome) ordenará a lista de contactos polo nome."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Play a sound for new conversations"
-msgstr "Reproducir un son para as conversas novas"
+msgid "Use notification sounds"
+msgstr "Usar sons de notificación"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un son para as mensaxes saíntes"
+msgid "Whether to play a sound to notify of events."
+msgstr "Indica se reproducir ou non un son para notificar os eventos."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un son cando un contacto inicia unha sesión"
+msgid "Disable sounds when away"
+msgstr "Desactivar os sons cando se está ausente"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un son cando un contacto saia da sesión"
+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/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when we log in"
-msgstr "Reproducir un son cando iniciamos a sesión"
+msgid "Play a sound for incoming messages"
+msgstr "Reproducir un son para as mensaxes entrantes"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando saímos da sesión"
+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/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
+msgid "Play a sound for outgoing messages"
+msgstr "Reproducir un son para as mensaxes saíntes"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications when a contact logs in"
-msgstr "Facer emerxer unha notificación cando un contacto entra"
+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/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs out"
-msgstr "Facer emerxer unha notificación cando un contacto sae"
+msgid "Play a sound for new conversations"
+msgstr "Reproducir un son para as conversas novas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Show Balance in contact list"
-msgstr "Mostrar o balance na lista de contactos"
+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/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show avatars"
-msgstr "Mostrar os avatares"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproducir un son cando un contacto inicia unha sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show contact list in rooms"
-msgstr "Mostrar a lista de contactos nas salas"
+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/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"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show offline contacts"
-msgstr "Mostrar os contactos desconectados"
+msgid ""
+"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."
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Show protocols"
-msgstr "Mostrar os protocolos"
+msgid "Play a sound when we log in"
+msgstr "Reproducir un son cando iniciamos a sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Spell checking languages"
-msgstr "Idiomas para a corrección ortográfica"
+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/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."
+msgid "Play a sound when we log out"
+msgstr "Reproducir un son cando saímos da sesión"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The last directory that an avatar image was chosen from."
-msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
+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/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"
+msgid "Enable popup notifications for new messages"
+msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The stored position (in pixels) of the chat window side pane."
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
-"A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
+"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
+"mensaxe nova."
 
 # rever
 #: ../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."
+msgid "Disable popup notifications when away"
+msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Use graphical smileys"
-msgstr "Usar emoticonas gráficas"
+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/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Use notification sounds"
-msgstr "Usar sons de notificación"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Use theme for chat rooms"
-msgstr "Usar un tema para as salas de conversa"
+msgid ""
+"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/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."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Whether Empathy can use the GPS to guess the location."
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
+"conectado."
 
 # rever
 #: ../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 adiviñar "
-"a localización."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy can use the network to guess the location."
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
-"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
+"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
+"desconectado."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Indica se Empathy migrou os seus rexistros de butterfly."
+msgid "Use graphical smileys"
+msgstr "Usar emoticonas gráficas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy should automatically log into your accounts on startup."
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
-"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
-"ao inicio ou non."
+"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
-"inactivo."
+msgid "Show contact list in rooms"
+msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid ""
-"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."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"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."
+msgid "Chat window theme"
+msgstr "Tema da xanela de conversa"
 
+# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-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."
+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/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Indica se deberían usarse xestores de conectividade para conectarse ou "
-"desconectarse automaticamente ou non."
+msgid "Chat window theme variant"
+msgstr "Variante do tema da xanela de charla"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether to check words typed against the languages you want to check with."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
-"Indica se se deberían verificar ou non as palabras escritas no idioma co que "
-"as quere verificar."
+"A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
+msgid "Path of the Adium theme to use"
+msgstr "Ruta do tema de Adium para usar"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos inician "
-"unha sesión na rede."
+"Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"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."
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of events."
-msgstr "Indica se reproducir ou non un son para notificar os eventos."
+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/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a outros usuarios cando vostede está escribindo"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se enviar ou non os estados de conversa «escribindo» ou «pausado». No "
+"afecta realmente ao estado «ausente»."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-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."
+msgid "Use theme for chat rooms"
+msgstr "Usar un tema para as salas de conversa"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-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."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-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."
+msgid "Spell checking languages"
+msgstr "Idiomas para a corrección ortográfica"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play sound notifications when away or busy."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
-"ausente."
+"Unha lista separada por vírgulas dos verificadores ortográficos a usar (p."
+"ex., «gl, pt, en»)."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-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."
+msgid "Enable spell checker"
+msgstr "Activar a verificación ortográfica"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando un contacto está "
-"conectado."
+"Indica se se deberían verificar ou non as palabras escritas no idioma co que "
+"as quere verificar."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"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."
+msgid "Nick completed character"
+msgstr "Carácter de completado de alcume"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show a popup notification when receiving a new message."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
-"Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
-"mensaxe nova."
+"O carácter para engadir despois do alcume cando se use o completado de "
+"alcume (tabulador) nunha conversa de grupo."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show account balances in the contact list."
-msgstr "Indica se mostrar ou non os balances na lista de contactos."
+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"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
-"das xanelas de conversa."
+"Indica se o Empathy debería usar o avatar dos contactos como a icona da "
+"xanela da conversa ou non."
 
-# rever
 #: ../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."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última conta seleccionada no diálogo Unirse á sala"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show popup notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
-"ou ocupado."
+"Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
 
-# rever
 #: ../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."
+msgid "Camera device"
+msgstr "Dispositivo da cámara"
 
-# 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 conversa."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
+"dev/video0."
 
-# rever
 #: ../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."
+msgid "Camera position"
+msgstr "Posición da cámara"
 
-# rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Position the camera preview should be during a call."
+msgstr ""
+"Posición onde debe estar a vista previa da cámara durante unha chamada."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Echo cancellation support"
+msgstr "Compatibilidade de cancelación de eco"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Show hint about closing the main window"
+msgstr "Mostrar unha indicación sobre pechar a xanela principal"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -553,235 +575,288 @@ 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."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "Empathy pode publicar a localización dos usuarios"
+
 # rever
-#: ../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."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+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."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
 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."
+"Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+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"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+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 adiviñar "
+"a localización."
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy pode usar o GPS para seguir a localización"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
-"Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
+"Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "O Empathy debería reducir a precisión da localización"
 
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "O ficheiro seleccionado non é un ficheiro regular"
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"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."
 
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "O ficheiro seleccionado está baleiro"
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e VoIP"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "O tipo de socket non é compatíbel"
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e VoIP"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr ""
+"Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "O ficheiro seleccionado non é un ficheiro regular"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "O ficheiro seleccionado está baleiro"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Chamada perdida de %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Chamou %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Chamada de %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:317
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:364 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Non se proporcionou o certificado"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado non fiábel"
 
 # rever
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "O certificado caducou"
 
 # rever
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:380 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:426
-msgid "This resource is already connected to the server"
-msgstr "Este recurso xa está conectado ao servidor"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta xa está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:428
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revocado"
 
-#: ../libempathy/empathy-utils.c:437
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:440
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -790,390 +865,360 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía."
 
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "O seu software é demasiado antigo"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
 # rever
-#: ../libempathy/empathy-utils.c:603
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Persoas próximas"
 
 # rever
-#: ../libempathy/empathy-utils.c:608
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:637
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:638
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Hai %d segundo"
 msgstr[1] "Hai %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Hai %d minuto"
 msgstr[1] "Hai %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Hai %d hora"
 msgstr[1] "Hai %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Hai %d día"
 msgstr[1] "Hai %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Hai %d semana"
 msgstr[1] "Hai %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Hai %d mes"
 msgstr[1] "Hai %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "Todas"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "Tódalas contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
-#: ../libempathy-gtk/empathy-log-window.c:643
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "A conta %s edítase mediante My Web Accounts."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1160
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Non é posíbel editar a conta %s en Empathy."
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget.c:1180
-msgid "Launch My Web Accounts"
-msgstr "Iniciar My Web Accounts"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Iniciar sesi_ón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
-msgid "Ca_ncel"
-msgstr "Ca_ncelar"
-
 # rever
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, 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:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 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-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "Con_trasinal:"
 
+# rever
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-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"
+msgid "Screen _Name:"
+msgstr "_Nome en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Con_trasinal:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Lembrar o contrasinal"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Lembrar o contrasinal"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Porto:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Lembrar o contrasinal"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nome en pantalla:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Cal e o seu contrasinal para AIM?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avanzado"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Cal é o seu nome en patalla para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Porto:"
+msgid "What is your AIM password?"
+msgstr "Cal e o seu contrasinal para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../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"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Lembrar o contrasinal"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "I_D de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exemplo:</b> nomeusuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Cal é o seu ID de usuario en GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Cal é o seu contrasinal en GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+# rever
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Codificación de c_aracteres:"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Cal é o seu UIN para ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Cal é o seu contrasinal pra ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 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:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "Opcións"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "Ningún"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "Codificación de caracteres:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "Rede"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "Rede:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "Codificación de caracteres:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"A maioría dos servidores IRC non precisan contrasinal, polo que se non está "
+"seguro non escriba un contrasinal."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Alcume:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "Contrasinal:"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "Mensaxe de saída:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "Nome real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "Servidores"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "Que rede IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "What is your IRC nickname?"
 msgstr "Cal é o seu alcume de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "Que rede IRC?"
-
 #: ../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:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requírese o c_ifrado (TLS/SSL)"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorar os erros do certificado SSL"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Ignorar as configuracións do servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridade:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Rec_urso:"
+msgid "What is your Facebook username?"
+msgstr "Cal é o seu nome de usuario para Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1185,214 +1230,245 @@ msgstr ""
 "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:17
-msgid "Use old SS_L"
-msgstr "Usar o SS_L antigo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Cal é o seu contrasinal para Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Cal é o seu nome de usuario para Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Cal é o seu ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Examplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Cal é o seu contrasinal de Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exemplo:</b> user@jabber.org"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorar os erros do certificado SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridade:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Rec_urso:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Requírese o c_ifrado (TLS/SSL)"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar o SS_L antigo"
+
+# rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Ignorar as configuracións do servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Cal é o seu identificador de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Cal é o seu contrasinal de Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Cal é o ID de Jabber que desexa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Cal é o seu contrasinal de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Cal é o contrasinal de Jabber que desexa?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Cal é o seu contrasinal para Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Cal é o seu contrasinal para Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Enderezo de correo _electrónico:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Alcume:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Apelidos:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nome:"
 
+# rever
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nome _publicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID para _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Apelidos:"
+msgid "E-_mail address:"
+msgstr "Enderezo de correo _electrónico:"
 
-# rever
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nome _publicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Nome de _usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 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 "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 "Discover the STUN server automatically"
-msgstr "Descubrir o servidor STUN automaticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar os erros TLS"
+msgid "NAT Traversal Options"
+msgstr "Opcións do NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opcións do proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcións de Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Opcións varias"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Enrutado aberto"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir o servidor STUN automaticamente"
 
+# rever
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opcións varias"
+msgid "Discover Binding"
+msgstr "Descubrir ligazón"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcións do NAT transversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcións de Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Porto:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcións do proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Nome de usuario para a autenticación:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Enrutado aberto"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar os erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "What is your SIP account password?"
-msgstr "Cal é o contrasinal da súa conta SIP?"
+msgid "Port:"
+msgstr "Porto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 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:23
-msgid "_Username:"
-msgstr "Nome de _usuario:"
+msgid "What is your SIP account password?"
+msgstr "Cal é o contrasinal da súa conta SIP?"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo:"
+
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorar os convites para conferencias e salas de conversa"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+# rever
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Configuración da lista de _salas:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Cal é o seu ID para Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Cal é o seu contrasinal para Yahoo?"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D de Yahoo:"
-
-# rever
-#: ../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:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Non foi posíbel converter a imaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 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"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "Non foi posíbel gardar o pixbuf a png"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Non foi posíbel gardar a imaxe a un ficheiro"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Seleccione a súa imaxe de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Obter unha foto..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Sen imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
@@ -1401,40 +1477,67 @@ msgstr "Todos os ficheiros"
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "Produciuse un erro ao iniciar a chamada"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "O contacto especificado non admite as chamadas"
+
+# rever
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "O contacto especificado está desconectado"
+
+# rever
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "O contacto especificado non é válido"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Este protocolo non admite as chamadas de emerxencia"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "Non ten crédito dabondo para facer esta chamada"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Ese asunto non se admite nesta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1092
 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:1032
+#: ../libempathy-gtk/empathy-chat.c:1095
 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:1036
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1442,23 +1545,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
 "actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1109
 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:1049
+#: ../libempathy-gtk/empathy-chat.c:1112
 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:1052
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1468,11 +1571,11 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1480,119 +1583,134 @@ msgstr ""
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+# rever
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
+
+# rever
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Produciuse un erro ao enviar a mensaxe: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "contacto incorrecto"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "descoñecido"
 
-# rever
-#: ../libempathy-gtk/empathy-chat.c:1424
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
-
-# rever
-#: ../libempathy-gtk/empathy-chat.c:1428
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Produciuse un erro ao enviar a mensaxe: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema estabelecido por %s a: %s"
+
+# rever
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1600,12 +1718,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:2432
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1613,17 +1731,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:2443
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1633,579 +1751,496 @@ 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:2459
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1957
-#: ../src/empathy-event-manager.c:1130
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3738 ../src/empathy-event-manager.c:1151
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3793
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3798
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Identificador descoñecido ou non válido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel temporalmente"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Non foi posíbel bloquear o contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Editar os contactos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1479
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Conta:"
 
+# rever
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Contactos bloqueados"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Eliminar"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1245
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1252
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Abrir a ligazón"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editar a información de contacto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
-#, c-format
-msgid "Block %s?"
-msgstr "Desexa bloquear a %s?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
-"Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
-msgid "_Block"
-msgstr "_Bloquear"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "_Informar de este contacto como abusivo"
-msgstr[1] "_Informar destes contactos como abusivos"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir máis _adiante"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "Solicitude de subscrición"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "_Bloquear usuario"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Sen grupo"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Persoas favoritas"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2357
-#, 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:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2360
-msgid "Removing group"
-msgstr "Eliminando o grupo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2415
-#: ../libempathy-gtk/empathy-individual-view.c:2612
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "_Eliminar"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-#, 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:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-msgid "Removing contact"
-msgstr "Eliminando o contacto"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact…"
-msgstr "Eng_adir un contacto…"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:299
-msgid "_Block Contact"
-msgstr "_Bloquear contacto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:536
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Chat"
-msgstr "_Conversa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:358
-#: ../libempathy-gtk/empathy-individual-menu.c:625
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audiochamada"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:389
-#: ../libempathy-gtk/empathy-individual-menu.c:667
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videochamada"
-
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:435
-#: ../libempathy-gtk/empathy-individual-menu.c:710
-#: ../src/empathy-main-window.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Conversas _previas"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:457
-#: ../libempathy-gtk/empathy-individual-menu.c:751
-msgid "Send File"
-msgstr "Enviar ficheiro"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:480
-#: ../libempathy-gtk/empathy-individual-menu.c:793
-msgid "Share My Desktop"
-msgstr "Compartir o meu escritorio"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "Desexa bloquear a %s?"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-menu.c:520
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:828
-#: ../libempathy-gtk/empathy-individual-widget.c:1370
-msgid "Favorite"
-msgstr "Favorito"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:549
-#: ../libempathy-gtk/empathy-individual-menu.c:856
-msgid "Infor_mation"
-msgstr "Infor_mación"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:595
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editar"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "_Informar de este contacto como abusivo"
+msgstr[1] "_Informar destes contactos como abusivos"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:649
-#: ../libempathy-gtk/empathy-individual-menu.c:1037
-#: ../src/empathy-chat-window.c:1010
-msgid "Inviting you to this room"
-msgstr "Invítao a vostede a esta sala"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "Solicitude de subscrición"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_Bloquear usuario"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-menu.c:680
-#: ../libempathy-gtk/empathy-individual-menu.c:1084
-msgid "_Invite to Chat Room"
-msgstr "Conv_idar a sala de conversa"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir máis _adiante"
 
 # rever
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Buscar:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Engadir contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Non se atoparon contactos"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Seleccione un contacto"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Número de teléfono:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Enderezo de correo electrónico:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Sitio web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Aniversario:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Última actividade:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Conectado desde:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "A súa mensaxe de presentación:"
 
-# rever
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Mensaxe de ausencia:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Permítame ver cando está en liña. Grazas."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canles:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:631
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localización"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:682
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:917
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:975
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 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"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1305
-msgid "Alias:"
-msgstr "Alias:"
-
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Información do cliente"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles persoais"
 
 # rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalles do contacto"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Nome completo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Enderezo de correo electrónico"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Sitio web"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Aniversario"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "Última actividade"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Conectado desde:"
+
+# rever
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Mensaxe de ausencia:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "traballo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "persoal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "móbil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voz"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "prefirido"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "grupo"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1509
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localización</b> o (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Información solicitada…"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Información do cliente"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2213,83 +2248,180 @@ 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-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1753
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Bloquearase a seguinte identidade:"
 msgstr[1] "Bloquearanse as seguintes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Non é posíbel bloquear a seguinte identidade:"
 msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 
-# rever
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-msgid "Linked Contacts"
-msgstr "Contactos ligados"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-msgid "Select contacts to link"
-msgstr "Seleccione os contactos a ligar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-msgid "New contact preview"
-msgstr "Vista previa do contacto novo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:472
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editar a información de contacto"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:582
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "Seleccione a conta a usar para realizar a chamada"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Chamar"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "Móbil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "Traballo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "Casa"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Bloquear contacto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Conversa"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:904
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audiochamada"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videochamada"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "Conversas _previas"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Enviar ficheiro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Compartir o meu escritorio"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorito"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts non está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Instale o programa gnome-contacts para acceder aos detalles dos contactos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mación"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:930
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligar contactos…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
+msgid "Inviting you to this room"
+msgstr "Invítao a vostede a esta sala"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Conv_idar a sala de conversa"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Eng_adir un contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2322
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2488
+# rever
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, 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-individual-view.c:2344
+msgid "Removing group"
+msgstr "Eliminando o grupo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Eliminar"
+
+# rever
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Está seguro de quere eliminar o contacto '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2298,7 +2430,11 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Eliminando o contacto"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2309,147 +2445,287 @@ msgstr[1] "Contactos ligados que conteñen %u contactos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Localización</b> en (date)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono ou un dispositivo móbil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Rede nova"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Seleccione unha rede IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Rei_niciar a lista de redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleccionar"
 
-# rever
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "servidor novo"
+# rever
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "servidor novo"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "Historial"
+
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "Buscar"
+
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "Conversar en %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "Conversa con %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e de %B de %Y ás %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1291
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s segundo"
+msgstr[1] "%s segundos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuto"
+msgstr[1] "%s minutos"
+
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "A chamada levou %s, rematou ás %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "Hoxe"
+
+#: ../libempathy-gtk/empathy-log-window.c:1726
+msgid "Yesterday"
+msgstr "Mañá"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1741
+msgid "%e %B %Y"
+msgstr "%e de %B de %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "Calquera momento"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "Calquera persoa"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "Quen"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "Cando"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "Calquera cousa"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
-msgid "SSL"
-msgstr "SSL"
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "Chamadas"
 
 # rever
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligar contactos"
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "Chamadas entrantes"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desligar…"
+# rever
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Separar por completo o contacto ligado nos contactos que contén."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desexa desligar os contactos ligados «%s»?"
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Está seguro que quere desligar estes contactos ligados? Isto separará por "
-"completo os contactos ligados en contactos separados."
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "Que"
+
+#: ../libempathy-gtk/empathy-log-window.c:3782
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desligar"
+#: ../libempathy-gtk/empathy-log-window.c:3786
+msgid "Clear All"
+msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "Data"
+#: ../libempathy-gtk/empathy-log-window.c:3793
+msgid "Delete from:"
+msgstr "Eliminar desde:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_Ficheiro"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "Conversas"
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "_Editar"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "Buscar seguinte"
+msgid "Delete All History..."
+msgstr "Eliminar todo o historial…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "Buscar anterior"
+msgid "Profile"
+msgstr "Perfíl"
 
-# rever
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "Conversas previas"
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Conversa"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "Buscar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "V_ídeo"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "páxina 2"
 
-# rever
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_Por:"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ID do contacto:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "O contacto está desconectado"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
-msgid "C_hat"
-msgstr "Con_versa"
+# rever
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "O contacto especificado é descoñecido ou non é válido"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "O contacto non admite este tipo de conversa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "A funcionalidade requirida non está implementada para este protocolo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Non foi posíbel iniciar unha conversa co contacto dado"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Vostede foi bloqueado nesta canle"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Esta canel está completa"
+
+# rever
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Debe ter un convite para unirse a esta canle"
+
+# rever
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Non é posíbel continuar mentres estea desconectado"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Produciuse un erro ao iniciar a conversa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Escriba o identificador dun contacto ou un número de teléfono:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Conversa nova"
 
-# rever
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:254
-msgid "Send _Video"
-msgstr "Enviar _Vídeo"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:262
-msgid "C_all"
-msgstr "Ch_amar"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:272
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nova chamada"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Fallou a autenticación  para a conta <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2464,34 +2740,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "Mensaxe personalizada…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "Editar mensaxes personalizadas…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "Faga clic para eliminar este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "Faga clic para facer este estado un dos favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "Estabelecer status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "Estabeleza a súa presenza e estado actual"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Mensaxes personalizadas…"
 
@@ -2505,13 +2777,22 @@ msgstr "Mensaxes personalizadas…"
 msgid "New %s account"
 msgstr "Conta nova de %s"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "Buscar:"
 
+# rever
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "_Anterior"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "_Seguinte"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "Coincidir maiúsculas e minúsculas"
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
@@ -2566,39 +2847,32 @@ msgstr "Chamada de voz saínte"
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "Insira unha mensaxe personalizada"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "Gardar a mensaxe de estado _novo"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "Mensaxes de estado gardados"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1717
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "Clásico"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "Simple"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "Limpo"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:71
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "Azul"
 
@@ -2666,35 +2940,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome do servidor do certificado: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "A conexión non é confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A conexión non confiábel. Desexa continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta elección para futuras conexións"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2703,7 +2981,7 @@ msgstr ""
 "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
 "dispoñíbeis. Elixa outra localización."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -2875,44 +3153,35 @@ msgstr "Occidental"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "O contacto seleccionado non pode recibir ficheiros."
-
 # rever
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "O contacto seleccionado desconectouse."
-
-# rever
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Non hai mensaxe de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:307
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:311
+#: ../src/empathy.c:441
 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:319
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:498
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2962,11 +3231,11 @@ msgstr ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 # rever
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un cliente de mensaxaría instantánea para o GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Francisco Diéguez <frandieguez@ubuntu.com>, 2009, 2010.\n"
@@ -3009,37 +3278,38 @@ msgstr ""
 "deste asistente e engadir as contas máis tarde desde o menú Editar."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "Produciuse un erro"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "Que clase de conta de chat ten?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 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:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Introduza os seus detalles de conta"
 
 # rever
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 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:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Quere crear outras contas de chat?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Introduza os detalles para a nova conta"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3050,41 +3320,41 @@ msgstr ""
 "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:629
+#: ../src/empathy-account-assistant.c:631
 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:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Si, importar os detalles da miña conta desde "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Si, introducirei os meus detalles de conta agora"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Non, quero crear unha conta nova"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 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:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Seleccione as contas que quere importar:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Non, isto é todo por agora"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 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 "
@@ -3097,16 +3367,16 @@ msgstr ""
 "detalles máis tarde ou desactivar esta característica usando o diálogo "
 "\"Contas\""
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "Editar->Contas"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "_Non quero activar esta característica por agora"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 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 "
@@ -3118,88 +3388,97 @@ msgstr ""
 "Se quere activar esta característica, instale o paquete telepathy-salut e "
 "cree unha conta de Persoas próximas desde o diálogo Contas"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut non está instalado"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Asistente de contas de mensaxaría e VoIP"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "Benvido/a ao Empathy"
 
 # rever
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "_Importar as súas contas existentes"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 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:64
+#: ../src/empathy-accounts-dialog.c:69
 #, 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:68
+#: ../src/empathy-accounts-dialog.c:73
 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:345
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Vai crear unha conta nova, e descartaranse os seus cambios \n"
-"Está seguro de que quere proceder?"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "Editar os parámetros da conexión"
+
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor"
+
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Conéctese para editar a súa información persoal"
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1289
 #, 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.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "Isto non eliminará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3208,16 +3487,16 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "_Desactivar"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3225,21 +3504,21 @@ msgstr ""
 "Vai cerrar a xanela, e descartaranse os cambios que realizou.\n"
 "Está seguro de que quere proceder?"
 
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "Cargando a información da conta"
-
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "Non hai ningún protocolo instalado"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Engadir…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Import…"
+msgstr "_Importar…"
+
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protocolo:"
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3248,20 +3527,20 @@ msgstr ""
 "para cada protocolo que quere usar."
 
 # rever
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "Eng_adir…"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "_Importar…"
+msgid "No protocol installed"
+msgstr "Non hai ningún protocolo instalado"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Loading account information"
+msgstr "Cargando a información da conta"
 
 # rever
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticación Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
@@ -3271,119 +3550,109 @@ msgid "People nearby"
 msgstr "Persoas próximas"
 
 # rever
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de son/vídeo Empathy"
 
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de son/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Entrada de audio"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Marcador"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1140
 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-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, 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-streamed-media-window.c:1353
-msgid "Call"
-msgstr "Chamar"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1906
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: ../src/empathy-streamed-media-window.c:1909
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: ../src/empathy-streamed-media-window.c:1912
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Descoñecido"
-
-#: ../src/empathy-streamed-media-window.c:1915
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2274
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:2335
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2373
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3392,7 +3661,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2378
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3401,7 +3671,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2384
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3410,21 +3681,25 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-streamed-media-window.c:2390
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-streamed-media-window.c:2394
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 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-streamed-media-window.c:2397
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 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-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3435,364 +3710,438 @@ msgstr ""
 "href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
 "xanela «Depurar» no menú Axuda."
 
-#: ../src/empathy-streamed-media-window.c:2415
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-streamed-media-window.c:2418
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2458
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-streamed-media-window.c:2468
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 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-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "_Chamar"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara desactivada"
+msgid "_Microphone"
+msgstr "_Micrófono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara activada"
+msgid "_Camera"
+msgstr "_Cámara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "_Settings"
+msgstr "_Configuracións"
 
 #: ../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-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../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:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "A_xuda"
 
-#: ../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:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Contidos"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Códec de codificación:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Depuración"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "Colgar"
+msgid "Swap camera"
+msgstr "Trocar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Colgar chamada actual"
+msgid "Minimise me"
+msgstr "Minimizarme"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidato local:"
+msgid "Maximise me"
+msgstr "Maximizarme"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "Previsualizar"
+msgid "Disable camera"
+msgstr "Desactivar cámara"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "Remarcación"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidato remoto:"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Colgar chamada actual"
 
-# rever
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar audio"
+msgid "Video call"
+msgstr "Videochamada"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Activar/desactivar transmisión de audio"
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Unknown"
-msgstr "Descoñecido"
+msgid "Start a video call"
+msgstr "Iniciar vídeochamada"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+msgid "Start an audio call"
+msgstr "Iniciar chamada de son"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "V_ídeo"
+msgid "Show dialpad"
+msgstr "Mostrar marcador"
 
-# rever
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desactivado"
+msgid "Display the dialpad"
+msgstr "Desactivar o marcador"
 
 # rever
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo activado"
+msgid "Send Video"
+msgstr "Enviar vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "Previsualizar o vídeo"
+msgid "Toggle video transmission"
+msgstr "Activar/desactivar transmisión de vídeo"
 
+# rever
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "_Chamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar audio"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:30
-msgid "_View"
-msgstr "_Ver"
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Activar/desactivar transmisión de audio"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Códec de codificación:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
+
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Candidato remoto:"
+
+#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Candidato local:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "Auto"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+# rever
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Pechar esta xanela?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que "
+"se una de novo."
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Pechar esta xanela fará que abandone unha sala de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+msgstr[1] ""
+"Pechar esta xanela fará que abandone %u salas de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "Pechar %s?"
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Non recibirá máis mensaxes deste chat até que se una de novo."
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Pechar a xanela"
+
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Abandonar a sala"
+
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, 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:492
+#: ../src/empathy-chat-window.c:648
 #, 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:508
+#: ../src/empathy-chat-window.c:664
 #, 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:517
+#: ../src/empathy-chat-window.c:673
 #, c-format
 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)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
-msgid_plural "Sending %d messages"
-msgstr[0] "Enviando %d mensaxe."
-msgstr[1] "Enviando %d mensaxes."
-
-# rever
-#: ../src/empathy-chat-window.c:764
-msgid "Typing a message."
-msgstr "Escribindo unha mensaxe."
-
-#: ../src/empathy-chat-window.ui.h:1
-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:4
-msgid "Insert _Smiley"
-msgstr "Inse_rir unha emoticona"
-
-#: ../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 a lapela á _esquerda"
-
-#: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover a lapela á _dereita"
+msgid_plural "Sending %d messages"
+msgstr[0] "Enviando %d mensaxe."
+msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar todas as mensaxes"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "_Contidos"
+#: ../src/empathy-chat-window.c:920
+msgid "Typing a message."
+msgstr "Escribindo unha mensaxe."
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:1
 msgid "_Conversation"
 msgstr "_Conversa"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "Des_prender lapela"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "_Limpo"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Inse_rir unha emoticona"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:4
 msgid "_Favorite Chat Room"
 msgstr "Sala de conversa _favorita"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "A_xuda"
-
-#: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "Lapela _seguinte"
-
 # rever
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Lapela _anterior"
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "Notificar todas as mensaxes"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
 msgstr "Mo_strar a lista de contactos"
 
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participant…"
+msgstr "Invitar _participante…"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "C_ontact"
+msgstr "C_ontacto"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Tabs"
 msgstr "_Lapelas"
 
-#: ../src/empathy-chat-window.ui.h:19
+# rever
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "Lapela _anterior"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "Lapela _seguinte"
+
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Undo Close Tab"
 msgstr "_Desfacer o peche da lapela"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover a lapela á _esquerda"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover a lapela á _dereita"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "Des_prender lapela"
+
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "Sala"
 
 # rever
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
 # rever
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas preferidas"
 
 # rever
-#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:514
+#: ../src/empathy-event-manager.c:527
 #, c-format
 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:515
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 
-#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:549
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:667
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "_Responder con vídeo"
+
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:740
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:742
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:749
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estao convidando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:757
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Declinar"
 
-#: ../src/empathy-event-manager.c:762
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:789
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:795
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:1024 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1080
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cando vostede está dispoñíbel"
 
-#: ../src/empathy-event-manager.c:1084
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3802,44 +4151,44 @@ msgstr ""
 "Mensaxe: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:274
+#: ../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:275
+#: ../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:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recibindo «%s» de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando «%s» a %s"
@@ -3847,30 +4196,30 @@ msgstr "Enviando «%s» a %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Produciuse un erro ao recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Produciuse un erro ao recibir un ficheiro"
 
 # rever
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Produciuse un erro ao enviar «%s» a %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 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:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "recibiuse «%s» de %s"
@@ -3878,39 +4227,39 @@ msgstr "recibiuse «%s» de %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "enviado «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Transferencia de ficheiros rematada"
 
 # rever
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Agardando pola resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verificando a integridade de «%s»"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Aplicando o hash «%s»"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -3940,182 +4289,200 @@ msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar unha conta para ver contactos aquí."
+
 # rever
-#: ../src/empathy-main-window.c:540
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-main-window.c:695
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"As contas de %s non se poden usar até que non teña actualizado o seu "
+"software %s."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Actualizar software…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Pechar"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:701
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar a conta"
 
-#: ../src/empathy-main-window.c:707
-msgid "Close"
-msgstr "Pechar"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:846
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:893
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar o saldo da conta"
 
 #. top up button
-#: ../src/empathy-main-window.c:968
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1735
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2087
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar unha das súas contas para ver contactos aquí."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Debe activar %s para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-# rever
-#: ../src/empathy-main-window.c:2205
-msgid "Show and edit accounts"
-msgstr "Mostrar e editar contas"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración da conta"
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contactos no mapa"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova conversa…"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Credit Balance"
-msgstr "Crédito"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _chamada…"
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Buscar na lista de contactos"
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Buscar contactos…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Trans_ferencias de ficheiros"
 
 # rever
-#: ../src/empathy-main-window.ui.h:4
-msgid "Join _Favorites"
-msgstr "Unirse a pre_feridos"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Mostrar os contactos _desconectados"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "Manage Favorites"
-msgstr "Xestionar as preferidas"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Mostrar os p_rotocolos"
 
-#: ../src/empathy-main-window.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamañ_o normal"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Crédito"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _chamada…"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contactos no mapa"
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamaño normal con _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Contas"
 
-#: ../src/empathy-main-window.ui.h:9
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-main-window.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Mostrar os p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Buscar na lista de contactos"
 
 # rever
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Accounts"
-msgstr "_Contas"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
 
-# rever
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamañ_o normal"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "_Depuración"
-
-#: ../src/empathy-main-window.ui.h:21
-msgid "_File Transfers"
-msgstr "Trans_ferencias de ficheiros"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Sa_la"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova conversa…"
-
 # rever
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Mostrar os contactos _desconectados"
-
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
-#: ../src/empathy-main-window.ui.h:28
-msgid "_Room"
-msgstr "Sa_la"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Unirse a pre_feridos"
 
-# rever
-#: ../src/empathy-main-window.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Buscar contactos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Xestionar as preferidas"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Salas de conversa"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4128,22 +4495,22 @@ msgstr ""
 "Contrasinal requirido: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Non foi posíbel arrincar a lista da sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 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 foi posíbel ler a lista da sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Unirse á sala"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
@@ -4153,8 +4520,12 @@ msgstr ""
 "Introduza o nome da sala aquí para unirse ou prema nunha ou máis salas da "
 "lista."
 
-# rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sa_la:"
+
+# rever
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4162,173 +4533,212 @@ msgstr ""
 "Introduza o servidor onde se aloxa a sala ou déixeo baleiro se a sala está "
 "na conta do servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Unirse á sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Non foi posíbel ler a lista da sala"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de _salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:150
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:450
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:700
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:707
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:713
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Nega ao teu pai e rexeita o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:719
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou, se non queres, xúrame tan só que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Y deixarei eu de ser unha Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Debo escoitar máis ou contestar ao dito?"
 
 # rever
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:962
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
+# rever
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "Aparencia"
+msgid "Show _smileys as images"
+msgstr "Mostrar as _emoticonas como imaxes"
 
+# rever
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "Comportamento"
+msgid "Show contact _list in rooms"
+msgstr "Mostrar a _lista de contactos nas salas"
 
-# rever
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "T_ema da conversa:"
+msgid "Appearance"
+msgstr "Aparencia"
 
-# rever
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
+msgid "Start chats in:"
+msgstr "Iniciar conversas en:"
 
-# rever
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
+msgid "new ta_bs"
+msgstr "lapelas no_vas"
 
 #: ../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"
+msgid "new _windows"
+msgstr "xan_elas novas"
 
-# rever
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "Activar as notificacións cando un contacto está conectado"
+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:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "Activar as notificacións cando un contacto está desconectado"
+msgid "_Automatically connect on startup"
+msgstr "_Conectar automaticamente ao iniciar"
 
-# rever
 #: ../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"
+msgid "Log conversations"
+msgstr "Rexistrar conversas"
 
-# rever
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "Activar a verificación ortográfica para os idiomas:"
+msgid "Behavior"
+msgstr "Comportamento"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Xeral"
 
+# rever
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_Activar as burbullas de notificación"
+
+# rever
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "Fontes de localización:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 
+# rever
 #: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "Rexistrar conversas"
+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:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar as notificacións cando un contacto está conectado"
+
+# rever
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar as notificacións cando un contacto está desconectado"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Activar as notificacións de son"
+
+# rever
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
+
+# rever
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "Privacidade"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"A cancelación de eco axúdalle a facer o son da súa voz máis claro ás outras "
+"persoas pero pode causar problemas nalgúns computadores. Se vostede ou outra "
+"persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
+"tente desactivando a cancelación do eco e reiniciando a chamada."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publicar a miña localización aos meus contactos"
+
+#: ../src/empathy-preferences.ui.h:27
 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 "
@@ -4338,26 +4748,34 @@ msgstr ""
 "a súa cidade, rexión e país serán publicados. As coordenadas GPS serán "
 "aproximadas a 1 valor decimal."
 
-# rever
-#: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "Mostrar as _emoticonas como imaxes"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Reduce location accuracy"
+msgstr "_Reducir a precisión de localización"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "Privacidade"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
 
 # rever
-#: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "Mostrar a _lista de contactos nas salas"
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "_Teléfono móbil"
 
-#: ../src/empathy-preferences.ui.h:21
-msgid "Sounds"
-msgstr "Sons"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rede (IP, Wifi)"
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "Verificación ortográfica"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Fontes de localización:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4365,125 +4783,148 @@ msgstr ""
 "A lista de idiomas reflicte só naqueles idiomas para os que ten un "
 "dicionario instalado."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Theme Variant:"
-msgstr "Variante do tema:"
+# rever
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "Activar a verificación ortográfica para os idiomas:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Verificación ortográfica"
 
-#: ../src/empathy-preferences.ui.h:25
+# rever
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "T_ema da conversa:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temas"
 
-# rever
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Automatically connect on startup"
-msgstr "_Conectar automaticamente ao iniciar"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Estado"
 
-# rever
-#: ../src/empathy-preferences.ui.h:27
-msgid "_Cellphone"
-msgstr "_Teléfono móbil"
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Saír"
 
-# rever
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable bubble notifications"
-msgstr "_Activar as burbullas de notificación"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "Remarcación"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "V_ídeo"
 
 # rever
-#: ../src/empathy-preferences.ui.h:29
-msgid "_Enable sound notifications"
-msgstr "_Activar as notificacións de son"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo desactivado"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "Previsualizar o vídeo"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wifi)"
+# rever
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "Vídeo activado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Open new chats in separate windows"
-msgstr "A_brir as conversas novas en xanelas separadas"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Chamar ao contacto de novo"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Publish location to my contacts"
-msgstr "_Publicar a miña localización aos meus contactos"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "Cámara desactivada"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Reduce location accuracy"
-msgstr "_Reducir a precisión de localización"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar cámara e deter o envío do vídeo"
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "Status"
-msgstr "Estado"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Previsualizar"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Quit"
-msgstr "_Saír"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Activar cámara pero non enviar o vídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Cámara activada"
+
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Activar cámara e enviar o vídeo"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4491,16 +4932,16 @@ msgstr ""
 "O xestor de conexión seleccionado non é compatíbel coa extensión de "
 "depuración remota."
 
-#: ../src/empathy-invite-participant-dialog.c:417
-#: ../src/empathy-invite-participant-dialog.c:465
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:418
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccione o contacto que quere invitar á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:461
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Invitar"
 
@@ -4525,16 +4966,29 @@ msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "Mostrar o asistente de contas"
+
+# rever
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Mostrar un servizo en particular"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Depurador de Empathy"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
@@ -4543,47 +4997,300 @@ msgstr "Depurador de Empathy"
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "Responder con vídeo"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Declinar"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../src/empathy-notifications-approver.c:226
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Fornecer"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "Chamada perdida de %s"
-
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2936
+msgid "On hold"
+msgstr "En espera"
+
+#: ../src/empathy-call-window.c:2939
+msgid "Mute"
+msgstr "Silenciar"
+
+#: ../src/empathy-call-window.c:2941
+msgid "Duration"
+msgstr "Duración"
+
+# rever
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2944
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "O seu balance actual é %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Non ten crédito dabondo para facer esta chamada."
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Recargar"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
+# rever
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Engadindo conta nova"
+
+# rever
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos ligados"
+
+# rever
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccione os contactos a ligar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa do contacto novo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
+
+# rever
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Ligar contactos…"
+
+# rever
+#~ msgid "Link Contacts"
+#~ msgstr "Ligar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desligar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Separar por completo o contacto ligado nos contactos que contén."
+
+#~ msgid "_Link"
+#~ msgstr "_Ligar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desexa desligar os contactos ligados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Está seguro que quere desligar estes contactos ligados? Isto separará por "
+#~ "completo os contactos ligados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desligar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información persoal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información _persoal"
+
+# rever
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_brir as conversas novas en xanelas separadas"
+
+#~ msgid "Call volume"
+#~ msgstr "Volume da chamada"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume da chamada, como porcentaxe."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "O tipo de socket non é compatíbel"
+
+# rever
+#~ msgid "My Web Accounts"
+#~ msgstr "As miñas contas web"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A conta %s edítase mediante %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Non é posíbel editar a conta %s en Empathy."
+
+# rever
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Iniciar My Web Accounts"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editar %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncelar"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+# rever
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Vai crear unha conta nova, e descartaranse os seus cambios \n"
+#~ "Está seguro de que quere proceder?"
+
+#~ msgid "Input level:"
+#~ msgstr "Nivel de entrada:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Volume de entrada:"
+
+# rever
+#~ msgid "Contact ID:"
+#~ msgstr "ID do contacto:"
+
+#~ msgid "C_hat"
+#~ msgstr "Con_versa"
+
+# rever
+#~ msgid "Send _Video"
+#~ msgstr "Enviar _Vídeo"
+
+#~ msgid "C_all"
+#~ msgstr "Ch_amar"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Estabeleza a súa presenza e estado actual"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy migrou os seus rexistros de butterfly"
+
+# rever
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Indica se Empathy migrou os seus rexistros de butterfly."
+
+#~ msgid "Ungrouped"
+#~ msgstr "Sen grupo"
+
+# rever
+#~ msgid "Favorite People"
+#~ msgstr "Persoas favoritas"
+
+# rever
+#~ msgid "Select a contact"
+#~ msgstr "Seleccione un contacto"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "O contacto seleccionado non pode recibir ficheiros."
+
+# rever
+#~ msgid "The selected contact is offline."
+#~ msgstr "O contacto seleccionado desconectouse."
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Descoñecido"
+
+#~ msgid "Find Next"
+#~ msgstr "Buscar seguinte"
+
+#~ msgid "Find Previous"
+#~ msgstr "Buscar anterior"
+
+# rever
+#~ msgid "Show and edit accounts"
+#~ msgstr "Mostrar e editar contas"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "Chamada con %d participantes"
+
+#~ msgid "_Dialpad"
+#~ msgstr "_Marcador"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "Insira unha mensaxe personalizada"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "Gardar a mensaxe de estado _novo"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "Mensaxes de estado gardados"
+
+#~ msgid "All"
+#~ msgstr "Todas"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Conversations"
+#~ msgstr "Conversas"
+
+# rever
+#~ msgid "Previous Conversations"
+#~ msgstr "Conversas previas"
+
+# rever
+#~ msgid "_For:"
+#~ msgstr "_Por:"
+
 #~ msgid "_Enabled"
 #~ msgstr "_Activado"