Updated Galician translations

diff --git a/po/gl.po b/po/gl.po
index 93f845eda1d40307d2cb75456831c5c67b0db249..a36c4cd9cf06ac3acd9fa10202db0bc074b0ca97 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-06-19 15:15+0200\n"
-"PO-Revision-Date: 2010-06-19 15:18+0200\n"
+"POT-Creation-Date: 2010-07-07 17:41+0200\n"
+"PO-Revision-Date: 2010-07-07 17:44+0200\n"

 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"

-"Language-Team: Galician <gnome@g11.net>\n"
+"Language-Team: Galician <gnome@g11n.net>\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\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
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1


@@ -99,89 +99,91 @@ msgid "Disable sounds when away"
 msgstr "Desactivar os sons cando se está ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgstr "Desactivar os sons cando se está ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11

+msgid "Display incoming events in the status area"
+msgstr "Mostrar os eventos de entrada na área de estado"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false present them right away "
+"to the user."
+msgstr ""
+
+#: ../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 "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../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 "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../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 "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../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"
 
 # rever
 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:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17

 msgid "Empathy default download folder"
 msgstr "Cartafol de descargas predefinido do Empathy"
 
 # rever
 msgid "Empathy default download folder"
 msgstr "Cartafol de descargas predefinido do Empathy"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18

 msgid "Empathy has asked about importing accounts"
 msgstr "O Empathy preguntou sobre a importación de contas"
 
 msgid "Empathy has asked about importing accounts"
 msgstr "O Empathy preguntou sobre a importación de contas"
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19

 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy migrou os seus rexistros de butterfly"
 
 # rever
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy migrou os seus rexistros de butterfly"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20

 msgid "Empathy should auto-away when idle"
 msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
 
 # rever
 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:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21

 msgid "Empathy should auto-connect on startup"
 msgstr "O Empathy debería conectarse automaticamente ao inicio"
 
 # rever
 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:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22

 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23

 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24

 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 # rever
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25

 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
 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:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26

 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27

 msgid "Hide main window"
 msgstr "Ocultar a xanela principal"
 
 # rever
 msgid "Hide main window"
 msgstr "Ocultar a xanela principal"
 
 # rever

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28

 msgid "Hide the main window."
 msgstr "Ocultar a xanela principal."
 
 msgid "Hide the main window."
 msgstr "Ocultar a xanela principal."
 

-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "Importáronse as contas MC 4"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "Importáronse as contas MC 4."
-

 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Nick completed character"


@@ -722,7 +724,7 @@ msgid "Certificate error"
 msgstr "Erro de certificado"
 
 # rever
 msgstr "Erro de certificado"
 
 # rever

-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:106
+#: ../libempathy/empathy-utils.c:430

 msgid "People Nearby"
 msgstr "Persoas próximas"
 
 msgid "People Nearby"
 msgstr "Persoas próximas"
 


@@ -1265,60 +1267,51 @@ msgstr "Todos os ficheiros"
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 

-#: ../libempathy-gtk/empathy-chat.c:239
-msgid "Failed to reconnect this chat"
-msgstr "Produciuse un fallo ao reconectar á conversa"
-
-# rever
-#: ../libempathy-gtk/empathy-chat.c:661
-msgid "Failed to join chat room"
-msgstr "Produciuse un fallo ao unirse á sala de conversa"
-
-#: ../libempathy-gtk/empathy-chat.c:679
+#: ../libempathy-gtk/empathy-chat.c:644

 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 

-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:683

 msgid "Topic not supported on this conversation"
 msgstr "Ese asunto non se admite nesta conversación"
 
 msgid "Topic not supported on this conversation"
 msgstr "Ese asunto non se admite nesta conversación"
 

-#: ../libempathy-gtk/empathy-chat.c:724
+#: ../libempathy-gtk/empathy-chat.c:689

 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 

-#: ../libempathy-gtk/empathy-chat.c:855
+#: ../libempathy-gtk/empathy-chat.c:821

 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 

-#: ../libempathy-gtk/empathy-chat.c:858
+#: ../libempathy-gtk/empathy-chat.c:824

 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 

-#: ../libempathy-gtk/empathy-chat.c:861
+#: ../libempathy-gtk/empathy-chat.c:827

 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
 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:864
+#: ../libempathy-gtk/empathy-chat.c:830

 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
 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:867
+#: ../libempathy-gtk/empathy-chat.c:833

 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact id> [<message>], abre unha conversa privada"
 

-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:836

 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact id> <message>, abre unha conversa privada"
 

-#: ../libempathy-gtk/empathy-chat.c:873
+#: ../libempathy-gtk/empathy-chat.c:839

 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
 
 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:876
+#: ../libempathy-gtk/empathy-chat.c:842

 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
 
 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:879
+#: ../libempathy-gtk/empathy-chat.c:845

 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 "
 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 "


@@ -1328,7 +1321,7 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 

-#: ../libempathy-gtk/empathy-chat.c:884
+#: ../libempathy-gtk/empathy-chat.c:850

 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."


@@ -1336,89 +1329,89 @@ msgstr ""
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 
 "/help [<command>], mostra todas as ordes admitidas. Se <command> está "
 "definida, mostra o seu uso."
 

-#: ../libempathy-gtk/empathy-chat.c:894
+#: ../libempathy-gtk/empathy-chat.c:860

 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 

-#: ../libempathy-gtk/empathy-chat.c:923
+#: ../libempathy-gtk/empathy-chat.c:889

 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 

-#: ../libempathy-gtk/empathy-chat.c:1044
+#: ../libempathy-gtk/empathy-chat.c:1010

 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 

-#: ../libempathy-gtk/empathy-chat.c:1182
+#: ../libempathy-gtk/empathy-chat.c:1148

 msgid "offline"
 msgstr "desconectado"
 
 msgid "offline"
 msgstr "desconectado"
 

-#: ../libempathy-gtk/empathy-chat.c:1185
+#: ../libempathy-gtk/empathy-chat.c:1151

 msgid "invalid contact"
 msgstr "contacto incorrecto"
 
 msgid "invalid contact"
 msgstr "contacto incorrecto"
 

-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1154

 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:1157

 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 
 msgid "too long message"
 msgstr "a mensaxe é demasiado longa"
 

-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1160

 msgid "not implemented"
 msgstr "non implementado"
 
 msgid "not implemented"
 msgstr "non implementado"
 

-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1163

 msgid "unknown"
 msgstr "descoñecido"
 
 # rever
 msgid "unknown"
 msgstr "descoñecido"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:1167

 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 

-#: ../libempathy-gtk/empathy-chat.c:1311 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1277 ../src/empathy-chat-window.c:691

 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:1323
+#: ../libempathy-gtk/empathy-chat.c:1289

 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:1325
+#: ../libempathy-gtk/empathy-chat.c:1291

 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 
 msgid "No topic defined"
 msgstr "Non se definiu un asunto"
 

-#: ../libempathy-gtk/empathy-chat.c:1804
+#: ../libempathy-gtk/empathy-chat.c:1770

 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 

-#: ../libempathy-gtk/empathy-chat.c:1858
+#: ../libempathy-gtk/empathy-chat.c:1824

 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button

-#: ../libempathy-gtk/empathy-chat.c:1876
+#: ../libempathy-gtk/empathy-chat.c:1842

 #: ../libempathy-gtk/empathy-ui-utils.c:1618
 msgid "_Send"
 msgstr "_Enviar"
 
 #: ../libempathy-gtk/empathy-ui-utils.c:1618
 msgid "_Send"
 msgstr "_Enviar"
 

-#: ../libempathy-gtk/empathy-chat.c:1910
+#: ../libempathy-gtk/empathy-chat.c:1876

 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 

-#: ../libempathy-gtk/empathy-chat.c:1987
+#: ../libempathy-gtk/empathy-chat.c:1953

 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:2093
+#: ../libempathy-gtk/empathy-chat.c:2059

 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"


@@ -1426,12 +1419,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.

-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2066

 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 

-#: ../libempathy-gtk/empathy-chat.c:2103
+#: ../libempathy-gtk/empathy-chat.c:2069

 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"


@@ -1439,17 +1432,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.

-#: ../libempathy-gtk/empathy-chat.c:2111
+#: ../libempathy-gtk/empathy-chat.c:2077

 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 

-#: ../libempathy-gtk/empathy-chat.c:2114
+#: ../libempathy-gtk/empathy-chat.c:2080

 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 

-#: ../libempathy-gtk/empathy-chat.c:2118
+#: ../libempathy-gtk/empathy-chat.c:2084

 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"


@@ -1459,48 +1452,48 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.

-#: ../libempathy-gtk/empathy-chat.c:2127
+#: ../libempathy-gtk/empathy-chat.c:2093

 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever

-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2118

 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 

-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2143

 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
 
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
 

-#: ../libempathy-gtk/empathy-chat.c:2316 ../src/empathy-call-window.c:1653
+#: ../libempathy-gtk/empathy-chat.c:2282 ../src/empathy-call-window.c:1653

 msgid "Disconnected"
 msgstr "Desconectado"
 
 msgid "Disconnected"
 msgstr "Desconectado"
 

-#: ../libempathy-gtk/empathy-chat.c:2947
+#: ../libempathy-gtk/empathy-chat.c:2920

 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 

-#: ../libempathy-gtk/empathy-chat.c:2948
+#: ../libempathy-gtk/empathy-chat.c:2921

 msgid "Retry"
 msgstr "Reintentar"
 
 msgid "Retry"
 msgstr "Reintentar"
 

-#: ../libempathy-gtk/empathy-chat.c:2953
+#: ../libempathy-gtk/empathy-chat.c:2926

 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 

-#: ../libempathy-gtk/empathy-chat.c:2954
+#: ../libempathy-gtk/empathy-chat.c:2927

 msgid "Join"
 msgstr "Unirse"
 
 msgid "Join"
 msgstr "Unirse"
 

-#: ../libempathy-gtk/empathy-chat.c:3094
+#: ../libempathy-gtk/empathy-chat.c:3067

 msgid "Connected"
 msgstr "Conectado"
 
 msgid "Connected"
 msgstr "Conectado"
 

-#: ../libempathy-gtk/empathy-chat.c:3147
-#: ../libempathy-gtk/empathy-log-window.c:626
+#: ../libempathy-gtk/empathy-chat.c:3120
+#: ../libempathy-gtk/empathy-log-window.c:639

 msgid "Conversation"
 msgstr "Conversa"
 
 msgid "Conversation"
 msgstr "Conversa"
 


@@ -1545,91 +1538,91 @@ msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
 # rever
 msgstr "Solicitude de subscrición"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-list-view.c:1925
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984

 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
 #, 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:1927
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986

 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove

-#: ../libempathy-gtk/empathy-contact-list-view.c:1976
-#: ../libempathy-gtk/empathy-contact-list-view.c:2053
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112

 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065

 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
 #, 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:2008
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067

 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
 # rever
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-menu.c:205
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13

 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto..."
 
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto..."
 

-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14

 msgid "_Chat"
 msgstr "_Conversa"
 
 msgid "_Chat"
 msgstr "_Conversa"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:261

 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:291

 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-menu.c:336
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:331
+#: ../src/empathy-main-window.ui.h:25

 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:358
+#: ../libempathy-gtk/empathy-contact-menu.c:353

 msgid "Send File"
 msgstr "Enviar ficheiro"
 
 msgid "Send File"
 msgstr "Enviar ficheiro"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:381
+#: ../libempathy-gtk/empathy-contact-menu.c:376

 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-menu.c:421
-#: ../libempathy-gtk/empathy-contact-widget.c:1825
+#: ../libempathy-gtk/empathy-contact-menu.c:416
+#: ../libempathy-gtk/empathy-contact-widget.c:1819

 msgid "Favorite"
 msgstr "Favorito"
 
 msgid "Favorite"
 msgstr "Favorito"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:451
+#: ../libempathy-gtk/empathy-contact-menu.c:445

 msgid "Infor_mation"
 msgstr "Infor_mación"
 
 msgid "Infor_mation"
 msgstr "Infor_mación"
 

-#: ../libempathy-gtk/empathy-contact-menu.c:497
+#: ../libempathy-gtk/empathy-contact-menu.c:491

 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-menu.c:551
+#: ../libempathy-gtk/empathy-contact-menu.c:545

 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
 #: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-menu.c:582
+#: ../libempathy-gtk/empathy-contact-menu.c:576

 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 


@@ -1663,7 +1656,7 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:623
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:623

-#: ../src/empathy-main-window.c:1130
+#: ../src/empathy-main-window.c:1171

 msgid "Group"
 msgstr "Grupo"
 
 msgid "Group"
 msgstr "Grupo"
 


@@ -1765,7 +1758,7 @@ msgid "Altitude:"
 msgstr "Altitude:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:963
 msgstr "Altitude:"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:963

-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12

 msgid "Location"
 msgstr "Localización"
 
 msgid "Location"
 msgstr "Localización"
 


@@ -1773,17 +1766,17 @@ msgstr "Localización"
 msgid "<b>Location</b>, "
 msgstr "<b>Localización</b>, "
 
 msgid "<b>Location</b>, "
 msgstr "<b>Localización</b>, "
 

-#: ../libempathy-gtk/empathy-contact-widget.c:1029
+#: ../libempathy-gtk/empathy-contact-widget.c:1030

 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
 # rever
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-widget.c:1112
+#: ../libempathy-gtk/empathy-contact-widget.c:1113

 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever
 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever

-#: ../libempathy-gtk/empathy-contact-widget.c:1168
+#: ../libempathy-gtk/empathy-contact-widget.c:1169

 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 


@@ -1860,12 +1853,12 @@ msgstr "Porto"
 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: ../libempathy-gtk/empathy-log-window.c:619
+#: ../libempathy-gtk/empathy-log-window.c:632

 #: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "Conta"
 
 #: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "Conta"
 

-#: ../libempathy-gtk/empathy-log-window.c:636
+#: ../libempathy-gtk/empathy-log-window.c:649

 msgid "Date"
 msgstr "Data"
 
 msgid "Date"
 msgstr "Data"
 


@@ -1904,18 +1897,18 @@ msgstr "Conversa nova"
 
 # rever
 #. add video toggle
 
 # rever
 #. add video toggle

-#: ../libempathy-gtk/empathy-new-call-dialog.c:184
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190

 msgid "Send _Video"
 msgstr "Enviar _Vídeo"
 
 #. add chat button
 msgid "Send _Video"
 msgstr "Enviar _Vídeo"
 
 #. add chat button

-#: ../libempathy-gtk/empathy-new-call-dialog.c:192
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198

 #: ../src/empathy-call-window.ui.h:17
 msgid "_Call"
 msgstr "_Chamar"
 
 #. Tweak the dialog
 #: ../src/empathy-call-window.ui.h:17
 msgid "_Call"
 msgstr "_Chamar"
 
 #. Tweak the dialog

-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208

 msgid "New Call"
 msgstr "Nova chamada"
 
 msgid "New Call"
 msgstr "Nova chamada"
 


@@ -2057,10 +2050,10 @@ msgstr "Non foi posíbel abrir o URI"
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 

-# rever
-#: ../libempathy-gtk/empathy-ui-utils.c:1674
-msgid "Select a destination"
-msgstr "Seleccione un destinatario"
+#: ../libempathy-gtk/empathy-ui-utils.c:1679
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Ficheiro entrante de %s"

 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"


@@ -2248,17 +2241,17 @@ msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever

-#: ../src/empathy.c:596
+#: ../src/empathy.c:474

 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever

-#: ../src/empathy.c:600
+#: ../src/empathy.c:478

 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
 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:612
+#: ../src/empathy.c:490

 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensaxaría instantánea Empathy"
 
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensaxaría instantánea Empathy"
 


@@ -2781,7 +2774,7 @@ msgstr "Vídeo activado"
 msgid "Video Preview"
 msgstr "Previsualizar o vídeo"
 
 msgid "Video Preview"
 msgstr "Previsualizar o vídeo"
 

-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:27

 msgid "_View"
 msgstr "_Ver"
 
 msgid "_View"
 msgstr "_Ver"
 


@@ -2830,28 +2823,28 @@ msgstr "C_ontacto"
 msgid "Chat"
 msgstr "Conversa"
 
 msgid "Chat"
 msgstr "Conversa"
 

-# rever

 #: ../src/empathy-chat-window.ui.h:4
 #: ../src/empathy-chat-window.ui.h:4

-msgid "Important Room"
-msgstr "Salas importante"
-
-#: ../src/empathy-chat-window.ui.h:5

 msgid "Insert _Smiley"
 msgstr "Inse_rir unha emoticona"
 
 msgid "Insert _Smiley"
 msgstr "Inse_rir unha emoticona"
 

-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:5

 msgid "Invite _Participant…"
 msgstr "Invitar _participante..."
 
 msgid "Invite _Participant…"
 msgstr "Invitar _participante..."
 

-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:6

 msgid "Move Tab _Left"
 msgstr "Mover o separador á _esquerda"
 
 msgid "Move Tab _Left"
 msgstr "Mover o separador á _esquerda"
 

-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:7

 msgid "Move Tab _Right"
 msgstr "Mover o separador á _dereita"
 
 msgid "Move Tab _Right"
 msgstr "Mover o separador á _dereita"
 

-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+# 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:16

 msgid "_Contents"
 msgstr "_Contidos"
 
 msgid "_Contents"
 msgstr "_Contidos"
 


@@ -2863,7 +2856,7 @@ msgstr "_Conversa"
 msgid "_Detach Tab"
 msgstr "Se_parar o separador"
 
 msgid "_Detach Tab"
 msgstr "Se_parar o separador"
 

-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18

 msgid "_Edit"
 msgstr "_Editar"
 
 msgid "_Edit"
 msgstr "_Editar"
 


@@ -2872,7 +2865,7 @@ msgstr "_Editar"
 msgid "_Favorite Chat Room"
 msgstr "Sala de conversa _favorita"
 
 msgid "_Favorite Chat Room"
 msgstr "Sala de conversa _favorita"
 

-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20

 msgid "_Help"
 msgstr "A_xuda"
 
 msgid "_Help"
 msgstr "A_xuda"
 


@@ -2917,85 +2910,91 @@ msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas preferidas"
 
 # rever
 msgstr "Xestionar as salas preferidas"
 
 # rever

-#: ../src/empathy-event-manager.c:431
+#: ../src/empathy-event-manager.c:471

 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever

-#: ../src/empathy-event-manager.c:431
+#: ../src/empathy-event-manager.c:471

 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever

-#: ../src/empathy-event-manager.c:435
+#: ../src/empathy-event-manager.c:475

 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
 
 # rever
 #, 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:436
+#: ../src/empathy-event-manager.c:476

 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quérelle responder?"
 

-#: ../src/empathy-event-manager.c:458
+#: ../src/empathy-event-manager.c:479 ../src/empathy-event-manager.c:621
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Chamada entrante de %s"
+
+#: ../src/empathy-event-manager.c:504

 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever

-#: ../src/empathy-event-manager.c:464
+#: ../src/empathy-event-manager.c:510

 msgid "_Answer"
 msgstr "_Responder"
 
 msgid "_Answer"
 msgstr "_Responder"
 

-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:621

 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 

-#: ../src/empathy-event-manager.c:572
-#, c-format
-msgid "Incoming call from %s"
-msgstr "Chamada entrante de %s"
-

 # rever
 # rever

-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:698

 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever
 msgid "Room invitation"
 msgstr "Convite para unha sala"
 
 # rever

-#: ../src/empathy-event-manager.c:649
+#: ../src/empathy-event-manager.c:700
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitación a unirse a %s"
+
+# rever
+#: ../src/empathy-event-manager.c:707

 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estao convidando a unirse a %s"
 
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s estao convidando a unirse a %s"
 

-#: ../src/empathy-event-manager.c:657
+#: ../src/empathy-event-manager.c:715

 msgid "_Decline"
 msgstr "_Declinar"
 
 msgid "_Decline"
 msgstr "_Declinar"
 

-#: ../src/empathy-event-manager.c:662
+#: ../src/empathy-event-manager.c:720

 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever

-#: ../src/empathy-event-manager.c:699
+#: ../src/empathy-event-manager.c:758

 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever

-#: ../src/empathy-event-manager.c:725
+#: ../src/empathy-event-manager.c:785

 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
 # rever
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
 # rever

-#: ../src/empathy-event-manager.c:918
+#: ../src/empathy-event-manager.c:985

 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Subscrición solicitada por %s"
 
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "Subscrición solicitada por %s"
 

-#: ../src/empathy-event-manager.c:922
+#: ../src/empathy-event-manager.c:989

 #, c-format
 msgid ""
 "\n"
 #, c-format
 msgid ""
 "\n"


@@ -3004,12 +3003,12 @@ msgstr ""
 "\n"
 "Mensaxe: %s"
 
 "\n"
 "Mensaxe: %s"
 

-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:1032

 #, c-format
 msgid "%s is now offline."
 msgstr "%s está agora desconectado."
 
 #, c-format
 msgid "%s is now offline."
 msgstr "%s está agora desconectado."
 

-#: ../src/empathy-event-manager.c:986
+#: ../src/empathy-event-manager.c:1052

 #, c-format
 msgid "%s is now online."
 msgstr "%s está agora conectado."
 #, c-format
 msgid "%s is now online."
 msgstr "%s está agora conectado."


@@ -3165,118 +3164,112 @@ msgstr "Protocolo"
 msgid "Source"
 msgstr "Orixe"
 
 msgid "Source"
 msgstr "Orixe"
 

-# rever
-#: ../src/empathy-import-mc4-accounts.c:108
-#, c-format
-msgid "%s account"
-msgstr "Conta %s"
-
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:457

 msgid "Reconnect"
 msgstr "Reconectar"
 
 msgid "Reconnect"
 msgstr "Reconectar"
 

-#: ../src/empathy-main-window.c:451
+#: ../src/empathy-main-window.c:463

 msgid "Edit Account"
 msgstr "Editar a conta"
 
 msgid "Edit Account"
 msgstr "Editar a conta"
 

-#: ../src/empathy-main-window.c:457
+#: ../src/empathy-main-window.c:469

 msgid "Close"
 msgstr "Pechar"
 
 msgid "Close"
 msgstr "Pechar"
 

-#: ../src/empathy-main-window.c:1113
+#: ../src/empathy-main-window.c:1154

 msgid "Contact"
 msgstr "Contacto"
 
 msgid "Contact"
 msgstr "Contacto"
 

+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "Lista de contactos"
+

 # rever
 # rever

-#: ../src/empathy-main-window.c:1499
+#: ../src/empathy-main-window.c:1583

 msgid "Show and edit accounts"
 msgstr "Mostrar e editar contas"
 
 #: ../src/empathy-main-window.ui.h:1
 msgid "Show and edit accounts"
 msgstr "Mostrar e editar contas"
 
 #: ../src/empathy-main-window.ui.h:1

-msgid "Contact List"
-msgstr "Lista de contactos"
-
-#: ../src/empathy-main-window.ui.h:2

 msgid "Contacts on a _Map"
 msgstr "Contactos no mapa"
 
 msgid "Contacts on a _Map"
 msgstr "Contactos no mapa"
 

-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2

 msgid "Context"
 msgstr "Contexto"
 
 # rever
 msgid "Context"
 msgstr "Contexto"
 
 # rever

-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3

 msgid "Join _Favorites"
 msgstr "Unirse a pre_feridos"
 
 msgid "Join _Favorites"
 msgstr "Unirse a pre_feridos"
 

-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4

 msgid "Manage Favorites"
 msgstr "Xestionar as preferidas"
 
 msgid "Manage Favorites"
 msgstr "Xestionar as preferidas"
 

-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5

 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 
 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 

-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1

 msgid "New _Call…"
 msgstr "Nova _chamada..."
 
 msgid "New _Call…"
 msgstr "Nova _chamada..."
 

-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7

 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 
 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 

-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8

 msgid "P_references"
 msgstr "P_referencias"
 
 msgid "P_references"
 msgstr "P_referencias"
 

-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9

 msgid "Show P_rotocols"
 msgstr "Mostrar os p_rotocolos"
 
 # rever
 msgid "Show P_rotocols"
 msgstr "Mostrar os p_rotocolos"
 
 # rever

-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10

 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever

-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11

 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 

-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12

 msgid "_Accounts"
 msgstr "_Contas"
 
 msgid "_Accounts"
 msgstr "_Contas"
 

-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15

 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 

-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17

 msgid "_Debug"
 msgstr "_Depuración"
 
 msgid "_Debug"
 msgstr "_Depuración"
 

-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19

 msgid "_File Transfers"
 msgstr "Trans_ferencias de ficheiros"
 
 msgid "_File Transfers"
 msgstr "Trans_ferencias de ficheiros"
 

-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21

 msgid "_Join…"
 msgstr "_Unirse..."
 
 msgid "_Join…"
 msgstr "_Unirse..."
 

-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3

 msgid "_New Conversation…"
 msgstr "_Nova conversa..."
 
 # rever
 msgid "_New Conversation…"
 msgstr "_Nova conversa..."
 
 # rever

-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23

 msgid "_Offline Contacts"
 msgstr "Mostrar os contactos _desconectados"
 
 msgid "_Offline Contacts"
 msgstr "Mostrar os contactos _desconectados"
 

-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24

 msgid "_Personal Information"
 msgstr "Información _persoal"
 
 msgid "_Personal Information"
 msgstr "Información _persoal"
 

-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26

 msgid "_Room"
 msgstr "Sa_la"
 
 msgid "_Room"
 msgstr "Sa_la"
 


@@ -3351,42 +3344,46 @@ msgstr "Lista de _salas"
 msgid "_Room:"
 msgstr "Sa_la:"
 
 msgid "_Room:"
 msgstr "Sa_la:"
 

-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:136

 msgid "Message received"
 msgstr "Mensaxe recibida"
 
 msgid "Message received"
 msgstr "Mensaxe recibida"
 

-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:137

 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 

-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:138

 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever

-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:139

 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever
 msgid "Contact goes online"
 msgstr "O contacto conéctase"
 
 # rever

-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:140

 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever

-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:141

 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever

-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:142

 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 

-#: ../src/empathy-preferences.c:426
+#: ../src/empathy-preferences.c:437

 msgid "Language"
 msgstr "Idioma"
 
 msgid "Language"
 msgstr "Idioma"
 

+#: ../src/empathy-preferences.c:873
+msgid "Preferences"
+msgstr "Preferencias"
+

 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "Aparencia"
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "Aparencia"


@@ -3410,47 +3407,47 @@ msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 

-# rever

 #: ../src/empathy-preferences.ui.h:6
 #: ../src/empathy-preferences.ui.h:6

+msgid "Display incoming events in the notification area"
+msgstr "Mostrar os eventos de entrada na área de notificación"
+
+# rever
+#: ../src/empathy-preferences.ui.h:7

 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar as notificacións cando un contacto está conectado"
 
 # rever

-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8

 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificacións cando un contacto está desconectado"
 
 # rever
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar as notificacións cando un contacto está desconectado"
 
 # rever

-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:9

 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar as notificacións cando a _conversa non está enfocada"
 
 # rever
 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:9
+#: ../src/empathy-preferences.ui.h:10

 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 

-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11

 msgid "General"
 msgstr "Xeral"
 
 msgid "General"
 msgstr "Xeral"
 

-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13

 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 

-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14

 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever

-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:15

 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 

-#: ../src/empathy-preferences.ui.h:15
-msgid "Preferences"
-msgstr "Preferencias"
-

 #: ../src/empathy-preferences.ui.h:16
 msgid "Privacy"
 msgstr "Privacidade"
 #: ../src/empathy-preferences.ui.h:16
 msgid "Privacy"
 msgstr "Privacidade"


@@ -3537,10 +3534,27 @@ msgstr "_Publicar a miña localización aos meus contactos"
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión de localización"
 
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión de localización"
 

-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:141

 msgid "Respond"
 msgstr "Responder"
 
 msgid "Respond"
 msgstr "Responder"
 

+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "Rexeitar"
+
+# rever
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "Responder"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "Declinar"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "Aceptar"
+

 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Estado"
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Estado"


@@ -3553,63 +3567,63 @@ msgstr "_Saír"
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 

-#: ../src/empathy-debug-window.c:1154
+#: ../src/empathy-debug-window.c:1168

 msgid "Save"
 msgstr "Gardar"
 
 msgid "Save"
 msgstr "Gardar"
 

-#: ../src/empathy-debug-window.c:1330
+#: ../src/empathy-debug-window.c:1344

 msgid "Debug Window"
 msgstr "Depurar xanela"
 
 msgid "Debug Window"
 msgstr "Depurar xanela"
 

-#: ../src/empathy-debug-window.c:1410
+#: ../src/empathy-debug-window.c:1424

 msgid "Pause"
 msgstr "Pausa"
 
 msgid "Pause"
 msgstr "Pausa"
 

-#: ../src/empathy-debug-window.c:1422
+#: ../src/empathy-debug-window.c:1436

 msgid "Level "
 msgstr "Nivel"
 
 msgid "Level "
 msgstr "Nivel"
 

-#: ../src/empathy-debug-window.c:1442
+#: ../src/empathy-debug-window.c:1456

 msgid "Debug"
 msgstr "Depuración"
 
 msgid "Debug"
 msgstr "Depuración"
 

-#: ../src/empathy-debug-window.c:1448
+#: ../src/empathy-debug-window.c:1462

 msgid "Info"
 msgstr "Información"
 
 msgid "Info"
 msgstr "Información"
 

-#: ../src/empathy-debug-window.c:1454 ../src/empathy-debug-window.c:1503
+#: ../src/empathy-debug-window.c:1468 ../src/empathy-debug-window.c:1517

 msgid "Message"
 msgstr "Mensaxe"
 
 msgid "Message"
 msgstr "Mensaxe"
 

-#: ../src/empathy-debug-window.c:1460
+#: ../src/empathy-debug-window.c:1474

 msgid "Warning"
 msgstr "Aviso"
 
 msgid "Warning"
 msgstr "Aviso"
 

-#: ../src/empathy-debug-window.c:1466
+#: ../src/empathy-debug-window.c:1480

 msgid "Critical"
 msgstr "Crítico"
 
 msgid "Critical"
 msgstr "Crítico"
 

-#: ../src/empathy-debug-window.c:1472
+#: ../src/empathy-debug-window.c:1486

 msgid "Error"
 msgstr "Erro"
 
 msgid "Error"
 msgstr "Erro"
 

-#: ../src/empathy-debug-window.c:1491
+#: ../src/empathy-debug-window.c:1505

 msgid "Time"
 msgstr "Tempo"
 
 msgid "Time"
 msgstr "Tempo"
 

-#: ../src/empathy-debug-window.c:1494
+#: ../src/empathy-debug-window.c:1508

 msgid "Domain"
 msgstr "Dominio"
 
 msgid "Domain"
 msgstr "Dominio"
 

-#: ../src/empathy-debug-window.c:1496
+#: ../src/empathy-debug-window.c:1510

 msgid "Category"
 msgstr "Categoría"
 
 msgid "Category"
 msgstr "Categoría"
 

-#: ../src/empathy-debug-window.c:1498
+#: ../src/empathy-debug-window.c:1512

 msgid "Level"
 msgstr "Nivel"
 
 msgid "Level"
 msgstr "Nivel"
 

-#: ../src/empathy-debug-window.c:1535
+#: ../src/empathy-debug-window.c:1549

 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."


@@ -3630,31 +3644,31 @@ msgstr "Seleccione o contacto que quere invitar á conversa:"
 msgid "Invite"
 msgstr "Invitar"
 
 msgid "Invite"
 msgstr "Invitar"
 

-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-accounts.c:182

 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
 
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
 

-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186

 msgid "Don't display any dialogs if there are any non-salut accounts"
 msgstr "Non mostrar ningún diálogo se hai algunha conta non-salut"
 
 msgid "Don't display any dialogs if there are any non-salut accounts"
 msgstr "Non mostrar ningún diálogo se hai algunha conta non-salut"
 

-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190

 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
 "foo_40exemplo_2eorg0)"
 
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
 "foo_40exemplo_2eorg0)"
 

-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192

 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever

-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200

 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever

-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216

 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 


@@ -3662,6 +3676,31 @@ msgstr "Contas de Empathy"
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 

+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "Produciuse un fallo ao reconectar á conversa"
+
+# rever
+#~ msgid "Failed to join chat room"
+#~ msgstr "Produciuse un fallo ao unirse á sala de conversa"
+
+# rever
+#~ msgid "Select a destination"
+#~ msgstr "Seleccione un destinatario"
+
+# rever
+#~ msgid "Important Room"
+#~ msgstr "Salas importante"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "Importáronse as contas MC 4"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "Importáronse as contas MC 4."
+
+# rever
+#~ msgid "%s account"
+#~ msgstr "Conta %s"
+

 #~ msgid "Empathy IM Client"
 #~ msgstr "Cliente de mensaxería Empathy"
 
 #~ msgid "Empathy IM Client"
 #~ msgstr "Cliente de mensaxería Empathy"