[evolution-data-server] Updated Galician translations

[Francisco DiÃguez Souto <frandieguez src gnome org>]

commit 7d24cefbc4b387ad87ac5540081420a6518d7ad2
Author: Fran Dieguez <fran openhost es>
Date:   Tue Aug 16 13:27:24 2011 +0200

    Updated Galician translations

 po/gl.po |  638 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 319 insertions(+), 319 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 8e57be6..4a3a2ef 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server-master-po-gl-71644\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-07 15:06+0200\n"
-"PO-Revision-Date: 2011-08-07 15:11+0200\n"
+"POT-Creation-Date: 2011-08-16 13:25+0200\n"
+"PO-Revision-Date: 2011-08-16 13:26+0200\n"
 "Last-Translator: Fran DiÃguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -34,12 +34,12 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:751
+#: ../addressbook/backends/file/e-book-backend-file.c:823
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "Cargandoâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:754
+#: ../addressbook/backends/file/e-book-backend-file.c:826
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:4708
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
@@ -147,10 +147,10 @@ msgstr "Descargando os contactos (%d)â "
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:519
 #: ../calendar/backends/caldav/e-cal-backend-caldav.c:548
 #: ../calendar/backends/http/e-cal-backend-http.c:422
-#: ../calendar/libecal/e-cal.c:4462
+#: ../calendar/libecal/e-cal.c:4463
 #: ../camel/providers/imap/camel-imap-command.c:484
-#: ../camel/providers/imap/camel-imap-store.c:385
-#: ../camel/providers/smtp/camel-smtp-transport.c:520
+#: ../camel/providers/imap/camel-imap-store.c:409
+#: ../camel/providers/smtp/camel-smtp-transport.c:439
 msgid "Unknown error"
 msgstr "Erro descoÃecido"
 
@@ -828,7 +828,7 @@ msgid "Success"
 msgstr "Correcto"
 
 #: ../addressbook/libedata-book/e-data-book.c:300
-#: ../calendar/libecal/e-cal.c:4430 ../calendar/libedata-cal/e-data-cal.c:415
+#: ../calendar/libecal/e-cal.c:4431 ../calendar/libedata-cal/e-data-cal.c:415
 msgid "Backend is busy"
 msgstr "O motor da infraestrutura està ocupado"
 
@@ -838,7 +838,7 @@ msgid "Repository offline"
 msgstr "O repositorio està desconectado"
 
 #: ../addressbook/libedata-book/e-data-book.c:302
-#: ../calendar/libecal/e-cal.c:4444 ../calendar/libedata-cal/e-data-cal.c:417
+#: ../calendar/libecal/e-cal.c:4445 ../calendar/libedata-cal/e-data-cal.c:417
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
@@ -921,13 +921,13 @@ msgid "No space"
 msgstr "Sen espazos"
 
 #: ../addressbook/libedata-book/e-data-book.c:321
-#: ../calendar/libecal/e-cal.c:4428 ../calendar/libedata-cal/e-data-cal.c:438
+#: ../calendar/libecal/e-cal.c:4429 ../calendar/libedata-cal/e-data-cal.c:438
 msgid "Invalid argument"
 msgstr "O argumento non à vÃlido"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:323
-#: ../calendar/libecal/e-cal.c:4467 ../calendar/libedata-cal/e-data-cal.c:440
+#: ../calendar/libecal/e-cal.c:4468 ../calendar/libedata-cal/e-data-cal.c:440
 msgid "Not supported"
 msgstr "Non à compatÃbel"
 
@@ -1133,7 +1133,7 @@ msgstr "PrognÃstico"
 
 #: ../calendar/libecal/e-cal.c:860 ../libedataserverui/e-book-auth-util.c:204
 #: ../libedataserverui/e-book-auth-util.c:427
-#: ../libedataserverui/e-client-utils.c:809
+#: ../libedataserverui/e-client-utils.c:795
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
@@ -1147,64 +1147,64 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Introduza o contrasinal de %s para activar o proxy para o usuario %s"
 
-#: ../calendar/libecal/e-cal.c:4432
+#: ../calendar/libecal/e-cal.c:4433
 msgid "Repository is offline"
 msgstr "O repositorio està desconectado"
 
-#: ../calendar/libecal/e-cal.c:4434
+#: ../calendar/libecal/e-cal.c:4435
 msgid "No such calendar"
 msgstr "Non existe o calendario"
 
-#: ../calendar/libecal/e-cal.c:4436 ../calendar/libedata-cal/e-data-cal.c:419
+#: ../calendar/libecal/e-cal.c:4437 ../calendar/libedata-cal/e-data-cal.c:419
 msgid "Object not found"
 msgstr "O obxecto non se atopou"
 
-#: ../calendar/libecal/e-cal.c:4438 ../calendar/libedata-cal/e-data-cal.c:420
+#: ../calendar/libecal/e-cal.c:4439 ../calendar/libedata-cal/e-data-cal.c:420
 msgid "Invalid object"
 msgstr "O obxecto non à vÃlido"
 
-#: ../calendar/libecal/e-cal.c:4440
+#: ../calendar/libecal/e-cal.c:4441
 msgid "URI not loaded"
 msgstr "O URI non se cargou"
 
-#: ../calendar/libecal/e-cal.c:4442
+#: ../calendar/libecal/e-cal.c:4443
 msgid "URI already loaded"
 msgstr "O URI xa se cargou"
 
-#: ../calendar/libecal/e-cal.c:4446
+#: ../calendar/libecal/e-cal.c:4447
 msgid "Unknown User"
 msgstr "Usuario descoÃecido"
 
-#: ../calendar/libecal/e-cal.c:4448 ../calendar/libedata-cal/e-data-cal.c:421
+#: ../calendar/libecal/e-cal.c:4449 ../calendar/libedata-cal/e-data-cal.c:421
 msgid "Object ID already exists"
 msgstr "O ID do obxecto xa existe"
 
-#: ../calendar/libecal/e-cal.c:4450
+#: ../calendar/libecal/e-cal.c:4451
 msgid "Protocol not supported"
 msgstr "O protocolo non à compatÃbel"
 
-#: ../calendar/libecal/e-cal.c:4452
+#: ../calendar/libecal/e-cal.c:4453
 msgid "Operation has been canceled"
 msgstr "A operaciÃn cancelouse"
 
-#: ../calendar/libecal/e-cal.c:4454
+#: ../calendar/libecal/e-cal.c:4455
 msgid "Could not cancel operation"
 msgstr "Non foi posÃbel cancelar a operaciÃn"
 
-#: ../calendar/libecal/e-cal.c:4456
+#: ../calendar/libecal/e-cal.c:4457
 msgid "Authentication failed"
 msgstr "A autenticaciÃn fallou"
 
-#: ../calendar/libecal/e-cal.c:4458
-#: ../camel/providers/smtp/camel-smtp-transport.c:864
+#: ../calendar/libecal/e-cal.c:4459
+#: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Authentication required"
 msgstr "AutenticaciÃn requirida"
 
-#: ../calendar/libecal/e-cal.c:4460
+#: ../calendar/libecal/e-cal.c:4461
 msgid "A D-Bus exception has occurred"
 msgstr "Produciuse unha excepciÃn de D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4464
+#: ../calendar/libecal/e-cal.c:4465
 msgid "No error"
 msgstr "Sen erros"
 
@@ -1719,37 +1719,37 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Sincronizando de novo co servidor"
 
-#: ../camel/camel-disco-folder.c:71 ../camel/camel-offline-folder.c:89
+#: ../camel/camel-disco-folder.c:72 ../camel/camel-offline-folder.c:89
 msgid "Downloading new messages for offline mode"
 msgstr "Descargando as mensaxes novas para o modo sen conexiÃn"
 
-#: ../camel/camel-disco-folder.c:406
+#: ../camel/camel-disco-folder.c:410
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando o cartafol Â%s para o modo sen conexiÃn"
 
-#: ../camel/camel-disco-folder.c:472 ../camel/camel-offline-folder.c:321
+#: ../camel/camel-disco-folder.c:476 ../camel/camel-offline-folder.c:325
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 "Copiar o contido do cartafol localmente para unha operaciÃn en modo sen "
 "conexiÃn"
 
-#: ../camel/camel-disco-store.c:436
-#: ../camel/providers/imap/camel-imap-store.c:1179
-#: ../camel/providers/imap/camel-imap-store.c:1901
-#: ../camel/providers/imap/camel-imap-store.c:2384
-#: ../camel/providers/imap/camel-imap-store.c:3205
-#: ../camel/providers/imapx/camel-imapx-folder.c:298
-#: ../camel/providers/imapx/camel-imapx-folder.c:331
-#: ../camel/providers/imapx/camel-imapx-folder.c:385
-#: ../camel/providers/imapx/camel-imapx-folder.c:431
-#: ../camel/providers/imapx/camel-imapx-folder.c:465
-#: ../camel/providers/imapx/camel-imapx-folder.c:505
-#: ../camel/providers/imapx/camel-imapx-folder.c:541
-#: ../camel/providers/imapx/camel-imapx-store.c:348
-#: ../camel/providers/imapx/camel-imapx-store.c:1364
-#: ../camel/providers/imapx/camel-imapx-store.c:1452
-#: ../camel/providers/imapx/camel-imapx-store.c:1492
+#: ../camel/camel-disco-store.c:456
+#: ../camel/providers/imap/camel-imap-store.c:1153
+#: ../camel/providers/imap/camel-imap-store.c:1925
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imap/camel-imap-store.c:3171
+#: ../camel/providers/imapx/camel-imapx-folder.c:311
+#: ../camel/providers/imapx/camel-imapx-folder.c:344
+#: ../camel/providers/imapx/camel-imapx-folder.c:398
+#: ../camel/providers/imapx/camel-imapx-folder.c:444
+#: ../camel/providers/imapx/camel-imapx-folder.c:478
+#: ../camel/providers/imapx/camel-imapx-folder.c:518
+#: ../camel/providers/imapx/camel-imapx-folder.c:554
+#: ../camel/providers/imapx/camel-imapx-store.c:238
+#: ../camel/providers/imapx/camel-imapx-store.c:1278
+#: ../camel/providers/imapx/camel-imapx-store.c:1366
+#: ../camel/providers/imapx/camel-imapx-store.c:1412
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar conectado para completar esta operaciÃn"
@@ -1940,7 +1940,7 @@ msgid "Failed to execute gpg: %s"
 msgstr "Produciuse un fallo ao executar gpg: %s"
 
 #: ../camel/camel-gpg-context.c:647
-#: ../camel/providers/smtp/camel-smtp-transport.c:867
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 msgid "Unknown"
 msgstr "DescoÃecido"
 
@@ -1990,9 +1990,9 @@ msgstr "Solicitude inesperada do GnuPg para Â%sÂ"
 
 #: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
 #: ../camel/camel-tcp-stream-raw.c:255
-#: ../camel/providers/imapx/camel-imapx-server.c:4981
-#: ../camel/providers/imapx/camel-imapx-server.c:4998
-#: ../camel/providers/imapx/camel-imapx-store.c:269
+#: ../camel/providers/imapx/camel-imapx-server.c:5008
+#: ../camel/providers/imapx/camel-imapx-server.c:5025
+#: ../camel/providers/imapx/camel-imapx-store.c:159
 #: ../camel/providers/nntp/camel-nntp-summary.c:409
 #: ../libedataserverui/e-book-auth-util.c:227
 #, c-format
@@ -2181,16 +2181,16 @@ msgstr "Non està dispoÃÃbel a sinatura"
 msgid "parse error"
 msgstr "erro na anÃlise"
 
-#: ../camel/camel-network-service.c:91
+#: ../camel/camel-network-service.c:99
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Non foi posÃbel realizar a conexiÃn con %s: %s"
 
-#: ../camel/camel-network-service.c:92
+#: ../camel/camel-network-service.c:100
 msgid "SSL unavailable"
 msgstr "SSL non dispoÃÃbel"
 
-#: ../camel/camel-network-service.c:115
+#: ../camel/camel-network-service.c:123
 #, c-format
 msgid "Could not connect to %s: "
 msgstr "Non foi posÃbel realizar a conexiÃn con %s: "
@@ -2222,7 +2222,7 @@ msgstr "Produciuse un fallo ao buscar o nome"
 msgid "Name lookup failed: %s"
 msgstr "Produciuse un fallo ao buscar o nome: %s"
 
-#: ../camel/camel-offline-folder.c:198
+#: ../camel/camel-offline-folder.c:202
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Sincronizando as mensaxes no cartafol Â%s para o disco"
@@ -2434,7 +2434,7 @@ msgstr "As credenciais indicadas caducaron."
 
 #: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:312
 #: ../camel/camel-sasl-gssapi.c:356 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1336
+#: ../camel/providers/smtp/camel-smtp-transport.c:1228
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "A resposta de autenticaciÃn desde o servidor non à valida."
@@ -2500,17 +2500,17 @@ msgstr "Tentouse a autorizaciÃn POP antes de SMTP cun servizo %s"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Produciuse un fallo na compilaciÃn da expresiÃn regular: %s: %s"
 
-#: ../camel/camel-service.c:492
+#: ../camel/camel-service.c:511
 #, c-format
 msgid "URL '%s' needs a user component"
 msgstr "O URL Â%s necesita un compoÃente de usuario"
 
-#: ../camel/camel-service.c:503
+#: ../camel/camel-service.c:522
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL Â%s necesita un compoÃente do servidor"
 
-#: ../camel/camel-service.c:514
+#: ../camel/camel-service.c:533
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL Â%s necesita un compoÃente da ruta"
@@ -2520,7 +2520,7 @@ msgstr "O URL Â%s necesita un compoÃente da ruta"
 msgid "Invalid GType registered for protocol '%s'"
 msgstr "O GType rexistrado non à vÃlido para o protocolo Â%sÂ"
 
-#: ../camel/camel-session.c:907
+#: ../camel/camel-session.c:938
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Introduza o contrasinal de %s para %s no servidor %s."
@@ -2716,50 +2716,50 @@ msgstr "Produciuse un fallo ao engadir os datos ao codificador"
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Descifrado S/MIME: non se atoou contido cifrado"
 
-#: ../camel/camel-store.c:2084
+#: ../camel/camel-store.c:1805
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Non à posÃbel crear o cartafol Â%sÂ: o cartafol xa existe"
 
-#: ../camel/camel-store.c:2127
+#: ../camel/camel-store.c:1848
 #, c-format
 msgid "Opening folder '%s'"
 msgstr "Abrindo o cartafol Â%sÂ"
 
-#: ../camel/camel-store.c:2314
+#: ../camel/camel-store.c:2035
 #, c-format
 msgid "Scanning folders in '%s'"
 msgstr "Analizando os cartafoles en Â%sÂ"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:2326 ../camel/camel-store.c:2336
+#: ../camel/camel-store.c:2047 ../camel/camel-store.c:2057
 #: ../camel/camel-vtrash-folder.c:48
 msgid "Trash"
 msgstr "Lixo"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:2329 ../camel/camel-store.c:2340
+#: ../camel/camel-store.c:2050 ../camel/camel-store.c:2061
 #: ../camel/camel-vtrash-folder.c:50
 msgid "Junk"
 msgstr "Correo lixo"
 
-#: ../camel/camel-store.c:2791
+#: ../camel/camel-store.c:2512
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Non à posÃbel crear o cartafol: %s: o cartafol xa existe"
 
-#: ../camel/camel-store.c:2805
+#: ../camel/camel-store.c:2526
 #, c-format
 msgid "Creating folder '%s'"
 msgstr "Creando o cartafol Â%sÂ"
 
-#: ../camel/camel-store.c:2923 ../camel/camel-vee-store.c:350
+#: ../camel/camel-store.c:2644 ../camel/camel-vee-store.c:350
 #: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Non à posÃbel eliminar o cartafol: %s: a operaciÃn non à valida"
 
-#: ../camel/camel-store.c:3066 ../camel/camel-vee-store.c:400
+#: ../camel/camel-store.c:2787 ../camel/camel-vee-store.c:400
 #: ../camel/providers/local/camel-maildir-store.c:704
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
@@ -3025,69 +3025,69 @@ msgstr "A resposta do servidor IMAP non contiÃa informaciÃn sobre %s"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Resposta positiva inesperada do servidor IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:293
+#: ../camel/providers/imap/camel-imap-folder.c:296
 msgid "Always check for new mail in this folder"
 msgstr "Comprobar sempre o correo novo neste cartafol"
 
-#: ../camel/providers/imap/camel-imap-folder.c:368
+#: ../camel/providers/imap/camel-imap-folder.c:370
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posÃbel crear o directorio %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:391
+#: ../camel/providers/imap/camel-imap-folder.c:393
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posÃbel cargar o resumo de %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:995
-#: ../camel/providers/imapx/camel-imapx-server.c:3984
+#: ../camel/providers/imap/camel-imap-folder.c:1049
+#: ../camel/providers/imapx/camel-imapx-server.c:3998
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Buscando mensaxes modificadas en %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3380
+#: ../camel/providers/imap/camel-imap-folder.c:3454
 msgid "Unable to retrieve message: "
 msgstr "Non foi posÃbel obter a mensaxe:"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3415
-#: ../camel/providers/imapx/camel-imapx-server.c:5319
+#: ../camel/providers/imap/camel-imap-folder.c:3489
+#: ../camel/providers/imapx/camel-imapx-server.c:5337
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Non à posÃbel obter a mensaxe co ID de mensaxe %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3416
-#: ../camel/providers/imapx/camel-imapx-server.c:5320
+#: ../camel/providers/imap/camel-imap-folder.c:3490
+#: ../camel/providers/imapx/camel-imapx-server.c:5338
 msgid "No such message available."
 msgstr "A mensaxe non està dispoÃÃbel."
 
-#: ../camel/providers/imap/camel-imap-folder.c:3491
-#: ../camel/providers/imap/camel-imap-folder.c:4391
+#: ../camel/providers/imap/camel-imap-folder.c:3565
+#: ../camel/providers/imap/camel-imap-folder.c:4483
 #: ../camel/providers/nntp/camel-nntp-folder.c:407
 #, c-format
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non està dispoÃÃbel actualmente"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3975
-#: ../camel/providers/imap/camel-imap-folder.c:4058
-#: ../camel/providers/imapx/camel-imapx-server.c:3940
-#: ../camel/providers/imapx/camel-imapx-server.c:4082
+#: ../camel/providers/imap/camel-imap-folder.c:4067
+#: ../camel/providers/imap/camel-imap-folder.c:4150
+#: ../camel/providers/imapx/camel-imapx-server.c:3954
+#: ../camel/providers/imapx/camel-imapx-server.c:4109
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Recollendo a informaciÃn de resumo para as mensaxes novas en %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4192
+#: ../camel/providers/imap/camel-imap-folder.c:4284
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr ""
 "Resposta do servidor incompleta: non se forneceu informaciÃn para a mensaxe "
 "%d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4202
+#: ../camel/providers/imap/camel-imap-folder.c:4294
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Resposta do servidor incompleta: non se forneceu UID para a mensaxe %d"
 
-#: ../camel/providers/imap/camel-imap-folder.c:4431
+#: ../camel/providers/imap/camel-imap-folder.c:4523
 #, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posÃbel atopar o corpo da mensaxe na resposta FETCH."
@@ -3222,59 +3222,73 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opciÃn conectarà co servidor IMAP usando un contrasinal de texto plano."
 
-#: ../camel/providers/imap/camel-imap-store.c:330
-#: ../camel/providers/imap/camel-imap-store.c:357
-#: ../camel/providers/imap/camel-imap-store.c:384
-#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:222
+#: ../camel/providers/imap/camel-imap-store.c:2587
+#: ../camel/providers/imapx/camel-imapx-store.c:333
+#: ../camel/providers/imapx/camel-imapx-store.c:771
+#: ../camel/providers/local/camel-maildir-folder.c:437
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:619
+#: ../camel/providers/local/camel-maildir-store.c:625
+#: ../camel/providers/local/camel-maildir-store.c:705
+#: ../camel/providers/local/camel-spool-store.c:325
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+#: ../camel/providers/imap/camel-imap-store.c:354
+#: ../camel/providers/imap/camel-imap-store.c:381
+#: ../camel/providers/imap/camel-imap-store.c:408
+#: ../camel/providers/imapx/camel-imapx-server.c:2963
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Non foi posÃbel realizar a conexiÃn co servidor IMAP %s en modo seguro: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:331
-#: ../camel/providers/imapx/camel-imapx-server.c:2965
-#: ../camel/providers/smtp/camel-smtp-transport.c:198
+#: ../camel/providers/imap/camel-imap-store.c:355
+#: ../camel/providers/imapx/camel-imapx-server.c:2964
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "STARTTLS not supported"
 msgstr "O STARTTLS non à compatÃbel"
 
-#: ../camel/providers/imap/camel-imap-store.c:350
-#: ../camel/providers/imapx/camel-imapx-server.c:3003
+#: ../camel/providers/imap/camel-imap-store.c:374
+#: ../camel/providers/imapx/camel-imapx-server.c:3002
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Produciuse un fallo ao conectarse co servidor IMAP %s en modo seguro:"
 
-#: ../camel/providers/imap/camel-imap-store.c:358
-#: ../camel/providers/smtp/camel-smtp-transport.c:244
+#: ../camel/providers/imap/camel-imap-store.c:382
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "SSL is not available in this build"
 msgstr "O SSL non està dispoÃÃbel nesta compilaciÃn"
 
-#: ../camel/providers/imap/camel-imap-store.c:681
-#: ../camel/providers/imapx/camel-imapx-server.c:3087
+#: ../camel/providers/imap/camel-imap-store.c:707
+#: ../camel/providers/imapx/camel-imapx-server.c:3096
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non permite o tipo de autenticaciÃn solicitado %s "
 
-#: ../camel/providers/imap/camel-imap-store.c:692
-#: ../camel/providers/imapx/camel-imapx-server.c:3099
-#: ../camel/providers/smtp/camel-smtp-transport.c:428
+#: ../camel/providers/imap/camel-imap-store.c:718
+#: ../camel/providers/imapx/camel-imapx-server.c:3108
+#: ../camel/providers/smtp/camel-smtp-transport.c:347
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non à compatÃbel co tipo de autenticaciÃn %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:703
-#: ../camel/providers/smtp/camel-smtp-transport.c:441
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/smtp/camel-smtp-transport.c:360
 #, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Produciuse un erro ao crear o obxecto de autenticaciÃn SASL."
 
-#: ../camel/providers/imap/camel-imap-store.c:751
-#: ../camel/providers/imapx/camel-imapx-server.c:3143
+#: ../camel/providers/imap/camel-imap-store.c:777
+#: ../camel/providers/imapx/camel-imapx-server.c:3152
 #, c-format
 msgid "You did not enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: ../camel/providers/imap/camel-imap-store.c:792
-#: ../camel/providers/imapx/camel-imapx-server.c:3188
+#: ../camel/providers/imap/camel-imap-store.c:818
+#: ../camel/providers/imapx/camel-imapx-server.c:3197
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3285,83 +3299,69 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:927
-#: ../camel/providers/imapx/camel-imapx-store.c:252
+#: ../camel/providers/imap/camel-imap-store.c:874
+#: ../camel/providers/imapx/camel-imapx-store.c:142
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:930
-#: ../camel/providers/imapx/camel-imapx-store.c:255
+#: ../camel/providers/imap/camel-imap-store.c:877
+#: ../camel/providers/imapx/camel-imapx-store.c:145
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servizo IMAP para %s en %s"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1471
-#: ../camel/providers/imap/camel-imap-store.c:2555
-#: ../camel/providers/imapx/camel-imapx-store.c:443
-#: ../camel/providers/imapx/camel-imapx-store.c:860
-#: ../camel/providers/local/camel-maildir-folder.c:434
-#: ../camel/providers/local/camel-maildir-store.c:273
-#: ../camel/providers/local/camel-maildir-store.c:619
-#: ../camel/providers/local/camel-maildir-store.c:625
-#: ../camel/providers/local/camel-maildir-store.c:705
-#: ../camel/providers/local/camel-spool-store.c:324
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-#: ../camel/providers/imap/camel-imap-store.c:1938
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imapx/camel-imapx-store.c:419
+#: ../camel/providers/imap/camel-imap-store.c:1962
+#: ../camel/providers/imap/camel-imap-store.c:2164
+#: ../camel/providers/imapx/camel-imapx-store.c:309
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1952
-#: ../camel/providers/imap/camel-imap-store.c:2399
-#: ../camel/providers/imapx/camel-imapx-store.c:1385
+#: ../camel/providers/imap/camel-imap-store.c:1976
+#: ../camel/providers/imap/camel-imap-store.c:2431
+#: ../camel/providers/imapx/camel-imapx-store.c:1299
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "O nome do cartafol Â%s non à vÃlido porque contÃn o carÃcter \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:2016
-#: ../camel/providers/imap/camel-imap-store.c:2463
-#: ../camel/providers/imapx/camel-imapx-store.c:1406
+#: ../camel/providers/imap/camel-imap-store.c:2040
+#: ../camel/providers/imap/camel-imap-store.c:2495
+#: ../camel/providers/imapx/camel-imapx-store.c:1320
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non à posÃbel que o cartafol pai conteÃa subcartafoles"
 
-#: ../camel/providers/imap/camel-imap-store.c:2069
+#: ../camel/providers/imap/camel-imap-store.c:2093
 #: ../camel/providers/local/camel-maildir-store.c:244
 #: ../camel/providers/local/camel-mbox-store.c:416
-#: ../camel/providers/local/camel-mh-store.c:566
+#: ../camel/providers/local/camel-mh-store.c:547
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Non à posÃbel crear o cartafol Â%sÂ: o cartafol xa existe."
 
-#: ../camel/providers/imap/camel-imap-store.c:2412
-#: ../camel/providers/imapx/camel-imapx-store.c:1396
+#: ../camel/providers/imap/camel-imap-store.c:2444
+#: ../camel/providers/imapx/camel-imapx-store.c:1310
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartafol pai descoÃecido: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3248
+#: ../camel/providers/imap/camel-imap-store.c:3214
 #, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectouse inesperadamente"
 
-#: ../camel/providers/imap/camel-imap-store.c:3251
+#: ../camel/providers/imap/camel-imap-store.c:3217
 msgid "Server unexpectedly disconnected: "
 msgstr "O servidor desconectouse inesperadamente: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:74
+#: ../camel/providers/imapx/camel-imapx-folder.c:88
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Non foi posÃbel crear o resumo do cartafol para %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:82
+#: ../camel/providers/imapx/camel-imapx-folder.c:96
 #, c-format
 msgid "Could not create cache for %s: "
 msgstr "Non foi posÃbel crear a cachà para %s:"
@@ -3394,26 +3394,26 @@ msgstr "Porto IMAP predeterminado"
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:1488
+#: ../camel/providers/imapx/camel-imapx-server.c:1475
 msgid "Error writing to cache stream: "
 msgstr "Produciuse un erro de escritura ao fluxo da cachÃ: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2172
+#: ../camel/providers/imapx/camel-imapx-server.c:2159
 #, c-format
 msgid "Not authenticated"
 msgstr "Non autenticado"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:3370
+#: ../camel/providers/imapx/camel-imapx-server.c:3375
 msgid "Closing tmp stream failed: "
 msgstr "Produciuse un fallo no peche do fluxo temporal:"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:5465
-#: ../camel/providers/imapx/camel-imapx-server.c:5480
+#: ../camel/providers/imapx/camel-imapx-server.c:5483
+#: ../camel/providers/imapx/camel-imapx-server.c:5498
 msgid "Cannot create spool file: "
 msgstr "Non à posÃbel crear o ficheiro de cola de correo: "
 
-#: ../camel/providers/imapx/camel-imapx-store.c:1181
-#: ../camel/providers/nntp/camel-nntp-store.c:1778
+#: ../camel/providers/imapx/camel-imapx-store.c:1087
+#: ../camel/providers/nntp/camel-nntp-store.c:1703
 #, c-format
 msgid "No such folder: %s"
 msgstr "Non existe o cartafol: %s"
@@ -3444,7 +3444,7 @@ msgstr "caixa de correo: %s (%s)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-folder.c:466
+#: ../camel/providers/local/camel-local-folder.c:473
 msgid "Index message body data"
 msgstr "Indexar os datos do corpo da mensaxe"
 
@@ -3482,7 +3482,7 @@ msgstr ""
 "cartafoles xestionados polo Evolution."
 
 #: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Aplicar os filtros Ãs mensaxes novas da caixa de entrada"
 
@@ -3494,16 +3494,16 @@ msgstr "Cartafoles de correo en formato maildir"
 msgid "For storing local mail in maildir directories."
 msgstr "Para almacenar correo local en cartafoles maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Almacenar cabeceiras de estado en formato Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:114
+#: ../camel/providers/local/camel-local-provider.c:115
 msgid "Standard Unix mbox spool file"
 msgstr "Ficheiro spool mbox estÃndar de Unix"
 
-#: ../camel/providers/local/camel-local-provider.c:115
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:128
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3513,60 +3513,60 @@ msgstr ""
 "TamÃn pode ser utilizado para ler unha Ãrbore de cartafoles estilo Elm, Pine "
 "ou Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:127
 msgid "Standard Unix mbox spool directory"
 msgstr "Cartafol estÃndar spool mbox de Unix"
 
-#: ../camel/providers/local/camel-local-store.c:79
+#: ../camel/providers/local/camel-local-store.c:92
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posÃbel renomear o cartafol %s a %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:204
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro de correo local %s"
 
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:329
+#: ../camel/providers/local/camel-local-store.c:235
+#: ../camel/providers/local/camel-local-store.c:377
 #: ../camel/providers/local/camel-maildir-store.c:92
 #: ../camel/providers/local/camel-mbox-store.c:534
-#: ../camel/providers/local/camel-spool-store.c:570
+#: ../camel/providers/local/camel-spool-store.c:571
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raÃz de almacenamento %s non à unha ruta absoluta"
 
-#: ../camel/providers/local/camel-local-store.c:196
+#: ../camel/providers/local/camel-local-store.c:244
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "A raÃz de almacenamento %s non à un cartafol normal"
 
-#: ../camel/providers/local/camel-local-store.c:207
-#: ../camel/providers/local/camel-local-store.c:217
-#: ../camel/providers/local/camel-local-store.c:342
+#: ../camel/providers/local/camel-local-store.c:255
+#: ../camel/providers/local/camel-local-store.c:265
+#: ../camel/providers/local/camel-local-store.c:390
 #: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non à posÃbel obter o cartafol: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:249
+#: ../camel/providers/local/camel-local-store.c:297
 #, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Os almacenamentos locais non teÃen unha caixa de entrada"
 
-#: ../camel/providers/local/camel-local-store.c:387
+#: ../camel/providers/local/camel-local-store.c:435
 #: ../camel/providers/local/camel-mbox-store.c:708
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Non foi posÃbel eliminar o ficheiro de Ãndice de cartafol Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:415
+#: ../camel/providers/local/camel-local-store.c:463
 #: ../camel/providers/local/camel-mbox-store.c:738
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Non foi posÃbel eliminar o metaficheiro do cartafol Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-local-store.c:501
+#: ../camel/providers/local/camel-local-store.c:549
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posÃbel renomear Â%sÂ: %s"
@@ -3625,14 +3625,14 @@ msgstr "Non à posÃbel crear o cartafol Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:206
 #: ../camel/providers/local/camel-mbox-store.c:350
-#: ../camel/providers/local/camel-mh-store.c:521
+#: ../camel/providers/local/camel-mh-store.c:502
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Non à posÃbel obter o cartafol Â%sÂ: %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:212
 #: ../camel/providers/local/camel-mbox-store.c:360
-#: ../camel/providers/local/camel-mh-store.c:530
+#: ../camel/providers/local/camel-mh-store.c:511
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Non à posÃbel obter o cartafol Â%sÂ: o cartafol non existe."
@@ -3644,7 +3644,7 @@ msgstr "Non à posÃbel obter o cartafol Â%sÂ: non à un cartafol maildir."
 
 #: ../camel/providers/local/camel-maildir-store.c:293
 #: ../camel/providers/local/camel-maildir-store.c:333
-#: ../camel/providers/local/camel-mh-store.c:656
+#: ../camel/providers/local/camel-mh-store.c:649
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Non foi posÃbel eliminar o cartafol Â%sÂ: %s"
@@ -3655,8 +3655,8 @@ msgstr "non à un cartafol maildir"
 
 #: ../camel/providers/local/camel-maildir-store.c:510
 #: ../camel/providers/local/camel-maildir-store.c:874
-#: ../camel/providers/local/camel-spool-store.c:160
-#: ../camel/providers/local/camel-spool-store.c:179
+#: ../camel/providers/local/camel-spool-store.c:161
+#: ../camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Non foi posÃbel examinar o cartafol Â%sÂ: %s"
@@ -3705,7 +3705,7 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar danado sen recuperaciÃn posÃbel."
 
 #: ../camel/providers/local/camel-mbox-folder.c:436
-#: ../camel/providers/local/camel-spool-folder.c:70
+#: ../camel/providers/local/camel-spool-folder.c:71
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non à posÃbel crear o bloqueo de cartafol en %s: %s"
@@ -3867,12 +3867,12 @@ msgstr "Produciuse un erro ao escribir na caixa de correo temporal: %s: %s"
 msgid "Cannot append message to mh folder: %s: "
 msgstr "Non à posÃbel engadir a mensaxe ao cartafol mh: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:541
+#: ../camel/providers/local/camel-mh-store.c:522
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Non foi posÃbel crear o cartafol Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:558
+#: ../camel/providers/local/camel-mh-store.c:539
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Non à posÃbel obter o cartafol Â%sÂ: non à un cartafol."
@@ -3882,22 +3882,22 @@ msgstr "Non à posÃbel obter o cartafol Â%sÂ: non à un cartafol."
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non à posÃbel abrir a ruta do cartafol MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:346
+#: ../camel/providers/local/camel-spool-store.c:347
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro de correo spool %s"
 
-#: ../camel/providers/local/camel-spool-store.c:349
+#: ../camel/providers/local/camel-spool-store.c:350
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ãrbore de cartafol spool %s"
 
-#: ../camel/providers/local/camel-spool-store.c:390
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Non existe o cartafol Â%s/%sÂ."
 
-#: ../camel/providers/local/camel-spool-store.c:404
+#: ../camel/providers/local/camel-spool-store.c:405
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -3906,12 +3906,12 @@ msgstr ""
 "Non foi posÃbel abrir o cartafol Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:410
+#: ../camel/providers/local/camel-spool-store.c:411
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "O cartafol Â%s non existe."
 
-#: ../camel/providers/local/camel-spool-store.c:417
+#: ../camel/providers/local/camel-spool-store.c:418
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -3920,32 +3920,32 @@ msgstr ""
 "Non foi posÃbel crear o cartafol Â%sÂ:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:429
+#: ../camel/providers/local/camel-spool-store.c:430
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "Â%s non à un ficheiro de caixa de correo."
 
-#: ../camel/providers/local/camel-spool-store.c:477
+#: ../camel/providers/local/camel-spool-store.c:478
 #, c-format
 msgid "Store does not support an INBOX"
 msgstr "O almacenamento non permite unha caixa de entrada"
 
-#: ../camel/providers/local/camel-spool-store.c:491
+#: ../camel/providers/local/camel-spool-store.c:492
 #, c-format
 msgid "Spool folders cannot be deleted"
 msgstr "Non à posÃbel elminar os cartafoles de spool"
 
-#: ../camel/providers/local/camel-spool-store.c:506
+#: ../camel/providers/local/camel-spool-store.c:507
 #, c-format
 msgid "Spool folders cannot be renamed"
 msgstr "Non à posÃbel renomear os cartafoles spool"
 
-#: ../camel/providers/local/camel-spool-store.c:579
+#: ../camel/providers/local/camel-spool-store.c:580
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Non à posÃbel abrir o spool Â%sÂ: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:595
+#: ../camel/providers/local/camel-spool-store.c:596
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "O spool Â%s non à un ficheiro ou cartafol "
@@ -3983,7 +3983,7 @@ msgstr "Erro interno: UID nun formato incorrecto: %s"
 #: ../camel/providers/nntp/camel-nntp-folder.c:241
 #: ../camel/providers/nntp/camel-nntp-folder.c:245
 #: ../camel/providers/pop3/camel-pop3-folder.c:429
-#: ../camel/providers/pop3/camel-pop3-folder.c:681
+#: ../camel/providers/pop3/camel-pop3-folder.c:692
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Non à posÃbel obter a mensaxe %s: %s"
@@ -4054,32 +4054,32 @@ msgstr ""
 "Esta opciÃn autenticarase co servidor NNTP usando un contrasinal de texto "
 "plano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:107
+#: ../camel/providers/nntp/camel-nntp-store.c:97
 #, c-format
 msgid "Authentication requested but no username provided"
 msgstr "RequÃrese a autenticaciÃn mais non se forneceu ningÃn nome de usuario"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:119
+#: ../camel/providers/nntp/camel-nntp-store.c:109
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Non à posÃbel autenticar co servidor: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:442
+#: ../camel/providers/nntp/camel-nntp-store.c:357
 #, c-format
 msgid "Could not read greeting from %s: "
 msgstr "Non foi posÃbel ler o saÃdo de %s: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:455
+#: ../camel/providers/nntp/camel-nntp-store.c:370
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "O servidor NNTP %s devolveu o cÃdigo de erro %d: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:612
+#: ../camel/providers/nntp/camel-nntp-store.c:527
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vÃa %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1119
+#: ../camel/providers/nntp/camel-nntp-store.c:1053
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4090,7 +4090,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1234
+#: ../camel/providers/nntp/camel-nntp-store.c:1146
+#, c-format
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+"Non pode crear un cartafol nun almacenamento de noticias: en vez disto "
+"subscrÃbao."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1162
+#, c-format
+msgid "You cannot rename a folder in a News store."
+msgstr "Non pode renomear o cartafol nun almacenamento de noticias."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1185
+#, c-format
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr ""
+"Non pode eliminar un cartafol nun almacenamento de noticias: en vez diso "
+"elimine a subscriciÃn."
+
+#: ../camel/providers/nntp/camel-nntp-store.c:1329
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4101,7 +4120,7 @@ msgstr ""
 "\n"
 "o grupo non existe. O elemento seleccionado à probablemente un cartafol pai."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1276
+#: ../camel/providers/nntp/camel-nntp-store.c:1380
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4112,30 +4131,11 @@ msgstr ""
 "\n"
 "o grupo de noticias non existe"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1309
-#, c-format
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr ""
-"Non pode crear un cartafol nun almacenamento de noticias: en vez disto "
-"subscrÃbao."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1325
-#, c-format
-msgid "You cannot rename a folder in a News store."
-msgstr "Non pode renomear o cartafol nun almacenamento de noticias."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1342
-#, c-format
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr ""
-"Non pode eliminar un cartafol nun almacenamento de noticias: en vez diso "
-"elimine a subscriciÃn."
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1647
+#: ../camel/providers/nntp/camel-nntp-store.c:1572
 msgid "NNTP Command failed: "
 msgstr "A orde NNTP fallou: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1721
+#: ../camel/providers/nntp/camel-nntp-store.c:1646
 #, c-format
 msgid "Not connected."
 msgstr "Non conectado."
@@ -4184,17 +4184,17 @@ msgstr "Recibindo o resumo de POP"
 msgid "Cannot get POP summary: "
 msgstr "Non à posÃbel obter o resumo POP:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:542
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 msgid "Expunging old messages"
 msgstr "Expurgando as mensaxes antigas"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:556
+#: ../camel/providers/pop3/camel-pop3-folder.c:567
 msgid "Expunging deleted messages"
 msgstr "Expurgando as mensaxes eliminadas"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:39
-msgid "Message storage"
-msgstr "Almacenamento das mensaxes"
+msgid "Message Storage"
+msgstr "Almacenamento de mensaxes"
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
@@ -4249,42 +4249,42 @@ msgstr ""
 "incluso en servidores que indican que o permiten."
 
 #. Translators: This is the separator between an error and an explanation
-#: ../camel/providers/pop3/camel-pop3-store.c:97
+#: ../camel/providers/pop3/camel-pop3-store.c:83
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:151
+#: ../camel/providers/pop3/camel-pop3-store.c:130
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Non foi posÃbel obter un saÃdo correcto do servidor POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:169
-#: ../camel/providers/pop3/camel-pop3-store.c:208
+#: ../camel/providers/pop3/camel-pop3-store.c:150
+#: ../camel/providers/pop3/camel-pop3-store.c:189
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Non foi posÃbel conectar co servidor POP %s en modo seguro: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:170
+#: ../camel/providers/pop3/camel-pop3-store.c:151
 msgid "STLS not supported by server"
 msgstr "O servidor non à compatÃbel con STLS"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:188
+#: ../camel/providers/pop3/camel-pop3-store.c:169
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Non foi posÃbel conectar co servidor POP %s en modo seguro %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:201
+#: ../camel/providers/pop3/camel-pop3-store.c:182
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: "
 msgstr "Non foi posÃbel conectar co servidor POP %s en modo seguro:"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:209
+#: ../camel/providers/pop3/camel-pop3-store.c:190
 msgid "TLS is not available in this build"
 msgstr "TLS non està dispoÃÃbel nesta compilaciÃn"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:260
-#: ../camel/providers/pop3/camel-pop3-store.c:433
+#: ../camel/providers/pop3/camel-pop3-store.c:241
+#: ../camel/providers/pop3/camel-pop3-store.c:414
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4294,24 +4294,24 @@ msgstr ""
 "compatibilidade co mecanismo de autenticaciÃn solicitado."
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:288
+#: ../camel/providers/pop3/camel-pop3-store.c:269
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr ""
 "Produciuse un fallo no inicio de sesiÃn Â%s SASL para o servidor POP %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:305
+#: ../camel/providers/pop3/camel-pop3-store.c:286
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 "Non à posÃbel iniciar a sesiÃn no servidor POP %s: erro de protocolo SASL"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:327
+#: ../camel/providers/pop3/camel-pop3-store.c:308
 #, c-format
 msgid "Failed to authenticate on POP server %s: "
 msgstr "Non foi posÃbel autenticar co servidor POP %s: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:399
+#: ../camel/providers/pop3/camel-pop3-store.c:380
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4321,7 +4321,7 @@ msgstr ""
 "APOP incorrecto. SospÃitase dun ataque de suplantaciÃn. Contacte co seu "
 "administrador."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#: ../camel/providers/pop3/camel-pop3-store.c:427
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4331,7 +4331,7 @@ msgstr ""
 "Produciuse un erro ao enviar o contrasinal:"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:456
+#: ../camel/providers/pop3/camel-pop3-store.c:437
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4341,7 +4341,7 @@ msgstr ""
 "Produciuse un erro ao enviar o nome de usuario%s"
 
 #. Translators: Last %s is an optional explanation beginning with ": " separator
-#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:449
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4350,27 +4350,27 @@ msgstr ""
 "Non foi posÃbel realizar a conexiÃn co servidor POP %s.\n"
 "Produciuse un erro ao enviar o contrasinal %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:586
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid "POP3 server %s"
 msgstr "Servidor POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:589
+#: ../camel/providers/pop3/camel-pop3-store.c:495
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "Servidor POP3 para %s en %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:720
+#: ../camel/providers/pop3/camel-pop3-store.c:626
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Non foi posÃbel conectar co servidor POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:747
+#: ../camel/providers/pop3/camel-pop3-store.c:653
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Non existe o cartafol Â%sÂ."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:764
+#: ../camel/providers/pop3/camel-pop3-store.c:670
 #, c-format
 msgid "POP3 stores have no folder hierarchy"
 msgstr "O almacenamento en POP3 non ten xerarquÃa de cartafoles."
@@ -4452,45 +4452,45 @@ msgstr ""
 "Para entregar o correo conectÃndose a un servidor de correo remoto usando "
 "SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:155
-#: ../camel/providers/smtp/camel-smtp-transport.c:162
+#: ../camel/providers/smtp/camel-smtp-transport.c:149
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 msgid "Welcome response error: "
 msgstr "Erro da resposta de benvida: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
-#: ../camel/providers/smtp/camel-smtp-transport.c:243
+#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Non foi posÃbel conectar co servidor SMTP %s en modo seguro: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:219
-#: ../camel/providers/smtp/camel-smtp-transport.c:226
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:220
 msgid "STARTTLS command failed: "
 msgstr "Produciuse un fallo na orde STARTTLS: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:236
+#: ../camel/providers/smtp/camel-smtp-transport.c:230
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: "
 msgstr "Non foi posÃbel conectar co servidor SMTP %s en modo seguro: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#: ../camel/providers/smtp/camel-smtp-transport.c:280
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:365
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vÃa %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:416
+#: ../camel/providers/smtp/camel-smtp-transport.c:335
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "O servidor SMTP %s non à compatÃbel co tipo de autenticaciÃn %s solicitado."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:518
+#: ../camel/providers/smtp/camel-smtp-transport.c:437
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4501,189 +4501,189 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:635
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid "Cannot send message: service not connected."
 msgstr "Non à posÃbel enviar a mensaxe: o servizo non està conectado."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:642
+#: ../camel/providers/smtp/camel-smtp-transport.c:561
 #, c-format
 msgid "Cannot send message: sender address not valid."
 msgstr "Non à posÃbel enviar a mensaxe: o enderezo do remitente non à vÃlido."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:646
+#: ../camel/providers/smtp/camel-smtp-transport.c:565
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:671
+#: ../camel/providers/smtp/camel-smtp-transport.c:590
 #, c-format
 msgid "Cannot send message: no recipients defined."
 msgstr "Non à posÃbel enviar a mensaxe: non se definiron os destinatarios."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:684
+#: ../camel/providers/smtp/camel-smtp-transport.c:603
 #, c-format
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 "Non à posÃbel enviar a mensaxe: hai un ou mÃis destinatarios incorrectos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:814
+#: ../camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Syntax error, command unrecognized"
 msgstr "Existe un erro de sintaxe; a orde no se recoÃeceu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:816
+#: ../camel/providers/smtp/camel-smtp-transport.c:708
 msgid "Syntax error in parameters or arguments"
 msgstr "Existe un erro de sintaxe nos parÃmetros ou nos argumentos"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:818
+#: ../camel/providers/smtp/camel-smtp-transport.c:710
 msgid "Command not implemented"
 msgstr "A orde non està implementada"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:820
+#: ../camel/providers/smtp/camel-smtp-transport.c:712
 msgid "Command parameter not implemented"
 msgstr "O parÃmetro da orde non està implementado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:822
+#: ../camel/providers/smtp/camel-smtp-transport.c:714
 msgid "System status, or system help reply"
 msgstr "Resposta do estado do sistema ou da axuda do sistema"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:824
+#: ../camel/providers/smtp/camel-smtp-transport.c:716
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:826
+#: ../camel/providers/smtp/camel-smtp-transport.c:718
 msgid "Service ready"
 msgstr "Servizo preparado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:828
+#: ../camel/providers/smtp/camel-smtp-transport.c:720
 msgid "Service closing transmission channel"
 msgstr "O servizo està pechando o canal de transmisiÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:830
+#: ../camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Service not available, closing transmission channel"
 msgstr "O servizo non està dispoÃÃbel; pechando o canal de transmisiÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:832
+#: ../camel/providers/smtp/camel-smtp-transport.c:724
 msgid "Requested mail action okay, completed"
 msgstr "A acciÃn de correo solicitada terminou correctamente"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:834
+#: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non à local; reencamiÃarase a <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:836
+#: ../camel/providers/smtp/camel-smtp-transport.c:728
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "A acciÃn de correo solicitada non se realizou: a caixa de correo non està "
 "dispoÃÃbel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:838
+#: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Requested action not taken: mailbox unavailable"
 msgstr ""
 "A acciÃn solicitada non se realizou: a caixa de correo non està dispoÃÃbel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:840
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 msgid "Requested action aborted: error in processing"
 msgstr "Cancelouse a acciÃn solicitada: produciuse un erro no procesamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:842
+#: ../camel/providers/smtp/camel-smtp-transport.c:734
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; tÃnteo con <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:844
+#: ../camel/providers/smtp/camel-smtp-transport.c:736
 msgid "Requested action not taken: insufficient system storage"
 msgstr ""
 "A acciÃn solicitada non se realizou: non hai suficiente almacenamento no "
 "sistema"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:846
+#: ../camel/providers/smtp/camel-smtp-transport.c:738
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Cancelouse a acciÃn solicitada: excedeuse a asignaciÃn de almacenamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:848
+#: ../camel/providers/smtp/camel-smtp-transport.c:740
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "A acciÃn pedida non se realizou: o nome da caixa de correo non se admite"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:850
+#: ../camel/providers/smtp/camel-smtp-transport.c:742
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Comezar a entrada do correo; terminar con <CRLF>.<CRLF>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:852
+#: ../camel/providers/smtp/camel-smtp-transport.c:744
 msgid "Transaction failed"
 msgstr "Produciuseuse un fallo na transacciÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:856
+#: ../camel/providers/smtp/camel-smtp-transport.c:748
 msgid "A password transition is needed"
 msgstr "PrecÃsase unha transiciÃn de contrasinal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:858
+#: ../camel/providers/smtp/camel-smtp-transport.c:750
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaciÃn à demasiado dÃbil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/providers/smtp/camel-smtp-transport.c:752
 msgid "Encryption required for requested authentication mechanism"
 msgstr "NecesÃtase un cifrado para o mecanismo de autenticaciÃn solicitado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:862
+#: ../camel/providers/smtp/camel-smtp-transport.c:754
 msgid "Temporary authentication failure"
 msgstr "Produciuse un fallo temporal de autenticaciÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1112
+#: ../camel/providers/smtp/camel-smtp-transport.c:1004
 msgid "SMTP Greeting"
 msgstr "SaÃdo SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1156
-#: ../camel/providers/smtp/camel-smtp-transport.c:1164
+#: ../camel/providers/smtp/camel-smtp-transport.c:1031
+#: ../camel/providers/smtp/camel-smtp-transport.c:1048
+#: ../camel/providers/smtp/camel-smtp-transport.c:1056
 msgid "HELO command failed: "
 msgstr "Produciuse un fallo na orde HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1233
+#: ../camel/providers/smtp/camel-smtp-transport.c:1125
 msgid "SMTP Authentication"
 msgstr "AutenticaciÃn SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1252
-#: ../camel/providers/smtp/camel-smtp-transport.c:1263
-#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1144
+#: ../camel/providers/smtp/camel-smtp-transport.c:1155
+#: ../camel/providers/smtp/camel-smtp-transport.c:1168
 msgid "AUTH command failed: "
 msgstr "Produciuse un fallo na orde AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1398
-#: ../camel/providers/smtp/camel-smtp-transport.c:1407
+#: ../camel/providers/smtp/camel-smtp-transport.c:1276
+#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1299
 msgid "MAIL FROM command failed: "
 msgstr "Produciuse un fallo na orde MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1326
 msgid "RCPT TO command failed: "
 msgstr "Produciuse un fallo na orde RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1450
-#: ../camel/providers/smtp/camel-smtp-transport.c:1459
+#: ../camel/providers/smtp/camel-smtp-transport.c:1342
+#: ../camel/providers/smtp/camel-smtp-transport.c:1351
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "Produciuse un fallo na orde RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1501
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1521
-#: ../camel/providers/smtp/camel-smtp-transport.c:1580
-#: ../camel/providers/smtp/camel-smtp-transport.c:1599
-#: ../camel/providers/smtp/camel-smtp-transport.c:1612
-#: ../camel/providers/smtp/camel-smtp-transport.c:1620
+#: ../camel/providers/smtp/camel-smtp-transport.c:1393
+#: ../camel/providers/smtp/camel-smtp-transport.c:1403
+#: ../camel/providers/smtp/camel-smtp-transport.c:1413
+#: ../camel/providers/smtp/camel-smtp-transport.c:1472
+#: ../camel/providers/smtp/camel-smtp-transport.c:1491
+#: ../camel/providers/smtp/camel-smtp-transport.c:1504
+#: ../camel/providers/smtp/camel-smtp-transport.c:1512
 msgid "DATA command failed: "
 msgstr "Produciuse un fallo na orde DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1645
-#: ../camel/providers/smtp/camel-smtp-transport.c:1659
-#: ../camel/providers/smtp/camel-smtp-transport.c:1667
+#: ../camel/providers/smtp/camel-smtp-transport.c:1537
+#: ../camel/providers/smtp/camel-smtp-transport.c:1551
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
 msgid "RSET command failed: "
 msgstr "Produciuse un fallo na orde RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1692
-#: ../camel/providers/smtp/camel-smtp-transport.c:1706
-#: ../camel/providers/smtp/camel-smtp-transport.c:1713
+#: ../camel/providers/smtp/camel-smtp-transport.c:1584
+#: ../camel/providers/smtp/camel-smtp-transport.c:1598
+#: ../camel/providers/smtp/camel-smtp-transport.c:1605
 msgid "QUIT command failed: "
 msgstr "Produciuse un fallo na orde QUIT: "
 
@@ -5096,7 +5096,7 @@ msgid ""
 "name"
 msgstr "Xa existe unha categorÃa Â%s na configuraciÃn. Utilice outro nome"
 
-#: ../libedataserverui/e-client-utils.c:807
+#: ../libedataserverui/e-client-utils.c:793
 #, c-format
 msgid ""
 "Enter password for %s (user %s)\n"
@@ -5105,11 +5105,11 @@ msgstr ""
 "Introduza o contrasinal para %s (usuario %s)\n"
 "RazÃn: %s"
 
-#: ../libedataserverui/e-client-utils.c:901
+#: ../libedataserverui/e-client-utils.c:887
 msgid "Enter Passphrase"
 msgstr "Introduza a frase de paso"
 
-#: ../libedataserverui/e-client-utils.c:903
+#: ../libedataserverui/e-client-utils.c:889
 msgid "Enter Password"
 msgstr "Introduza o contrasinal"