Updated Galician translations

1 files changed, 377 insertions, 360 deletions

diff --git a/po/gl.po b/po/gl.po
index 9ba76756..5196e41d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-11 11:27+0200\n"
-"PO-Revision-Date: 2012-05-11 11:28+0200\n"
+"POT-Creation-Date: 2012-05-15 23:47+0200\n"
+"PO-Revision-Date: 2012-05-15 23:49+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -42,7 +42,7 @@ msgstr "Converse en Google Talk, Facebook, MSN e moitos máis servizos de chat"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2512
+#: ../src/empathy-accounts-dialog.c:2511
 msgid "Messaging and VoIP Accounts"
 msgstr "Contas de mensaxaría e Voz IP"
 
@@ -115,6 +115,7 @@ msgstr ""
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "Mostrar contactos desconectados"
 
@@ -652,53 +653,53 @@ msgstr ""
 "motivos de privacidade."
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 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:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "O contacto remoto non admite a tranferencia de ficheiros"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
@@ -718,157 +719,157 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "Non se forneceu o certificado"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "Certificado sen confianza"
 
 # rever
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "O certificado expirou"
 
 # rever
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "Erro do certificado"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:354
 msgid "This account is already connected to the server"
 msgstr "Esta conta xa está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexión foi substituída por unha conexión nova empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Nestes intres o servidor está demasiado ocupado para xestionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 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:369
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -877,29 +878,29 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía"
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:374
 msgid "Internal error"
 msgstr "Erro interno"
 
 # rever
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:533
 msgid "People Nearby"
 msgstr "Xente cerca"
 
 # rever
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:538
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:567
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:568
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
@@ -1700,7 +1701,7 @@ msgstr "non implementado"
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-chat.c:1682 ../src/empathy-chat-window.c:918
 msgid "Topic:"
 msgstr "Asunto:"
 
@@ -1819,9 +1820,9 @@ msgstr "%s agora é coñecido como %s"
 #. 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:2969 ../src/empathy-event-manager.c:1184
-#: ../src/empathy-call-window.c:1464 ../src/empathy-call-window.c:1514
-#: ../src/empathy-call-window.c:2560
+#: ../libempathy-gtk/empathy-chat.c:2969 ../src/empathy-event-manager.c:1167
+#: ../src/empathy-call-window.c:1463 ../src/empathy-call-window.c:1513
+#: ../src/empathy-call-window.c:2559
 msgid "Disconnected"
 msgstr "Desconectado"
 
@@ -1857,7 +1858,7 @@ msgstr "Esta sala está protexida por un contrasinal:"
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1205
+#: ../libempathy-gtk/empathy-chat.c:4046 ../src/empathy-event-manager.c:1188
 msgid "Connected"
 msgstr "Conectado"
 
@@ -1930,30 +1931,30 @@ msgstr "_Abrir a ligazón"
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-contact-dialogs.c:325
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-contact-dialogs.c:394
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-contact-dialogs.c:399
 #: ../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-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:404
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-contact-dialogs.c:422
 #: ../libempathy-gtk/empathy-individual-dialogs.c:283
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
@@ -2132,7 +2133,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:860
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:42
 msgid "Location"
 msgstr "Localización"
 
@@ -2300,7 +2301,6 @@ msgid "Select"
 msgstr "Seleccionar"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:403
-#: ../src/empathy-roster-window.c:1969
 msgid "Group"
 msgstr "Grupo"
 
@@ -2363,14 +2363,13 @@ 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "_Conversa"
 
 #. add SMS button
 #: ../libempathy-gtk/empathy-individual-menu.c:1052
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
@@ -2386,7 +2385,7 @@ msgstr "_Videochamada"
 
 # rever
 #: ../libempathy-gtk/empathy-individual-menu.c:1159
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
@@ -2425,7 +2424,7 @@ msgstr "_Editar"
 # rever
 #. send invitation
 #: ../libempathy-gtk/empathy-individual-menu.c:1562
-#: ../src/empathy-chat-window.c:1190
+#: ../src/empathy-chat-window.c:1189
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
@@ -2436,7 +2435,6 @@ msgstr "Conv_idar a sala de conversa"
 
 # rever
 #: ../libempathy-gtk/empathy-individual-menu.c:1804
-#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
@@ -2625,7 +2623,7 @@ msgid "Text chats"
 msgstr "Conversas de texto"
 
 #: ../libempathy-gtk/empathy-log-window.c:3035
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:32
 msgid "Calls"
 msgstr "Chamadas"
 
@@ -2665,7 +2663,6 @@ msgstr "_Ficheiro"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../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"
 
@@ -2678,7 +2675,7 @@ msgid "Profile"
 msgstr "Perfíl"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:14
 msgid "Chat"
 msgstr "Conversa"
 
@@ -2696,82 +2693,82 @@ msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Cargando…</span>"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "O contacto está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "Vostede foi bloqueado nesta canle"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "Esta canel está completa"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "Non é posíbel continuar mentres estea desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 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:200
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
 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:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "_Audio Call"
 msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:243
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
 msgid "New Call"
 msgstr "Nova chamada"
 
 #: ../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>"
+msgid "Authentication 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
@@ -2789,26 +2786,26 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:166
-#: ../libempathy-gtk/empathy-presence-chooser.c:202
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Message…"
 msgstr "Mensaxe personalizada…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
 msgid "Edit Custom Messages…"
 msgstr "Editar mensaxes personalizadas…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "Faga clic para eliminar este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "Faga clic para facer este estado un dos favoritos"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2818,12 +2815,12 @@ msgstr ""
 "<small><i>Prema Intro para estabelecer o novo mensaxe ou Esc para cancelar.</"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:396
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "Estabelecer status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1147
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messages…"
 msgstr "Mensaxes personalizadas…"
 
@@ -3231,25 +3228,25 @@ msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:425
+#: ../src/empathy.c:428
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:429
+#: ../src/empathy.c:432
 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:445
+#: ../src/empathy.c:448
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:621
+#: ../src/empathy.c:624
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3316,40 +3313,40 @@ msgstr ""
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:71
+#: ../src/empathy-accounts-dialog.c:70
 #, 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:75
+#: ../src/empathy-accounts-dialog.c:74
 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:404 ../src/empathy-call-window.c:1266
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1265
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:444
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:456
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:467
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:474
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:491
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3358,39 +3355,39 @@ msgstr ""
 "Esta conta desactivouse porque básease nun «backend» non compatíbel. Instale "
 "telepathy-haze e reinicie a sesión para migrar esta conta."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:501
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:607
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:771
+#: ../src/empathy-accounts-dialog.c:770
 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:777
+#: ../src/empathy-accounts-dialog.c:776
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar a súa información persoal"
 
-#: ../src/empathy-accounts-dialog.c:851
+#: ../src/empathy-accounts-dialog.c:850
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1347
+#: ../src/empathy-accounts-dialog.c:1346
 #, 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:1351
+#: ../src/empathy-accounts-dialog.c:1350
 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:1556
+#: ../src/empathy-accounts-dialog.c:1555
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3399,25 +3396,25 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1747
+#: ../src/empathy-accounts-dialog.c:1746
 msgid "_Enabled"
 msgstr "_Activado"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1770
+#: ../src/empathy-accounts-dialog.c:1769
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/empathy-accounts-dialog.c:2186
+#: ../src/empathy-accounts-dialog.c:2185
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2190
+#: ../src/empathy-accounts-dialog.c:2189
 msgid "_Connect"
 msgstr "_Conectar"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:2369
+#: ../src/empathy-accounts-dialog.c:2368
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3473,22 +3470,18 @@ msgid "_Settings"
 msgstr "_Preferencias"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_View"
 msgstr "_Ver"
 
 #: ../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 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Índice"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Depurar"
 
@@ -3558,9 +3551,9 @@ msgstr "Activar/desactivar transmisión de audio"
 msgid "Encoding Codec:"
 msgstr "Códec de codificación:"
 
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2512
-#: ../src/empathy-call-window.c:2513 ../src/empathy-call-window.c:2514
-#: ../src/empathy-call-window.c:2515
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2511
+#: ../src/empathy-call-window.c:2512 ../src/empathy-call-window.c:2513
+#: ../src/empathy-call-window.c:2514
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -3576,16 +3569,16 @@ msgstr "Candidato remoto:"
 msgid "Local Candidate:"
 msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:31
 msgid "Audio"
 msgstr "Son"
 
 # rever
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:287
 msgid "Close this window?"
 msgstr "Pechar esta xanela?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:292
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3594,7 +3587,7 @@ msgstr ""
 "Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que "
 "se una de novo."
 
-#: ../src/empathy-chat-window.c:304
+#: ../src/empathy-chat-window.c:303
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3609,59 +3602,59 @@ 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:313
+#: ../src/empathy-chat-window.c:312
 #, c-format
 msgid "Leave %s?"
 msgstr "Pechar %s?"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:313
 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:333
+#: ../src/empathy-chat-window.c:332
 msgid "Close window"
 msgstr "Pechar a xanela"
 
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:332
 msgid "Leave room"
 msgstr "Abandonar a sala"
 
-#: ../src/empathy-chat-window.c:639 ../src/empathy-chat-window.c:659
+#: ../src/empathy-chat-window.c:638 ../src/empathy-chat-window.c:658
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sen ler)"
 msgstr[1] "%s (%d sen ler)"
 
-#: ../src/empathy-chat-window.c:651
+#: ../src/empathy-chat-window.c:650
 #, 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:667
+#: ../src/empathy-chat-window.c:666
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sen ler de outros)"
 msgstr[1] "%s (%d sen ler de outros)"
 
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:675
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sen ler de todos)"
 msgstr[1] "%s (%d sen ler de todos)"
 
-#: ../src/empathy-chat-window.c:891
+#: ../src/empathy-chat-window.c:890
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:901
+#: ../src/empathy-chat-window.c:900
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3669,7 +3662,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:923
+#: ../src/empathy-chat-window.c:922
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -3761,7 +3754,7 @@ msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1481
+#: ../src/empathy-event-manager.c:510 ../src/empathy-call-window.c:1480
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
@@ -3777,8 +3770,8 @@ msgstr "%s está chamándoo con vídeo. Desexa responderlle?"
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quere responder?"
 
-#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:925
-#: ../src/empathy-call-window.c:1487
+#: ../src/empathy-event-manager.c:518 ../src/empathy-event-manager.c:915
+#: ../src/empathy-call-window.c:1486
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
@@ -3797,63 +3790,63 @@ msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 # rever
-#: ../src/empathy-event-manager.c:719
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "Convite a unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:728
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidándoo a unirse a %s"
 
-#: ../src/empathy-event-manager.c:736
+#: ../src/empathy-event-manager.c:731
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../src/empathy-event-manager.c:741
+#: ../src/empathy-event-manager.c:736
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:768
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:774
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:925 ../src/empathy-call-window.c:1487
+#: ../src/empathy-event-manager.c:915 ../src/empathy-call-window.c:1486
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:962
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:999 ../src/empathy-roster-window.c:373
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:357
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1121
+#: ../src/empathy-event-manager.c:1105
 #, 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:1127
+#: ../src/empathy-event-manager.c:1111
 #, c-format
 msgid ""
 "\n"
@@ -4017,77 +4010,61 @@ msgstr "Protocolo"
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-roster-window.c:390
+#: ../src/empathy-roster-window.c:374
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:396
+#: ../src/empathy-roster-window.c:380
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-roster-window.c:656
+#: ../src/empathy-roster-window.c:640
 msgid "You need to setup an account to see contacts here."
 msgstr "Debe configurar unha conta para ver contactos aquí."
 
 # rever
-#: ../src/empathy-roster-window.c:672
+#: ../src/empathy-roster-window.c:656
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:782
+#: ../src/empathy-roster-window.c:766
 #, 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:848
+#: ../src/empathy-roster-window.c:832
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:854 ../src/empathy-roster-window.c:971
+#: ../src/empathy-roster-window.c:838 ../src/empathy-roster-window.c:955
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:959
+#: ../src/empathy-roster-window.c:943
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:965
+#: ../src/empathy-roster-window.c:949
 msgid "Edit Account"
 msgstr "Editar a conta"
 
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1109
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "Recargar %s (%s)…"
-
-#: ../src/empathy-roster-window.c:1155
-msgid "Top up account credit"
-msgstr "Recargar o saldo da conta"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1227
-msgid "Top Up..."
-msgstr "Recargar…"
+#: ../src/empathy-roster-window.c:1129
+msgid "Top up account"
+msgstr "Recargar conta"
 
-#: ../src/empathy-roster-window.c:1951
-msgid "Contact"
-msgstr "Contacto"
-
-#: ../src/empathy-roster-window.c:2149
+#: ../src/empathy-roster-window.c:1824
 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:2157
+#: ../src/empathy-roster-window.c:1832
 #, 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:2459
+#: ../src/empathy-roster-window.c:2148 ../src/empathy-preferences.ui.h:7
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4095,97 +4072,74 @@ msgstr "Lista de contactos"
 msgid "Account settings"
 msgstr "Configuración da conta"
 
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
 msgstr "_Nova conversa…"
 
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+msgid "New _Call..."
 msgstr "Nova _chamada…"
 
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "Contactos"
+
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contacts…"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts..."
+msgstr "_Engadir contactos…"
+
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts..."
 msgstr "_Buscar contactos…"
 
+# rever
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
+
 #: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "Trans_ferencias de ficheiros"
+msgid "_Rooms"
+msgstr "Sa_las"
 
-# rever
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Offline Contacts"
-msgstr "Contactos _desconectados"
+msgid "_Join..."
+msgstr "_Unirse…"
 
+# rever
 #: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "Show P_rotocols"
-msgstr "Mostrar p_rotocolos"
+msgid "Join _Favorites"
+msgstr "Unirse a _favoritas"
 
 #: ../src/empathy-roster-window-menubar.ui.h:10
-msgid "Credit Balance"
-msgstr "Crédito"
+msgid "_Manage Favorites"
+msgstr "_Xestionar favoritas…"
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Contacts on a _Map"
-msgstr "Contactos no _mapa"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "Trans_ferencias de ficheiros"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Contas"
 
-# 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-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "_Buscar na lista de contactos"
-
-# rever
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "Ordenar por _nome"
-
-# rever
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "Ordenar por es_tado"
-
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "Tamaño normal con _avatares"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "Tamañ_o normal"
-
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "Ta_maño compacto"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "Sa_la"
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Join…"
-msgstr "_Unirse…"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "Axuda"
 
-# rever
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "Unirse a _favoritas"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About Empathy"
+msgstr "Sobre empathy"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "Xestionar favoritas"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Saír"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.c:194
@@ -4267,187 +4221,205 @@ msgstr "Non foi posíbel ler a lista da sala"
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:146
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:147
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:148
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:149
 msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:151
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:152
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:429
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:724
+#: ../src/empathy-preferences.c:678
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:685
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:691
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:695
 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:744
+#: ../src/empathy-preferences.c:698
 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:747
+#: ../src/empathy-preferences.c:701
 msgid "And I'll no longer be a Capulet."
 msgstr "E deixarei eu de ser un Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:704
 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:753
+#: ../src/empathy-preferences.c:707
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1112
 msgid "Preferences"
 msgstr "Preferencias"
 
-# rever
-#: ../src/empathy-preferences.ui.h:1
-msgid "Show _smileys as images"
-msgstr "Mostrar as _emoticonas como imaxes"
-
-# rever
 #: ../src/empathy-preferences.ui.h:2
-msgid "Show contact _list in rooms"
-msgstr "Mostrar _lista de contactos en salas"
+msgid "Show protocol in avatar"
+msgstr "Mostrar protocolo no avatar"
 
+# rever
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "Aparencia"
+msgid "Show account balances"
+msgstr ""
 
+# rever
 #: ../src/empathy-preferences.ui.h:4
+msgid "Sort contacts by:"
+msgstr "Ordenar contactos por:"
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "status"
+msgstr "estado"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "name"
+msgstr "nome"
+
+#: ../src/empathy-preferences.ui.h:8
 msgid "Start chats in:"
 msgstr "Iniciar conversas en:"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:9
 msgid "new ta_bs"
 msgstr "lapelas no_vas"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:10
 msgid "new _windows"
 msgstr "xan_elas novas"
 
-#: ../src/empathy-preferences.ui.h:7
+# rever
+#: ../src/empathy-preferences.ui.h:11
+msgid "Show _smileys as images"
+msgstr "Mostrar as _emoticonas como imaxes"
+
+# rever
+#: ../src/empathy-preferences.ui.h:12
+msgid "Show contact _list in rooms"
+msgstr "Mostrar _lista de contactos en salas"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Log conversations"
+msgstr "Rexistrar conversas"
+
+#: ../src/empathy-preferences.ui.h:15
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar os eventos entrantes na área de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Automatically connect on startup"
 msgstr "_Conectar automaticamente ao inicio"
 
-#: ../src/empathy-preferences.ui.h:9
-msgid "Log conversations"
-msgstr "Rexistrar conversas"
-
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:17
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:18
 msgid "General"
 msgstr "Xeral"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:19
 msgid "_Enable bubble notifications"
 msgstr "_Activar notificacións de burbulla"
 
 # rever
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:20
 msgid "Disable notifications when _away or busy"
 msgstr "Desactivar notificacións ao estar _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:21
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Activar notificacións cando a _conversa non teña o foco"
 
 # rever
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:22
 msgid "Enable notifications when a contact comes online"
 msgstr "Activar notificacións cando un contacto se conecta"
 
 # rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:23
 msgid "Enable notifications when a contact goes offline"
 msgstr "Activar notificacións cando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:24
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Enable sound notifications"
 msgstr "_Activar notificacións de son"
 
 # rever
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:26
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:27
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:28
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:29
 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
+#: ../src/empathy-preferences.ui.h:30
 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 "
@@ -4459,11 +4431,11 @@ msgstr ""
 "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
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a miña localización aos meus contactos"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:34
 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 "
@@ -4474,33 +4446,33 @@ msgstr ""
 "aproximadas a 1 valor decimal."
 
 #. 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
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Reduce location accuracy"
 msgstr "_Reducir a precisión da localización"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:37
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:38
 msgid "_GPS"
 msgstr "_GPS"
 
 # rever
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Cellphone"
 msgstr "_Teléfono móbil"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:41
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:43
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4509,35 +4481,39 @@ msgstr ""
 "dicionario instalado."
 
 # rever
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:44
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:45
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:46
 msgid "Chat Th_eme:"
 msgstr "T_ema do chat:"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:47
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:48
 msgid "Themes"
 msgstr "Temas"
 
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova conversa…"
+
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _chamada…"
+
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "_Saír"
-
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
@@ -4688,14 +4664,14 @@ msgid "Respond"
 msgstr "Responder"
 
 #: ../src/empathy-notifications-approver.c:197
-#: ../src/empathy-call-window.c:1491
+#: ../src/empathy-call-window.c:1490
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
 #: ../src/empathy-notifications-approver.c:202
 #: ../src/empathy-notifications-approver.c:207
-#: ../src/empathy-call-window.c:1492
+#: ../src/empathy-call-window.c:1491
 msgid "Answer"
 msgstr "Responder"
 
@@ -4727,62 +4703,62 @@ msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1123 ../src/empathy-call-window.c:1139
+#: ../src/empathy-call-window.c:1122 ../src/empathy-call-window.c:1138
 msgid "i"
 msgstr "Información"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1859
+#: ../src/empathy-call-window.c:1858
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada con %s"
 
-#: ../src/empathy-call-window.c:2103
+#: ../src/empathy-call-window.c:2102
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
-#: ../src/empathy-call-window.c:2105
+#: ../src/empathy-call-window.c:2104
 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-call-window.c:2107
+#: ../src/empathy-call-window.c:2106
 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-call-window.c:2109
+#: ../src/empathy-call-window.c:2108
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2110
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../src/empathy-call-window.c:2858
+#: ../src/empathy-call-window.c:2857
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2861
+#: ../src/empathy-call-window.c:2860
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2863
+#: ../src/empathy-call-window.c:2862
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2866
+#: ../src/empathy-call-window.c:2865
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
 # rever
-#: ../src/empathy-call-window.c:2962
+#: ../src/empathy-call-window.c:2961
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:3001
+#: ../src/empathy-call-window.c:3000
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -4791,7 +4767,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3006
+#: ../src/empathy-call-window.c:3005
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -4800,7 +4776,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3012
+#: ../src/empathy-call-window.c:3011
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -4809,21 +4785,21 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-call-window.c:3018
+#: ../src/empathy-call-window.c:3017
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-call-window.c:3022
+#: ../src/empathy-call-window.c:3021
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
-#: ../src/empathy-call-window.c:3025
+#: ../src/empathy-call-window.c:3024
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
-#: ../src/empathy-call-window.c:3037
+#: ../src/empathy-call-window.c:3036
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -4834,32 +4810,32 @@ msgstr ""
 "\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
 "«Depuración» no menú Axuda."
 
-#: ../src/empathy-call-window.c:3046
+#: ../src/empathy-call-window.c:3045
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-call-window.c:3049
+#: ../src/empathy-call-window.c:3048
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3088
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-call-window.c:3099
+#: ../src/empathy-call-window.c:3098
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
-#: ../src/empathy-call-window.c:3136
+#: ../src/empathy-call-window.c:3135
 #, c-format
 msgid "Your current balance is %s."
 msgstr "O seu crédito actual é %s."
 
-#: ../src/empathy-call-window.c:3140
+#: ../src/empathy-call-window.c:3139
 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:3142
+#: ../src/empathy-call-window.c:3141
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -4909,6 +4885,51 @@ msgstr ""
 "característica usando o diálogo <span style=\"italic\">Editar → Contas</"
 "span> na Lista de contactos."
 
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "Recargar %s (%s)…"
+
+#~ msgid "Top Up..."
+#~ msgstr "Recargar…"
+
+# rever
+#~ msgid "_Offline Contacts"
+#~ msgstr "Contactos _desconectados"
+
+#~ msgid "Show P_rotocols"
+#~ msgstr "Mostrar p_rotocolos"
+
+#~ msgid "Credit Balance"
+#~ msgstr "Crédito"
+
+#~ msgid "Contacts on a _Map"
+#~ msgstr "Contactos no _mapa"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "_Buscar na lista de contactos"
+
+# rever
+#~ msgid "Sort by _Name"
+#~ msgstr "Ordenar por _nome"
+
+# rever
+#~ msgid "Sort by _Status"
+#~ msgstr "Ordenar por es_tado"
+
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Tamaño normal con _avatares"
+
+#~ msgid "N_ormal Size"
+#~ msgstr "Tamañ_o normal"
+
+#~ msgid "_Compact Size"
+#~ msgstr "Ta_maño compacto"
+
+#~ msgid "_Join…"
+#~ msgstr "_Unirse…"
+
+#~ msgid "Appearance"
+#~ msgstr "Aparencia"
+
 #~ msgid "“%s” is not a valid contact ID"
 #~ msgstr "«%s» non é un ID de contacto válido"
 
@@ -5118,10 +5139,6 @@ msgstr ""
 #~ msgstr "Protocolo:"
 
 # rever
-#~ msgid "Show account assistant"
-#~ msgstr "Mostrar o asistente de contas"
-
-# rever
 #~ msgid "Select contacts to link"
 #~ msgstr "Seleccione os contactos a ligar"