[evolution-data-server] Updated Galician translations



commit 1adbf62e35efce6bede5d02c260da28bc3f2f129
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Mon Dec 24 23:59:15 2012 +0100

    Updated Galician translations

 po/gl.po | 2426 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 1357 insertions(+), 1069 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 8f98dce..83656ce 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server-master-po-gl-71644\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-16 14:24+0200\n"
-"PO-Revision-Date: 2012-10-16 14:25+0200\n"
+"POT-Creation-Date: 2012-12-24 23:36+0100\n"
+"PO-Revision-Date: 2012-12-24 23:59+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
@@ -29,111 +29,101 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Galician\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:116
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1210
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4743
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:278
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:931
-#: ../addressbook/libebook/e-book-client.c:106
-#: ../addressbook/libedata-book/e-data-book.c:447
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:570
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:600
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:619
-#: ../calendar/libecal/e-cal.c:4059 ../calendar/libecal/e-cal-client.c:125
-#: ../camel/camel-imapx-command.c:594
-#: ../camel/providers/imap/camel-imap-command.c:525
-#: ../camel/providers/imap/camel-imap-store.c:469
-#: ../libedataserver/e-client.c:165
-msgid "Unknown error"
-msgstr "Erro descoÃecido"
-
-#: ../addressbook/backends/file/e-book-backend-file.c:141
+#: ../addressbook/backends/file/e-book-backend-file.c:101
 #, c-format
 msgid "Failed to remove file '%s': %s"
 msgstr "Produciuse un erro ao retirar o ficheiro Â%sÂ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:164
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:618
+#: ../addressbook/backends/file/e-book-backend-file.c:125
 #, c-format
 msgid "Failed to make directory %s: %s"
 msgstr "Produciuse un erro ao crear o cartafol %s: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:459
+#: ../addressbook/backends/file/e-book-backend-file.c:372
 #, c-format
 msgid "Failed to create hardlink for resource '%s': %s"
 msgstr "Produciuse un erro ao crear unha ligazÃn dura para o recurso Â%sÂ: %s"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:561
-#: ../addressbook/backends/file/e-book-backend-file.c:1127
+#: ../addressbook/backends/file/e-book-backend-file.c:474
+#: ../addressbook/backends/file/e-book-backend-file.c:877
 msgid "No UID in the contact"
 msgstr "O contacto non ten ningÃn UID"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1572
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:510
+#: ../addressbook/backends/file/e-book-backend-file.c:1145
 msgid "Loading..."
 msgstr "Cargandoâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:1575
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4848
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:512
+#: ../addressbook/backends/file/e-book-backend-file.c:1147
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4914
 msgid "Searching..."
 msgstr "Buscandoâ"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:2118
+#: ../addressbook/backends/file/e-book-backend-file.c:1303
 #, c-format
-msgid "Failed to build summary for an address book %s"
-msgstr ""
-"Produciuse un erro ao construÃr o resumo para unha libreta de enderezos %s"
+msgid "Failed to rename old database from '%s' to '%s': %s"
+msgstr "Non foi posÃbel renomear a base de datos antiga de %s a %s: %s"
+
+#: ../addressbook/backends/file/e-book-backend-file-migrate-bdb.c:142
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1190
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4809
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:282
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:967
+#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libedata-book/e-data-book.c:447
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:574
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:605
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:626
+#: ../calendar/libecal/e-cal.c:2336 ../calendar/libecal/e-cal-client.c:122
+#: ../camel/camel-imapx-command.c:594 ../libedataserver/e-client.c:165
+msgid "Unknown error"
+msgstr "Erro descoÃecido"
 
 #. Query for new contacts asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:645
+#: ../addressbook/backends/google/e-book-backend-google.c:648
 msgid "Querying for updated contactsâ"
 msgstr "Solicitando actualizaciÃns de contactosâ"
 
 #. Run the query asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:782
+#: ../addressbook/backends/google/e-book-backend-google.c:785
 msgid "Querying for updated groupsâ"
 msgstr "Solicitando actualizaciÃn de gruposâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1202
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1633
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:287
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:326
+#: ../addressbook/backends/google/e-book-backend-google.c:1211
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1621
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:331
 msgid "The backend does not support bulk additions"
 msgstr "A infraestrutura non permite adiciÃns en lote"
 
 #. Insert the entry on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1234
+#: ../addressbook/backends/google/e-book-backend-google.c:1243
 msgid "Creating new contactâ"
 msgstr "Creando un contacto novoâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1323
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:319
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:433
+#: ../addressbook/backends/google/e-book-backend-google.c:1334
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
 msgid "The backend does not support bulk removals"
 msgstr "A infraestrutura non permite retiradas en lote"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1351
+#: ../addressbook/backends/google/e-book-backend-google.c:1362
 msgid "Deleting contactâ"
 msgstr "Eliminando contactoâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1601
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2275
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:367
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:487
+#: ../addressbook/backends/google/e-book-backend-google.c:1616
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2284
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:508
 msgid "The backend does not support bulk modifications"
 msgstr "A infraestrutura non permite modificaciÃns en lote"
 
 #. Update the contact on the server asynchronously
-#: ../addressbook/backends/google/e-book-backend-google.c:1639
+#: ../addressbook/backends/google/e-book-backend-google.c:1654
 msgid "Modifying contactâ"
 msgstr "Modificando contactoâ"
 
-#: ../addressbook/backends/google/e-book-backend-google.c:1809
+#: ../addressbook/backends/google/e-book-backend-google.c:1825
 msgid "Loadingâ"
 msgstr "Cargandoâ"
 
-#: ../addressbook/backends/google/e-book-google-utils.c:1562
+#: ../addressbook/backends/google/e-book-google-utils.c:1601
 #: ../data/sources/system-address-book.source.in.h:1
 #: ../data/sources/system-calendar.source.in.h:1
 #: ../data/sources/system-memo-list.source.in.h:1
@@ -142,17 +132,17 @@ msgid "Personal"
 msgstr "Persoal"
 
 #. System Group: My Contacts
-#: ../addressbook/backends/google/e-book-google-utils.c:1563
+#: ../addressbook/backends/google/e-book-google-utils.c:1602
 msgid "Friends"
 msgstr "Amigos"
 
 #. System Group: Friends
-#: ../addressbook/backends/google/e-book-google-utils.c:1564
+#: ../addressbook/backends/google/e-book-google-utils.c:1603
 msgid "Family"
 msgstr "Familia"
 
 #. System Group: Family
-#: ../addressbook/backends/google/e-book-google-utils.c:1565
+#: ../addressbook/backends/google/e-book-google-utils.c:1604
 msgid "Coworkers"
 msgstr "CompaÃeiros de traballo"
 
@@ -161,155 +151,142 @@ msgstr "CompaÃeiros de traballo"
 msgid "Not connected"
 msgstr "Non conectado"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:771
-msgid "Using Distinguished Name (DN)"
-msgstr "Usar nome distintivo (DN)"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:774
-msgid "Using Email Address"
-msgstr "Usando o enderezo de correo electrÃnico"
-
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:947
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:922
 msgid "Failed to bind using either v3 or v2 binds"
 msgstr "Produciuse un fallo ao asociar tango ao usar ligazÃns v3 ou v2"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1068
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1045
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando novamente ao servidor LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1194
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1171
 msgid "Invalid DN syntax"
 msgstr "A sintaxe do DN non à vÃlida"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1209
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4742
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1187
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4808
 #, c-format
 msgid "LDAP error 0x%x (%s)"
 msgstr "Erro de LDAP 0x%x (%s)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1717
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1705
 msgid "Adding contact to LDAP server..."
 msgstr "Engadindo o contacto ao servidor LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1848
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
 msgstr "Retirando o contacto do servidor LDAPâ"
 
 #: ../addressbook/backends/ldap/e-book-backend-ldap.c:1985
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2368
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2380
 #, c-format
 msgid "%s: NULL returned from ldap_first_entry"
 msgstr "%s: ldap_first_entry devolveu NULL"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2228
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2419
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2237
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2437
 #, c-format
 msgid "%s: Unhandled result type %d returned"
 msgstr "%s: devolto tipo de resultado %d non xestionado"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2297
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2306
 msgid "Modifying contact from LDAP server..."
 msgstr "Modificando o contacto do servidor LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2636
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2849
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2666
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2886
 #, c-format
 msgid "%s: Unhandled search result type %d returned"
 msgstr "%s: devolto tipo de resultado de busca %d no xestionado"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4694
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4757
 msgid "Receiving LDAP search results..."
 msgstr "Recibindo os resultados da busca no LDAPâ"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4869
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4936
 msgid "Error performing search"
 msgstr "Produciuse un erro ao realizar a busca"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4990
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5059
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Descargando os contactos (%d)â "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5447
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:5516
 #, c-format
 msgid "Failed to get the DN for user '%s'"
 msgstr "Produciuse un erro ao obter o DN para o usuario Â%sÂ"
 
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:647
-#, c-format
-msgid "Failed to open addressbook at '%s': %s"
-msgstr "Produciuse un erro ao abrir a axenda de enderezos en Â%sÂ: %s"
-
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:354
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:362
 #, c-format
 msgid "Create resource '%s' failed with HTTP status: %d (%s)"
 msgstr "A creaciÃn do recurso Â%s fallou con estado HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:447
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:463
 #, c-format
 msgid "DELETE failed with HTTP status %d"
 msgstr "DELETE co estado HTTP %d"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:507
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:529
 msgid "Contact on server changed -> not modifying"
 msgstr "Contacto modificado no servidor -> non se modifica"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:515
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:538
 #, c-format
 msgid "Modify contact failed with HTTP status: %d (%s)"
 msgstr "Produciuse un fallo ao modificar o contacto co estado HTTP> %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:912
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:945
 msgid "Loading Addressbook summary..."
 msgstr "Cargando resumo da axenda de enderezos â"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:928
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:964
 #, c-format
 msgid "PROPFIND on webdav failed with HTTP status %d (%s)"
 msgstr "Produciuse un fallo PROPFIND en WebDav co estado HTTP: %d (%s)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:949
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:989
 msgid "No response body in webdav PROPFIND result"
 msgstr "Non hai corpo da resposta no resultado PROPFIND de WebDav"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:980
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1021
 #, c-format
 msgid "Loading Contacts (%d%%)"
 msgstr "Cargando contactos (%d%%)"
 
-#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1293
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:1354
 msgid "Cannot transform SoupURI to string"
 msgstr "Non foi posÃbel transformar SoupURI a unha cadea"
 
-#: ../addressbook/libebook/e-book-client.c:95
+#: ../addressbook/libebook/e-book-client.c:88
 msgid "No such book"
 msgstr "Non existe o libro"
 
-#: ../addressbook/libebook/e-book-client.c:97
+#: ../addressbook/libebook/e-book-client.c:90
 #: ../addressbook/libedata-book/e-data-book.c:321
 msgid "Contact not found"
 msgstr "O contacto non se atopou"
 
-#: ../addressbook/libebook/e-book-client.c:99
+#: ../addressbook/libebook/e-book-client.c:92
 #: ../addressbook/libedata-book/e-data-book.c:322
 msgid "Contact ID already exists"
 msgstr "O ID do contacto xa existe"
 
-#: ../addressbook/libebook/e-book-client.c:101
+#: ../addressbook/libebook/e-book-client.c:94
 msgid "No such source"
 msgstr "Non existe a orixe"
 
-#: ../addressbook/libebook/e-book-client.c:103
+#: ../addressbook/libebook/e-book-client.c:96
 #: ../addressbook/libedata-book/e-data-book.c:338
 msgid "No space"
 msgstr "Sen espazos"
 
-#: ../addressbook/libebook/e-book-client.c:857
+#: ../addressbook/libebook/e-book-client.c:884
 msgid "Failed to run book factory"
 msgstr "Produciuse un erro ao executar a fÃbrica do caderno"
 
-#: ../addressbook/libebook/e-book-client.c:2390
-#: ../calendar/libecal/e-cal-client.c:4772
+#: ../addressbook/libebook/e-book-client.c:2526
+#: ../calendar/libecal/e-cal-client.c:4790
 msgid "Cannot get connection to view"
 msgstr "Non à posÃbel obter unha conexiÃn para visualizar"
 
@@ -503,7 +480,6 @@ msgstr "URL do blog"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:188
-#: ../libedataserverui/e-categories-dialog.c:90
 msgid "Categories"
 msgstr "CategorÃas"
 
@@ -780,7 +756,7 @@ msgid "Birth Date"
 msgstr "Data de nacemento"
 
 #: ../addressbook/libebook/e-contact.c:284
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:919
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -890,8 +866,8 @@ msgstr "Lista de nomes de Google Talk"
 msgid "Twitter Name List"
 msgstr "Lista de nomes de Twitter"
 
-#: ../addressbook/libebook/e-contact.c:1623
-#: ../addressbook/libebook/e-destination.c:879
+#: ../addressbook/libebook/e-contact.c:1683
+#: ../addressbook/libebook/e-destination.c:884
 msgid "Unnamed List"
 msgstr "Lista sen nome"
 
@@ -909,17 +885,68 @@ msgstr "A propiedade Â%s do caderno à descoÃecida"
 msgid "Cannot change value of book property '%s'"
 msgstr "Non à posÃbel cambiar o valor da propiedade Â%s do caderno"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:500
-#: ../camel/camel-db.c:503
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:742
+#, c-format
+msgid "Error introspecting unknown summary field '%s'"
+msgstr ""
+"Produciuse un erro ao instrospeccionar o campo de resumo non coÃecido Â%sÂ"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:963
+#: ../camel/camel-db.c:510
 #, c-format
 msgid "Insufficient memory"
 msgstr "Memoria insuficiente"
 
-#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1092
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1093
+#, c-format
+msgid "Invalid contact field '%d' specified in summary"
+msgstr "Campo de contacto Â%d non vÃlido especificado no resumo"
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:1126
+#, c-format
+msgid ""
+"Contact field '%s' of type '%s' specified in summary, but only boolean, "
+"string and string list field types are supported"
+msgstr ""
+"Campo de contacto Â%s do tipo Â%s especificado no resumo, pero sà se "
+"admiten os tipos de campo booleanos, cadeas ou lista de cadeas "
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2058
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2839
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. vcards cannot be returned."
+msgstr ""
+"Os search_contacts completos non estÃn almacenados na cachÃ. As vcards non "
+"se devolven."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2071
 #, c-format
 msgid "Contact '%s' not found"
 msgstr "Contacto Â%s non atopado"
 
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:2981
+#, c-format
+msgid ""
+"Full search_contacts are not stored in cache. Hence only summary query is "
+"supported."
+msgstr ""
+"Os search_contacts completos non estÃn almacenados na cachÃ. Polo tanto sà "
+"admite a consulta do resumo."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3059
+#, c-format
+msgid ""
+"Full vcards are not stored in cache. Hence only summary query is supported."
+msgstr ""
+"As vcards completas non estÃn almacenadas na cachÃ. Polo tanto sà admite a "
+"consulta do resumo."
+
+#: ../addressbook/libedata-book/e-book-backend-sqlitedb.c:3731
+#, c-format
+msgid "Unable to remove the db file: errno %d"
+msgstr "Produciuse un erro ao eliminar o ficheiro da base de datos: errno d"
+
 #. Translators: This is prefix to a detailed error message
 #: ../addressbook/libedata-book/e-data-book.c:208
 #: ../addressbook/libedata-book/e-data-book.c:231
@@ -933,7 +960,7 @@ msgid "Success"
 msgstr "Correcto"
 
 #: ../addressbook/libedata-book/e-data-book.c:318
-#: ../calendar/libecal/e-cal.c:4027 ../calendar/libedata-cal/e-data-cal.c:428
+#: ../calendar/libecal/e-cal.c:2304 ../calendar/libedata-cal/e-data-cal.c:428
 #: ../libedataserver/e-client.c:122
 msgid "Backend is busy"
 msgstr "O motor da infraestrutura està ocupado"
@@ -944,7 +971,7 @@ msgid "Repository offline"
 msgstr "O repositorio està desconectado"
 
 #: ../addressbook/libedata-book/e-data-book.c:320
-#: ../calendar/libecal/e-cal.c:4041 ../calendar/libedata-cal/e-data-cal.c:430
+#: ../calendar/libecal/e-cal.c:2318 ../calendar/libedata-cal/e-data-cal.c:430
 #: ../libedataserver/e-client.c:138
 msgid "Permission denied"
 msgstr "Permiso denegado"
@@ -1020,15 +1047,17 @@ msgid "Invalid server version"
 msgstr "A versiÃn do servidor non à valida"
 
 #: ../addressbook/libedata-book/e-data-book.c:339
-#: ../calendar/libecal/e-cal.c:4025 ../calendar/libedata-cal/e-data-cal.c:451
+#: ../calendar/libecal/e-cal.c:2302 ../calendar/libedata-cal/e-data-cal.c:451
 #: ../libedataserver/e-client.c:120
 msgid "Invalid argument"
 msgstr "O argumento non à vÃlido"
 
 #. Translators: The string for NOT_SUPPORTED error
 #: ../addressbook/libedata-book/e-data-book.c:341
-#: ../calendar/libecal/e-cal.c:4064 ../calendar/libedata-cal/e-data-cal.c:453
-#: ../libedataserver/e-client.c:144
+#: ../calendar/libecal/e-cal.c:1064 ../calendar/libecal/e-cal.c:1432
+#: ../calendar/libecal/e-cal.c:1912 ../calendar/libecal/e-cal.c:2341
+#: ../calendar/libedata-cal/e-data-cal.c:453 ../libedataserver/e-client.c:144
+#, c-format
 msgid "Not supported"
 msgstr "Non à compatÃbel"
 
@@ -1038,7 +1067,7 @@ msgid "Backend is not opened yet"
 msgstr "A infraestrutura aÃnda non està aberta"
 
 #: ../addressbook/libedata-book/e-data-book.c:350
-#: ../calendar/libecal/e-cal-client.c:1004
+#: ../calendar/libecal/e-cal-client.c:1002
 #: ../calendar/libedata-cal/e-data-cal.c:462 ../libedataserver/e-client.c:160
 msgid "Other error"
 msgstr "Outro erro"
@@ -1103,40 +1132,40 @@ msgstr "Non à posÃbel obter a lista de UID dos contactos:"
 msgid "Cannot remove contacts: "
 msgstr "Non à posÃbel retirar os contactos:"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:103
+#: ../addressbook/libedata-book/e-data-book-factory.c:93
 #: ../calendar/libedata-cal/e-data-cal-factory.c:114
 #, c-format
 msgid "No backend name in source '%s'"
 msgstr "Non hai ningÃn nome de infraestrutura na orixe Â%sÂ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:115
+#: ../addressbook/libedata-book/e-data-book-factory.c:105
 #: ../calendar/libedata-cal/e-data-cal-factory.c:127
 #, c-format
 msgid "Invalid backend name '%s' in source '%s'"
 msgstr "Nome de infraestrutura Â%s non vÃlido na orixe Â%sÂ"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:319
+#: ../addressbook/libedata-book/e-data-book-factory.c:198
 #: ../calendar/libedata-cal/e-data-cal-factory.c:230
 msgid "Missing source UID"
 msgstr "Falta o UID da fonte"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:211
 #: ../calendar/libedata-cal/e-data-cal-factory.c:243
 #, c-format
 msgid "No such source for UID '%s'"
 msgstr "Non existe a orixe para o UID Â%sÂ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:568
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:572
 #, c-format
 msgid "Server is unreachable (%s)"
 msgstr "Non à posÃbel chegar ao servidor (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:598
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
 #, c-format
 msgid "Failed to connect to a server using SSL: %s"
 msgstr "Produciuse un erro ao conectar co servidor SSL: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:603
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:609
 msgid ""
 "Failed to connect to a server using SSL. One possible reason is an invalid "
 "certificate being used by the server. If this is expected, like self-signed "
@@ -1149,21 +1178,21 @@ msgstr ""
 "comprobaciÃn da validez do certificado seleccionando a opciÃn ÂIgnorar "
 "certificado SSL non vÃlido en Propiedades."
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:616
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:623
 #, c-format
 msgid "Unexpected HTTP status code %d returned (%s)"
 msgstr "Devolveuse un cÃdigo de estado HTTP %d non agardado (%s)"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:635
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:642
 msgid "CalDAV backend is not loaded yet"
 msgstr "Non à posÃbel cargar a infraestrutura de CalDAV"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1017
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:1031
 msgid "Invalid Redirect URL"
 msgstr "URL de redirecciÃn non vÃlido"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2360
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2722
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2390
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2752
 #, c-format
 msgid ""
 "Server is unreachable, calendar is opened in read-only mode.\n"
@@ -1173,53 +1202,49 @@ msgstr ""
 "lectura.\n"
 "Mensaxe de erro: %s"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2663
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2696
 msgid "Cannot create local store"
 msgstr "Non à posÃbel crear o almacÃn local"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2672
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2705
 #, c-format
 msgid "Cannot create local cache folder '%s'"
 msgstr "Non à posÃbel crear o cartafol de cachà local: Â%sÂ"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2683
-msgid "Could not create synch slave thread"
-msgstr "Non à posÃbel crear o fluxo escravo de sincronizaciÃn"
-
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3677
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3708
 msgid "CalDAV does not support bulk additions"
 msgstr "CalDAV non permite adiciÃns en lote"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3779
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3810
 msgid "CalDAV does not support bulk modifications"
 msgstr "CalDAV non permite modificaciÃns en lote"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3947
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:3978
 msgid "CalDAV does not support bulk removals"
 msgstr "CalDAV non permite retiradas en lote"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4603
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4634
 msgid "Calendar doesn't support Free/Busy"
 msgstr "O calendario non admite Libre/Ocupado"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4611
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4642
 msgid "Schedule outbox url not found"
 msgstr "URL da bandexa de saÃda programada non atopada"
 
-#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4710
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4741
 msgid "Unexpected result in schedule-response"
 msgstr "Resultado non agardado na resposta programada"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:921
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:959
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:957
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:995
 #, c-format
 msgid "Birthday: %s"
 msgstr "Aniversario: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:988
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:1026
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Datas especiais: %s"
@@ -1234,300 +1259,300 @@ msgstr ""
 msgid "Cannot save calendar data"
 msgstr "Non à posÃbel gardar os datos do calendario"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:482
+#: ../calendar/backends/http/e-cal-backend-http.c:483
 #, c-format
 msgid "Malformed URI: %s"
 msgstr "URI mal formada: %s"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:543
+#: ../calendar/backends/http/e-cal-backend-http.c:544
 #, c-format
 msgid "Redirected to Invalid URI"
 msgstr "Redireccionado a un URI que non à vÃlido"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:580
+#: ../calendar/backends/http/e-cal-backend-http.c:581
 #, c-format
 msgid "Bad file format."
 msgstr "O formato de ficheiro non à vÃlido."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:590
+#: ../calendar/backends/http/e-cal-backend-http.c:591
 #, c-format
 msgid "Not a calendar."
 msgstr "Non à un calendario."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:887
-#: ../calendar/backends/http/e-cal-backend-http.c:891
-#: ../calendar/backends/weather/e-cal-backend-weather.c:511
+#: ../calendar/backends/http/e-cal-backend-http.c:888
+#: ../calendar/backends/http/e-cal-backend-http.c:893
+#: ../calendar/backends/weather/e-cal-backend-weather.c:512
 msgid "Could not create cache file"
 msgstr "Non foi posÃbel crear o ficheiro da cachÃ"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:171
+#: ../calendar/backends/weather/e-cal-backend-weather.c:172
 msgid "Could not retrieve weather data"
 msgstr "Non foi posÃbel obter os datos meteorolÃxicos"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:276
+#: ../calendar/backends/weather/e-cal-backend-weather.c:277
 msgid "Weather: Fog"
 msgstr "Tempo: nÃboa"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:277
+#: ../calendar/backends/weather/e-cal-backend-weather.c:278
 msgid "Weather: Cloudy Night"
 msgstr "Tempo: noite anubrada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:278
+#: ../calendar/backends/weather/e-cal-backend-weather.c:279
 msgid "Weather: Cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:279
+#: ../calendar/backends/weather/e-cal-backend-weather.c:280
 msgid "Weather: Overcast"
 msgstr "Tempo: moi anubrado"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:280
+#: ../calendar/backends/weather/e-cal-backend-weather.c:281
 msgid "Weather: Showers"
 msgstr "Tempo: chuvias fortes"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:281
+#: ../calendar/backends/weather/e-cal-backend-weather.c:282
 msgid "Weather: Snow"
 msgstr "Tempo: neve"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:282
+#: ../calendar/backends/weather/e-cal-backend-weather.c:283
 msgid "Weather: Clear Night"
 msgstr "Tempo: noite despexada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:283
+#: ../calendar/backends/weather/e-cal-backend-weather.c:284
 msgid "Weather: Sunny"
 msgstr "Tempo: sol"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:284
+#: ../calendar/backends/weather/e-cal-backend-weather.c:285
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:408
+#: ../calendar/backends/weather/e-cal-backend-weather.c:409
 msgid "Forecast"
 msgstr "PrognÃstico"
 
-#: ../calendar/libecal/e-cal.c:4029
+#: ../calendar/libecal/e-cal.c:2306
 msgid "Repository is offline"
 msgstr "O repositorio està desconectado"
 
-#: ../calendar/libecal/e-cal.c:4031 ../calendar/libecal/e-cal-client.c:112
+#: ../calendar/libecal/e-cal.c:2308 ../calendar/libecal/e-cal-client.c:109
 msgid "No such calendar"
 msgstr "Non existe o calendario"
 
-#: ../calendar/libecal/e-cal.c:4033 ../calendar/libecal/e-cal-client.c:114
+#: ../calendar/libecal/e-cal.c:2310 ../calendar/libecal/e-cal-client.c:111
 #: ../calendar/libedata-cal/e-data-cal.c:432
 msgid "Object not found"
 msgstr "O obxecto non se atopou"
 
-#: ../calendar/libecal/e-cal.c:4035 ../calendar/libecal/e-cal-client.c:116
+#: ../calendar/libecal/e-cal.c:2312 ../calendar/libecal/e-cal-client.c:113
 #: ../calendar/libedata-cal/e-data-cal.c:433
 msgid "Invalid object"
 msgstr "O obxecto non à vÃlido"
 
-#: ../calendar/libecal/e-cal.c:4037
+#: ../calendar/libecal/e-cal.c:2314
 msgid "URI not loaded"
 msgstr "O URI non se cargou"
 
-#: ../calendar/libecal/e-cal.c:4039
+#: ../calendar/libecal/e-cal.c:2316
 msgid "URI already loaded"
 msgstr "O URI xa se cargou"
 
-#: ../calendar/libecal/e-cal.c:4043
+#: ../calendar/libecal/e-cal.c:2320
 msgid "Unknown User"
 msgstr "Usuario descoÃecido"
 
-#: ../calendar/libecal/e-cal.c:4045 ../calendar/libecal/e-cal-client.c:120
+#: ../calendar/libecal/e-cal.c:2322 ../calendar/libecal/e-cal-client.c:117
 #: ../calendar/libedata-cal/e-data-cal.c:434
 msgid "Object ID already exists"
 msgstr "O ID do obxecto xa existe"
 
-#: ../calendar/libecal/e-cal.c:4047
+#: ../calendar/libecal/e-cal.c:2324
 msgid "Protocol not supported"
 msgstr "O protocolo non à compatÃbel"
 
-#: ../calendar/libecal/e-cal.c:4049
+#: ../calendar/libecal/e-cal.c:2326
 msgid "Operation has been canceled"
 msgstr "A operaciÃn cancelouse"
 
-#: ../calendar/libecal/e-cal.c:4051
+#: ../calendar/libecal/e-cal.c:2328
 msgid "Could not cancel operation"
 msgstr "Non foi posÃbel cancelar a operaciÃn"
 
-#: ../calendar/libecal/e-cal.c:4053 ../libedataserver/e-client.c:128
+#: ../calendar/libecal/e-cal.c:2330 ../libedataserver/e-client.c:128
 msgid "Authentication failed"
 msgstr "A autenticaciÃn fallou"
 
-#: ../calendar/libecal/e-cal.c:4055
-#: ../camel/providers/smtp/camel-smtp-transport.c:857
+#: ../calendar/libecal/e-cal.c:2332
+#: ../camel/providers/smtp/camel-smtp-transport.c:856
 #: ../libedataserver/e-client.c:130
 msgid "Authentication required"
 msgstr "AutenticaciÃn requirida"
 
-#: ../calendar/libecal/e-cal.c:4057
+#: ../calendar/libecal/e-cal.c:2334
 msgid "A D-Bus exception has occurred"
 msgstr "Produciuse unha excepciÃn de D-Bus"
 
-#: ../calendar/libecal/e-cal.c:4061
+#: ../calendar/libecal/e-cal.c:2338
 msgid "No error"
 msgstr "Sen erros"
 
-#: ../calendar/libecal/e-cal-client.c:118
+#: ../calendar/libecal/e-cal-client.c:115
 #: ../calendar/libedata-cal/e-data-cal.c:442
 msgid "Unknown user"
 msgstr "Usuario descoÃecido"
 
-#: ../calendar/libecal/e-cal-client.c:122
+#: ../calendar/libecal/e-cal-client.c:119
 #: ../calendar/libedata-cal/e-data-cal.c:431
 msgid "Invalid range"
 msgstr "O intervalo non à vÃlido"
 
-#: ../calendar/libecal/e-cal-client.c:995
+#: ../calendar/libecal/e-cal-client.c:993
 msgid "Failed to run calendar factory"
 msgstr "Produciuse un erro ao executar a fÃbrica da axenda"
 
-#: ../calendar/libecal/e-cal-component.c:1339
+#: ../calendar/libecal/e-cal-component.c:1340
 msgid "Untitled appointment"
 msgstr "Cita sen tÃtulo"
 
-#: ../calendar/libecal/e-cal-recur.c:3987
+#: ../calendar/libecal/e-cal-recur.c:4036
 msgid "1st"
 msgstr "1Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3988
+#: ../calendar/libecal/e-cal-recur.c:4037
 msgid "2nd"
 msgstr "2Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3989
+#: ../calendar/libecal/e-cal-recur.c:4038
 msgid "3rd"
 msgstr "3Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3990
+#: ../calendar/libecal/e-cal-recur.c:4039
 msgid "4th"
 msgstr "4Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3991
+#: ../calendar/libecal/e-cal-recur.c:4040
 msgid "5th"
 msgstr "5Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3992
+#: ../calendar/libecal/e-cal-recur.c:4041
 msgid "6th"
 msgstr "6Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3993
+#: ../calendar/libecal/e-cal-recur.c:4042
 msgid "7th"
 msgstr "7Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3994
+#: ../calendar/libecal/e-cal-recur.c:4043
 msgid "8th"
 msgstr "8Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3995
+#: ../calendar/libecal/e-cal-recur.c:4044
 msgid "9th"
 msgstr "9Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3996
+#: ../calendar/libecal/e-cal-recur.c:4045
 msgid "10th"
 msgstr "10Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3997
+#: ../calendar/libecal/e-cal-recur.c:4046
 msgid "11th"
 msgstr "11Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3998
+#: ../calendar/libecal/e-cal-recur.c:4047
 msgid "12th"
 msgstr "12Â"
 
-#: ../calendar/libecal/e-cal-recur.c:3999
+#: ../calendar/libecal/e-cal-recur.c:4048
 msgid "13th"
 msgstr "13Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4000
+#: ../calendar/libecal/e-cal-recur.c:4049
 msgid "14th"
 msgstr "14Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4001
+#: ../calendar/libecal/e-cal-recur.c:4050
 msgid "15th"
 msgstr "15Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4002
+#: ../calendar/libecal/e-cal-recur.c:4051
 msgid "16th"
 msgstr "16Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4003
+#: ../calendar/libecal/e-cal-recur.c:4052
 msgid "17th"
 msgstr "17Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4004
+#: ../calendar/libecal/e-cal-recur.c:4053
 msgid "18th"
 msgstr "18Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4005
+#: ../calendar/libecal/e-cal-recur.c:4054
 msgid "19th"
 msgstr "19Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4006
+#: ../calendar/libecal/e-cal-recur.c:4055
 msgid "20th"
 msgstr "20Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4007
+#: ../calendar/libecal/e-cal-recur.c:4056
 msgid "21st"
 msgstr "21Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4008
+#: ../calendar/libecal/e-cal-recur.c:4057
 msgid "22nd"
 msgstr "22Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4009
+#: ../calendar/libecal/e-cal-recur.c:4058
 msgid "23rd"
 msgstr "23Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4010
+#: ../calendar/libecal/e-cal-recur.c:4059
 msgid "24th"
 msgstr "24Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4011
+#: ../calendar/libecal/e-cal-recur.c:4060
 msgid "25th"
 msgstr "25Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4012
+#: ../calendar/libecal/e-cal-recur.c:4061
 msgid "26th"
 msgstr "26Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4013
+#: ../calendar/libecal/e-cal-recur.c:4062
 msgid "27th"
 msgstr "27Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4014
+#: ../calendar/libecal/e-cal-recur.c:4063
 msgid "28th"
 msgstr "28Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4015
+#: ../calendar/libecal/e-cal-recur.c:4064
 msgid "29th"
 msgstr "29Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4016
+#: ../calendar/libecal/e-cal-recur.c:4065
 msgid "30th"
 msgstr "30Â"
 
-#: ../calendar/libecal/e-cal-recur.c:4017
+#: ../calendar/libecal/e-cal-recur.c:4066
 msgid "31st"
 msgstr "31Â"
 
-#: ../calendar/libecal/e-cal-util.c:696 ../calendar/libecal/e-cal-util.c:723
+#: ../calendar/libecal/e-cal-util.c:697 ../calendar/libecal/e-cal-util.c:724
 msgctxt "Priority"
 msgid "High"
 msgstr "Alta"
 
-#: ../calendar/libecal/e-cal-util.c:698 ../calendar/libecal/e-cal-util.c:725
+#: ../calendar/libecal/e-cal-util.c:699 ../calendar/libecal/e-cal-util.c:726
 msgctxt "Priority"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/libecal/e-cal-util.c:700 ../calendar/libecal/e-cal-util.c:727
+#: ../calendar/libecal/e-cal-util.c:701 ../calendar/libecal/e-cal-util.c:728
 msgctxt "Priority"
 msgid "Low"
 msgstr "Baixa"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:721
+#: ../calendar/libecal/e-cal-util.c:722
 msgctxt "Priority"
 msgid "Undefined"
 msgstr "Sen definir"
@@ -1546,94 +1571,94 @@ msgstr "Propiedade Â%s do calendario descoÃecida"
 msgid "Cannot change value of calendar property '%s'"
 msgstr "Non à posÃbel cambiar o valor da propiedade Â%s do calendario"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:77
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:817
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:839
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:954
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:985
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1185
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1215
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:78
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:847
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:990
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1022
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1229
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1260
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "Â%s non espera argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:229
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:274
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:313
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1256
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:238
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:285
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:326
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1302
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "Â%s agarda un argumento"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:119
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:126
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:319
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:884
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:122
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:130
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:333
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:917
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "Â%s agarda que o primeiro argumento sexa unha cadea"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:134
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:139
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "Â%s agarda que o primeiro argumento sexa unha cadea de data e hora ISO 8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:535
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1020
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:562
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:910
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1058
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "Â%s agarda 2 argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:182
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:235
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:280
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:401
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:484
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:541
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1026
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1262
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:189
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:245
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:292
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:417
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:506
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:569
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1065
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1309
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "Â%s agarda que o primeiro argumento sexa un time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:190
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:198
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "Â%s agarda que o segundo argumento sexa un enteiro"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:395
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:410
 #, c-format
 msgid "\"%s\" expects two or three arguments"
 msgstr "Â%s agarda dous ou tres argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:409
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:490
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:550
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1034
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:426
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:514
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:579
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1074
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "Â%s agarda que o segundo argumento sexa un time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:418
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:436
 #, c-format
 msgid "\"%s\" expects the third argument to be a string"
 msgstr "Â%s agarda que o terceiro argumento sexa unha cadea"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:478
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:498
 #, c-format
 msgid "\"%s\" expects none or two arguments"
 msgstr "Â%s agarda ningÃn ou dous argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:892
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:926
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "Â%s agarda que o segundo argumento sexa unha cadea"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:922
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:957
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1644,12 +1669,12 @@ msgstr ""
 "\"description\", ou \"location\", ou \"attendee\", ou \"organizer\", ou "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1084
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1126
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "Â%s agarda polo menos un argumento"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1098
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1141
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1751,45 +1776,45 @@ msgstr "Non à posÃbel engadir o fuso horario do calendario: "
 msgid "Invalid call"
 msgstr "Chamada non vÃlida"
 
-#: ../camel/camel-cipher-context.c:206
+#: ../camel/camel-cipher-context.c:208
 #, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Este tipo de cifrado non à compatÃbel coa sinaturas"
 
-#: ../camel/camel-cipher-context.c:219
+#: ../camel/camel-cipher-context.c:221
 #, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Este tipo de cifrado non à compatÃbel coa comprobaciÃn"
 
-#: ../camel/camel-cipher-context.c:235
+#: ../camel/camel-cipher-context.c:237
 #, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Este mÃtodo de cifrado non à compatÃbel cifrado"
 
-#: ../camel/camel-cipher-context.c:249
+#: ../camel/camel-cipher-context.c:251
 #, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "O mÃtodo de cifrado non à compatÃbel con descifrado"
 
-#: ../camel/camel-cipher-context.c:262
+#: ../camel/camel-cipher-context.c:264
 #, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Non pode importar chaves con este tipo de cifrado"
 
-#: ../camel/camel-cipher-context.c:276
+#: ../camel/camel-cipher-context.c:278
 #, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Non pode exportar chaves con este tipo de cifrado"
 
-#: ../camel/camel-cipher-context.c:817
+#: ../camel/camel-cipher-context.c:819
 msgid "Signing message"
 msgstr "Asinando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:1058
+#: ../camel/camel-cipher-context.c:1060
 msgid "Encrypting message"
 msgstr "Cifrando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:1185
+#: ../camel/camel-cipher-context.c:1187
 msgid "Decrypting message"
 msgstr "Descifrando a mensaxe"
 
@@ -1819,7 +1844,6 @@ msgstr ""
 "se conecte de novo à rede."
 
 #: ../camel/camel-disco-diary.c:271
-#: ../camel/providers/imap/camel-imap-journal.c:312
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1849,23 +1873,19 @@ msgstr ""
 "Copiar o contido do cartafol localmente para unha _operaciÃn en modo sen "
 "conexiÃn"
 
-#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:413
-#: ../camel/camel-imapx-folder.c:446 ../camel/camel-imapx-folder.c:482
-#: ../camel/camel-imapx-folder.c:538 ../camel/camel-imapx-folder.c:614
-#: ../camel/camel-imapx-folder.c:648 ../camel/camel-imapx-folder.c:688
-#: ../camel/camel-imapx-folder.c:724 ../camel/camel-imapx-store.c:276
-#: ../camel/camel-imapx-store.c:1398 ../camel/camel-imapx-store.c:1487
-#: ../camel/camel-imapx-store.c:1536
-#: ../camel/providers/imap/camel-imap-store.c:1270
-#: ../camel/providers/imap/camel-imap-store.c:2033
-#: ../camel/providers/imap/camel-imap-store.c:2509
-#: ../camel/providers/imap/camel-imap-store.c:3289
-#: ../camel/providers/pop3/camel-pop3-folder.c:531
-#: ../camel/providers/pop3/camel-pop3-folder.c:674
-#: ../camel/providers/pop3/camel-pop3-folder.c:874
-#: ../camel/providers/pop3/camel-pop3-folder.c:1074
-#: ../camel/providers/pop3/camel-pop3-store.c:408
-#: ../camel/providers/pop3/camel-pop3-store.c:831
+#: ../camel/camel-disco-store.c:469 ../camel/camel-imapx-folder.c:478
+#: ../camel/camel-imapx-folder.c:514 ../camel/camel-imapx-folder.c:553
+#: ../camel/camel-imapx-folder.c:613 ../camel/camel-imapx-folder.c:748
+#: ../camel/camel-imapx-folder.c:933 ../camel/camel-imapx-folder.c:993
+#: ../camel/camel-imapx-folder.c:1032 ../camel/camel-imapx-store.c:320
+#: ../camel/camel-imapx-store.c:1454 ../camel/camel-imapx-store.c:1543
+#: ../camel/camel-imapx-store.c:1592
+#: ../camel/providers/pop3/camel-pop3-folder.c:534
+#: ../camel/providers/pop3/camel-pop3-folder.c:677
+#: ../camel/providers/pop3/camel-pop3-folder.c:906
+#: ../camel/providers/pop3/camel-pop3-folder.c:1106
+#: ../camel/providers/pop3/camel-pop3-store.c:424
+#: ../camel/providers/pop3/camel-pop3-store.c:832
 #, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar conectado para completar esta operaciÃn"
@@ -1875,7 +1895,7 @@ msgstr "Debe estar conectado para completar esta operaciÃn"
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:772
+#: ../camel/camel-filter-driver.c:916 ../camel/camel-filter-search.c:797
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Non foi posÃbel crear o proceso fillo Â%sÂ: %s"
@@ -1889,12 +1909,12 @@ msgstr "Recibiuse un fluxo de mensaxe incorrecto de %s: %s"
 msgid "Syncing folders"
 msgstr "Sincronizando os cartafoles"
 
-#: ../camel/camel-filter-driver.c:1276 ../camel/camel-filter-driver.c:1761
+#: ../camel/camel-filter-driver.c:1276
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Produciuse un erro ao analizar o filtro: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1287 ../camel/camel-filter-driver.c:1774
+#: ../camel/camel-filter-driver.c:1287
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Produciuse un erro ao executar o filtro: %s: %s"
@@ -1937,138 +1957,153 @@ msgstr "Recibindo a mensaxe %d de %d"
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
+#: ../camel/camel-filter-driver.c:1740 ../camel/camel-filter-driver.c:1773
+#, c-format
+msgid "Execution of filter '%s' failed: "
+msgstr "Produciuse un erro ao executar o filtro %s:"
+
+#: ../camel/camel-filter-driver.c:1764
+#, c-format
+msgid "Error parsing filter '%s': %s: %s"
+msgstr "Produciuse un erro ao analizar o filtro Â%sÂ: %s: %s"
+
+#: ../camel/camel-filter-driver.c:1782
+#, c-format
+msgid "Error executing filter '%s': %s: %s"
+msgstr "Produciuse un erro ao executar o filtro Â%sÂ: %s: %s"
+
 #: ../camel/camel-filter-search.c:138
 msgid "Failed to retrieve message"
 msgstr "Produciuse un erro ao obter a mensaxe"
 
-#: ../camel/camel-filter-search.c:512
+#: ../camel/camel-filter-search.c:537
 msgid "Invalid arguments to (system-flag)"
 msgstr "Os argumentos non son correctos para (system-flag)"
 
-#: ../camel/camel-filter-search.c:530
+#: ../camel/camel-filter-search.c:555
 msgid "Invalid arguments to (user-tag)"
 msgstr "Os argumentos non son correctos para (user-tag)"
 
-#: ../camel/camel-filter-search.c:1020 ../camel/camel-filter-search.c:1029
+#: ../camel/camel-filter-search.c:1046 ../camel/camel-filter-search.c:1055
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Produciuse un erro ao executar a busca por filtro: %s: %s"
 
-#: ../camel/camel-folder.c:270
+#: ../camel/camel-folder.c:272
 #, c-format
 msgid "Learning new spam message in '%s'"
 msgid_plural "Learning new spam messages in '%s'"
 msgstr[0] "Aprendendo da nova mensaxe de correo non desexado en Â%sÂ"
 msgstr[1] "Aprendendo das novas mensaxes de correo non desexado en Â%sÂ"
 
-#: ../camel/camel-folder.c:310
+#: ../camel/camel-folder.c:312
 #, c-format
 msgid "Learning new ham message in '%s'"
 msgid_plural "Learning new ham messages in '%s'"
 msgstr[0] "Examinando a mensaxe autÃntica en Â%sÂ"
 msgstr[1] "Examinando as mensaxes autÃnticas  en %s"
 
-#: ../camel/camel-folder.c:358
+#: ../camel/camel-folder.c:360
 #, c-format
 msgid "Filtering new message in '%s'"
 msgid_plural "Filtering new messages in '%s'"
 msgstr[0] "Filtrando a nova mensaxe en Â%sÂ"
 msgstr[1] "Filtrando as novas mensaxes en Â%sÂ"
 
-#: ../camel/camel-folder.c:930
+#: ../camel/camel-folder.c:934
 #: ../camel/providers/local/camel-maildir-folder.c:321
 msgid "Moving messages"
 msgstr "Movendo as mensaxes"
 
-#: ../camel/camel-folder.c:933
+#: ../camel/camel-folder.c:937
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: ../camel/camel-folder.c:1253
+#: ../camel/camel-folder.c:1257
 #, c-format
 msgid "Quota information not supported for folder '%s'"
 msgstr "InformaciÃn de cota non admitida para o cartafol Â%sÂ"
 
-#: ../camel/camel-folder.c:3372
+#: ../camel/camel-folder.c:3488
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando cartafol Â%sÂ"
 
-#: ../camel/camel-folder.c:3604
+#: ../camel/camel-folder.c:3720
 #, c-format
 msgid "Retrieving message '%s' in %s"
 msgstr "Recuperando a mensaxe Â%s en Â%sÂ"
 
-#: ../camel/camel-folder.c:3755
+#: ../camel/camel-folder.c:3871
 #, c-format
 msgid "Retrieving quota information for '%s'"
 msgstr "Recollendo a informaciÃn da cota Â%sÂ"
 
-#: ../camel/camel-folder.c:3987
+#: ../camel/camel-folder.c:4103
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol Â%sÂ"
 
-#: ../camel/camel-folder-search.c:420 ../camel/camel-folder-search.c:587
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Non à posÃbel analizar a expresiÃn de busca: %s:\n"
-"%s"
-
-#: ../camel/camel-folder-search.c:432 ../camel/camel-folder-search.c:599
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Produciuse un erro ao executar a expresiÃn de busca: %s:\n"
-"%s"
-
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:822 ../camel/camel-folder-search.c:865
+#: ../camel/camel-folder-search.c:824 ../camel/camel-folder-search.c:867
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) require un Ãnico resultado booleano"
 
 #. Translators: Each '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:932
+#: ../camel/camel-folder-search.c:902
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) non està permitido dentro de %s"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:939 ../camel/camel-folder-search.c:947
+#: ../camel/camel-folder-search.c:909 ../camel/camel-folder-search.c:917
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) require unha cadea de coincidencia"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:975
+#: ../camel/camel-folder-search.c:945
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) require como resultado unha matriz"
 
 #. Translators: The '%s' is an element type name, part of an expressing language
-#: ../camel/camel-folder-search.c:985
+#: ../camel/camel-folder-search.c:955
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) require un conxunto de cartafoles"
 
-#: ../camel/camel-gpg-context.c:663 ../camel/camel-gpg-context.c:668
-#: ../camel/camel-gpg-context.c:1331
+#: ../camel/camel-folder-search.c:1789 ../camel/camel-folder-search.c:1956
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Non à posÃbel analizar a expresiÃn de busca: %s:\n"
+"%s"
+
+#: ../camel/camel-folder-search.c:1801 ../camel/camel-folder-search.c:1968
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Produciuse un erro ao executar a expresiÃn de busca: %s:\n"
+"%s"
+
+#: ../camel/camel-gpg-context.c:691 ../camel/camel-gpg-context.c:696
+#: ../camel/camel-gpg-context.c:1359
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Produciuse un erro ao executar gpg: %s"
 
-#: ../camel/camel-gpg-context.c:668
-#: ../camel/providers/smtp/camel-smtp-transport.c:860
+#: ../camel/camel-gpg-context.c:696
+#: ../camel/providers/smtp/camel-smtp-transport.c:859
 msgid "Unknown"
 msgstr "DescoÃecido"
 
-#: ../camel/camel-gpg-context.c:733
+#: ../camel/camel-gpg-context.c:761
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -2079,17 +2114,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:769
+#: ../camel/camel-gpg-context.c:797
 #, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Produciuse un erro ao analizar a suxestiÃn de id de usuario gpg."
 
-#: ../camel/camel-gpg-context.c:794 ../camel/camel-gpg-context.c:809
+#: ../camel/camel-gpg-context.c:822 ../camel/camel-gpg-context.c:837
 #, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Produciuse un erro ao analizar a solicitude de frase de paso gpg."
 
-#: ../camel/camel-gpg-context.c:830
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -2098,7 +2133,7 @@ msgstr ""
 "Necesita un PIN para desbloquear a chave para o seu\n"
 "SmartCard: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:834
+#: ../camel/camel-gpg-context.c:862
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -2107,12 +2142,12 @@ msgstr ""
 "Necesita unha frase de paso para desbloquear a chave\n"
 "para o usuario: Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:840
+#: ../camel/camel-gpg-context.c:868
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Solicitude inesperada do GnuPg para Â%sÂ"
 
-#: ../camel/camel-gpg-context.c:852
+#: ../camel/camel-gpg-context.c:880
 msgid ""
 "Note the encrypted content doesn't contain information about a recipient, "
 "thus there will be a password prompt for each of stored private key."
@@ -2121,7 +2156,7 @@ msgstr ""
 "destinatario, asà que pedirase un contrasinal por cada chave privada "
 "almacenada."
 
-#: ../camel/camel-gpg-context.c:883 ../camel/camel-net-utils.c:523
+#: ../camel/camel-gpg-context.c:911 ../camel/camel-net-utils.c:523
 #: ../camel/camel-tcp-stream-raw.c:268
 #: ../camel/providers/nntp/camel-nntp-summary.c:388
 #: ../libedataserver/e-client.c:140
@@ -2129,37 +2164,37 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: ../camel/camel-gpg-context.c:904
+#: ../camel/camel-gpg-context.c:932
 #, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Produciuse un erro ao desbloquear a chave secreta: especificÃronse 3 frases "
 "de paso incorrectas."
 
-#: ../camel/camel-gpg-context.c:917
+#: ../camel/camel-gpg-context.c:945
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:1048
+#: ../camel/camel-gpg-context.c:1076
 #, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Produciuse un erro ao cifrar: non se especificou ningÃn destinatario "
 "correcto."
 
-#: ../camel/camel-gpg-context.c:1595 ../camel/camel-smime-context.c:832
+#: ../camel/camel-gpg-context.c:1626 ../camel/camel-smime-context.c:832
 msgid "Could not generate signing data: "
 msgstr "Non foi posÃbel xerar os datos da sinatura: "
 
-#: ../camel/camel-gpg-context.c:1644 ../camel/camel-gpg-context.c:1848
-#: ../camel/camel-gpg-context.c:1958 ../camel/camel-gpg-context.c:2105
-#: ../camel/camel-gpg-context.c:2205 ../camel/camel-gpg-context.c:2253
+#: ../camel/camel-gpg-context.c:1675 ../camel/camel-gpg-context.c:1879
+#: ../camel/camel-gpg-context.c:1989 ../camel/camel-gpg-context.c:2136
+#: ../camel/camel-gpg-context.c:2236 ../camel/camel-gpg-context.c:2284
 msgid "Failed to execute gpg."
 msgstr "Produciuse un erro ao executar gpg."
 
-#: ../camel/camel-gpg-context.c:1723 ../camel/camel-gpg-context.c:1731
-#: ../camel/camel-gpg-context.c:1739 ../camel/camel-gpg-context.c:1759
+#: ../camel/camel-gpg-context.c:1754 ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1770 ../camel/camel-gpg-context.c:1790
 #: ../camel/camel-smime-context.c:959 ../camel/camel-smime-context.c:973
 #: ../camel/camel-smime-context.c:982
 #, c-format
@@ -2168,255 +2203,267 @@ msgstr ""
 "Non à posÃbel comprobar a sinatura da mensaxe: o formato da mensaxe à "
 "incorrecto"
 
-#: ../camel/camel-gpg-context.c:1801
+#: ../camel/camel-gpg-context.c:1832
 msgid "Cannot verify message signature: "
 msgstr "Non à posÃbel comprobar a sinatura da mensaxe: "
 
-#: ../camel/camel-gpg-context.c:1924
+#: ../camel/camel-gpg-context.c:1955
 msgid "Could not generate encrypting data: "
 msgstr "Non foi posÃbel xerar os datos de cifrado: "
 
-#: ../camel/camel-gpg-context.c:1977
+#: ../camel/camel-gpg-context.c:2008
 msgid "This is a digitally encrypted message part"
 msgstr "Isto à unha parte da mensaxe cifrada dixitalmente"
 
-#: ../camel/camel-gpg-context.c:2035 ../camel/camel-gpg-context.c:2044
-#: ../camel/camel-gpg-context.c:2067
+#: ../camel/camel-gpg-context.c:2066 ../camel/camel-gpg-context.c:2075
+#: ../camel/camel-gpg-context.c:2098
 #, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Non à posÃbel descifrar a mensaxe: o formato da mensaxe non à vÃlido"
 
-#: ../camel/camel-gpg-context.c:2055
+#: ../camel/camel-gpg-context.c:2086
 #, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Produciuse un erro ao descifrar a parte MIME: erro de protocolo"
 
-#: ../camel/camel-gpg-context.c:2146 ../camel/camel-smime-context.c:1273
+#: ../camel/camel-gpg-context.c:2177 ../camel/camel-smime-context.c:1273
 msgid "Encrypted content"
 msgstr "Contido cifrado"
 
-#: ../camel/camel-imapx-folder.c:104
+#: ../camel/camel-imapx-folder.c:710
 #, c-format
-msgid "Could not create folder summary for %s"
-msgstr "Non foi posÃbel crear o resumo do cartafol para %s"
+msgid "No quota information available for folder '%s'"
+msgstr "InformaciÃn de cota non dispoÃÃbel para o cartafol Â%sÂ"
 
-#: ../camel/camel-imapx-folder.c:112
+#: ../camel/camel-imapx-folder.c:809 ../camel/camel-imapx-folder.c:882
 #, c-format
-msgid "Could not create cache for %s: "
-msgstr "Non foi posÃbel crear a cachà para %s:"
+msgid "No destination folder specified"
+msgstr "Non se especificou un cartafol de destino"
 
-#: ../camel/camel-imapx-folder.c:794
-#: ../camel/providers/imap/camel-imap-folder.c:367
+#: ../camel/camel-imapx-folder.c:828
+msgid "Unable to move junk messages"
+msgstr "Non foi posÃbel mover as mensaxes lixo."
+
+#: ../camel/camel-imapx-folder.c:901
+msgid "Unable to move deleted messages"
+msgstr "Non foi posÃbel mover os mensaxes eliminados."
+
+#: ../camel/camel-imapx-folder.c:1115
 #: ../camel/providers/nntp/camel-nntp-folder.c:738
 msgid "Apply message _filters to this folder"
 msgstr "Aplicar _filtros de mensaxes a este cartafol"
 
-#: ../camel/camel-imapx-server.c:1094
+#: ../camel/camel-imapx-folder.c:1224
+#, c-format
+msgid "Could not create folder summary for %s"
+msgstr "Non foi posÃbel crear o resumo do cartafol para %s"
+
+#: ../camel/camel-imapx-folder.c:1232
+#, c-format
+msgid "Could not create cache for %s: "
+msgstr "Non foi posÃbel crear a cachà para %s:"
+
+#: ../camel/camel-imapx-server.c:1254
 msgid "Server disconnected"
 msgstr "Servidor desconectado"
 
-#: ../camel/camel-imapx-server.c:1549
-msgid "Error writing to cache stream: "
-msgstr "Produciuse un erro ao escribir no fluxo da cachÃ: %s"
+#: ../camel/camel-imapx-server.c:1727
+msgid "Error writing to cache stream"
+msgstr "Produciuse un erro ao escribir ao fluxo da cachÃ"
 
-#: ../camel/camel-imapx-server.c:2500
+#: ../camel/camel-imapx-server.c:2893
 #, c-format
 msgid "Not authenticated"
 msgstr "Non autenticado"
 
-#: ../camel/camel-imapx-server.c:2580
+#: ../camel/camel-imapx-server.c:2971
 msgid "Error performing IDLE"
 msgstr "Produciuse un erro ao estar inactivo"
 
-#: ../camel/camel-imapx-server.c:3462
-#: ../camel/providers/imap/camel-imap-store.c:414
-#: ../camel/providers/imap/camel-imap-store.c:468
+#: ../camel/camel-imapx-server.c:3875
 #, 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/camel-imapx-server.c:3463
-#: ../camel/providers/imap/camel-imap-store.c:415
+#: ../camel/camel-imapx-server.c:3876
 #: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "STARTTLS not supported"
 msgstr "O STARTTLS non à compatÃbel"
 
-#: ../camel/camel-imapx-server.c:3502
-#: ../camel/providers/imap/camel-imap-store.c:440
+#: ../camel/camel-imapx-server.c:3915
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: "
 msgstr "Produciuse un erro ao conectar co servidor IMAP %s en modo seguro:"
 
-#: ../camel/camel-imapx-server.c:3582
-#: ../camel/providers/imap/camel-imap-store.c:749
+#: ../camel/camel-imapx-server.c:3995
 #, c-format
 msgid "IMAP server %s does not support %s authentication"
 msgstr "O servidor IMAP %s non permite a autenticaciÃn %s "
 
-#: ../camel/camel-imapx-server.c:3593 ../camel/camel-session.c:494
-#: ../camel/providers/imap/camel-imap-store.c:1174
-#: ../camel/providers/pop3/camel-pop3-store.c:259
-#: ../camel/providers/pop3/camel-pop3-store.c:587
+#: ../camel/camel-imapx-server.c:4006 ../camel/camel-session.c:494
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+#: ../camel/providers/pop3/camel-pop3-store.c:604
 #: ../camel/providers/smtp/camel-smtp-transport.c:467
 #, c-format
 msgid "No support for %s authentication"
 msgstr "Non compatÃbel coa autenticaciÃn %s"
 
-#: ../camel/camel-imapx-server.c:3612
-#: ../camel/providers/imap/camel-imap-store.c:1142
-#: ../camel/providers/nntp/camel-nntp-store.c:502
+#: ../camel/camel-imapx-server.c:4025
+#: ../camel/providers/nntp/camel-nntp-store.c:314
+#: ../camel/providers/nntp/camel-nntp-store.c:512
 msgid "Cannot authenticate without a username"
 msgstr "Non à posÃbel autenticar sen un nome de usuario"
 
-#: ../camel/camel-imapx-server.c:3621
-#: ../camel/providers/imap/camel-imap-store.c:1150
-#: ../camel/providers/nntp/camel-nntp-store.c:511
-#: ../camel/providers/pop3/camel-pop3-store.c:512
-#: ../camel/providers/pop3/camel-pop3-store.c:532
+#: ../camel/camel-imapx-server.c:4034
+#: ../camel/providers/nntp/camel-nntp-store.c:521
+#: ../camel/providers/pop3/camel-pop3-store.c:529
+#: ../camel/providers/pop3/camel-pop3-store.c:549
 msgid "Authentication password not available"
 msgstr "O contrasinal de autenticaciÃn non està dispoÃÃbel"
 
-#: ../camel/camel-imapx-server.c:3823
+#: ../camel/camel-imapx-server.c:4241
 msgid "Error fetching message"
 msgstr "Produciuse un erro ao obter a mensaxe"
 
-#: ../camel/camel-imapx-server.c:3905
+#: ../camel/camel-imapx-server.c:4323
 msgid "Failed to copy the tmp file"
 msgstr "Produciuse un erro ao copiar o ficheiro temporal"
 
-#: ../camel/camel-imapx-server.c:3919
+#: ../camel/camel-imapx-server.c:4337
 msgid "Failed to close the tmp stream"
 msgstr "Produciuse un erro ao pechar o fluxo temporal"
 
-#: ../camel/camel-imapx-server.c:4017
+#: ../camel/camel-imapx-server.c:4458
 msgid "Error copying messages"
 msgstr "Produciuse un erro ao copiar as mensaxes"
 
-#: ../camel/camel-imapx-server.c:4152
+#: ../camel/camel-imapx-server.c:4624
 msgid "Error appending message"
 msgstr "Produciuse un erro ao engadir a mensaxe"
 
-#: ../camel/camel-imapx-server.c:4335
+#: ../camel/camel-imapx-server.c:4823
 msgid "Error fetching message headers"
 msgstr "Produciuse un erro ao obter as cabeceiras das mensaxes"
 
-#: ../camel/camel-imapx-server.c:4470
+#: ../camel/camel-imapx-server.c:4970
 msgid "Error retrieving message"
 msgstr "Produciuse un erro ao obter a mensaxe"
 
-#: ../camel/camel-imapx-server.c:4592 ../camel/camel-imapx-server.c:4785
+#: ../camel/camel-imapx-server.c:5094 ../camel/camel-imapx-server.c:5322
 #, 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/camel-imapx-server.c:4643
+#: ../camel/camel-imapx-server.c:5158
 #, c-format
 msgid "Scanning for changed messages in '%s'"
 msgstr "Buscando mensaxes modificadas en Â%sÂ"
 
-#: ../camel/camel-imapx-server.c:4686
+#: ../camel/camel-imapx-server.c:5211
 msgid "Error fetching new messages"
 msgstr "Produciuse un erro ao obter as mensaxes novas"
 
-#: ../camel/camel-imapx-server.c:4876
+#: ../camel/camel-imapx-server.c:5424
 msgid "Error while fetching messages"
 msgstr "Produciuse un erro ao obter as mensaxes"
 
-#: ../camel/camel-imapx-server.c:4884 ../camel/camel-imapx-server.c:4920
+#: ../camel/camel-imapx-server.c:5432 ../camel/camel-imapx-server.c:5465
 #, c-format
 msgid "Fetching summary information for %d message in '%s'"
 msgid_plural "Fetching summary information for %d messages in '%s'"
 msgstr[0] "Obtendo informaciÃn de resumo sobre %d mensaxe en Â%sÂ"
 msgstr[1] "Obtendo informaciÃn de resumo sobre %d mensaxes en Â%sÂ"
 
-#: ../camel/camel-imapx-server.c:5045 ../camel/camel-imapx-server.c:5081
+#: ../camel/camel-imapx-server.c:5601 ../camel/camel-imapx-server.c:5631
 msgid "Error refreshing folder"
 msgstr "Produciuse un erro ao actualizar o cartafol"
 
-#: ../camel/camel-imapx-server.c:5174
+#: ../camel/camel-imapx-server.c:5735
 msgid "Error expunging message"
 msgstr "Produciuse un erro ao compactar a mensaxe"
 
-#: ../camel/camel-imapx-server.c:5271
+#: ../camel/camel-imapx-server.c:5846
 msgid "Error fetching folders"
 msgstr "Produciuse un erro ao obter os cartafoles"
 
-#: ../camel/camel-imapx-server.c:5350
+#: ../camel/camel-imapx-server.c:5928
 msgid "Error subscribing to folder"
 msgstr "Produciuse un erro ao subscribirse aos cartafoles"
 
-#: ../camel/camel-imapx-server.c:5411
+#: ../camel/camel-imapx-server.c:5993
 msgid "Error creating folder"
 msgstr "Produciuse un erro ao crear o cartafol"
 
-#: ../camel/camel-imapx-server.c:5460
+#: ../camel/camel-imapx-server.c:6047
 msgid "Error deleting folder"
 msgstr "Produciuse un erro ao eliminar o cartafol"
 
-#: ../camel/camel-imapx-server.c:5521
+#: ../camel/camel-imapx-server.c:6121
 msgid "Error renaming folder"
 msgstr "Produciuse un erro ao renomear o cartafol"
 
-#: ../camel/camel-imapx-server.c:5582
+#: ../camel/camel-imapx-server.c:6196
+msgid "Error retrieving quota information"
+msgstr "Produciuse un erro ao obter a informaciÃn da cota"
+
+#: ../camel/camel-imapx-server.c:6261
+msgid "Search failed"
+msgstr "A busca fallou"
+
+#: ../camel/camel-imapx-server.c:6324
 msgid "Error performing NOOP"
 msgstr "Produciuse un erro ao realizar NOOP"
 
-#: ../camel/camel-imapx-server.c:5678
+#: ../camel/camel-imapx-server.c:6433
 msgid "Error syncing changes"
 msgstr "Produciuse un erro ao sincronizar os cambios"
 
-#: ../camel/camel-imapx-server.c:6449
-#: ../camel/providers/imap/camel-imap-folder.c:3531
+#: ../camel/camel-imapx-server.c:7242
 #, 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/camel-imapx-server.c:6450
-#: ../camel/providers/imap/camel-imap-folder.c:3532
+#: ../camel/camel-imapx-server.c:7243
 msgid "No such message available."
 msgstr "A mensaxe non està dispoÃÃbel."
 
-#: ../camel/camel-imapx-server.c:6605 ../camel/camel-imapx-server.c:6620
+#: ../camel/camel-imapx-server.c:7401 ../camel/camel-imapx-server.c:7416
 msgid "Cannot create spool file: "
 msgstr "Non à posÃbel crear o ficheiro de cola de correo: "
 
-#: ../camel/camel-imapx-store.c:157
-#: ../camel/providers/imap/camel-imap-store.c:827
+#: ../camel/camel-imapx-server.c:8158
+msgid "IMAP server does not support quotas"
+msgstr "O servidor IMAP non permite cotas"
+
+#: ../camel/camel-imapx-store.c:201
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
-#: ../camel/camel-imapx-store.c:160
-#: ../camel/providers/imap/camel-imap-store.c:830
+#: ../camel/camel-imapx-store.c:204
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servizo IMAP para %s en %s"
 
-#: ../camel/camel-imapx-store.c:251
-#: ../camel/providers/imap/camel-imap-provider.c:98
-#: ../camel/providers/nntp/camel-nntp-provider.c:85
+#: ../camel/camel-imapx-store.c:295
+#: ../camel/providers/nntp/camel-nntp-provider.c:95
 #: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../camel/camel-imapx-store.c:253
-#: ../camel/providers/imap/camel-imap-provider.c:100
+#: ../camel/camel-imapx-store.c:297
 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/camel-imapx-store.c:351
-#: ../camel/providers/imap/camel-imap-store.c:2064
-#: ../camel/providers/imap/camel-imap-store.c:2262
+#: ../camel/camel-imapx-store.c:396
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/camel-imapx-store.c:376 ../camel/camel-imapx-store.c:866
-#: ../camel/providers/imap/camel-imap-store.c:275
-#: ../camel/providers/imap/camel-imap-store.c:2684
+#: ../camel/camel-imapx-store.c:421 ../camel/camel-imapx-store.c:911
 #: ../camel/providers/local/camel-maildir-folder.c:473
 #: ../camel/providers/local/camel-maildir-store.c:307
 #: ../camel/providers/local/camel-maildir-store.c:699
@@ -2426,44 +2473,39 @@ msgstr "Non existe o cartafol %s"
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../camel/camel-imapx-store.c:1099
+#: ../camel/camel-imapx-store.c:1155
 #, c-format
 msgid "Retrieving folder list for %s"
 msgstr "Obtendo a lista de cartafoles para %s"
 
-#: ../camel/camel-imapx-store.c:1203
-#: ../camel/providers/nntp/camel-nntp-store.c:1771
+#: ../camel/camel-imapx-store.c:1259
+#: ../camel/providers/nntp/camel-nntp-store.c:1786
 #, c-format
 msgid "No such folder: %s"
 msgstr "Non existe o cartafol: %s"
 
-#: ../camel/camel-imapx-store.c:1420
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imap/camel-imap-store.c:2524
+#: ../camel/camel-imapx-store.c:1476
 #, 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/camel-imapx-store.c:1431
-#: ../camel/providers/imap/camel-imap-store.c:2537
+#: ../camel/camel-imapx-store.c:1487
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartafol pai descoÃecido: %s"
 
-#: ../camel/camel-imapx-store.c:1441
-#: ../camel/providers/imap/camel-imap-store.c:2140
-#: ../camel/providers/imap/camel-imap-store.c:2589
+#: ../camel/camel-imapx-store.c:1497
 #, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non à posÃbel que o cartafol pai conteÃa subcartafoles"
 
-#: ../camel/camel-imapx-stream.c:97
+#: ../camel/camel-imapx-stream.c:98
 #, c-format
 msgid "Source stream returned no data"
 msgstr "O fluxo de orixe non devolveu ningÃn dato"
 
-#: ../camel/camel-imapx-stream.c:106
+#: ../camel/camel-imapx-stream.c:107
 #, c-format
 msgid "Source stream unavailable"
 msgstr "O fluxo de orixe non està dispoÃÃbel"
@@ -2591,26 +2633,39 @@ msgstr "Produciuse un erro ao buscar o servidor"
 
 #: ../camel/camel-net-utils.c:732
 #, c-format
-msgid "Host lookup failed: %s: %s"
-msgstr "Produciuse un erro ao buscar o servidor: %s: %s"
+msgid "Host lookup '%s' failed. Check your host name for spelling errors."
+msgstr ""
+"Produciuse un fallo na busca do equipo Â%sÂ. Comprobe se o nome de equipo "
+"ten algÃn erro de escrita."
+
+#: ../camel/camel-net-utils.c:736
+#, c-format
+msgid "Host lookup '%s' failed: %s"
+msgstr "Produciuse un erro ao buscar o servidor %s: %s"
 
-#: ../camel/camel-net-utils.c:853
+#: ../camel/camel-net-utils.c:857
 msgid "Resolving address"
 msgstr "Resolvendo enderezo"
 
-#: ../camel/camel-net-utils.c:874
+#: ../camel/camel-net-utils.c:878
 msgid "Name lookup failed"
 msgstr "Produciuse un erro ao buscar o nome"
 
-#: ../camel/camel-net-utils.c:880
+#: ../camel/camel-net-utils.c:885
+msgid "Name lookup failed. Check your host name for spelling errors."
+msgstr ""
+"A busca do nome fallou. Comprobe se o nome do equipo ten algÃn erro de "
+"escrita."
+
+#: ../camel/camel-net-utils.c:889
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Produciuse un erro ao buscar o nome: %s"
 
-#: ../camel/camel-network-service.c:114
+#: ../camel/camel-network-service.c:115
 #, c-format
-msgid "Could not connect to %s: "
-msgstr "Non foi posÃbel realizar a conexiÃn con %s: "
+msgid "Could not connect to '%s:%s': "
+msgstr "Non foi posÃbel realizar a conexiÃn con Â%s:%sÂ:"
 
 #: ../camel/camel-offline-folder.c:210
 #, c-format
@@ -2652,6 +2707,7 @@ msgid "No provider available for protocol '%s'"
 msgstr "Non hai ningÃn provedor dispoÃÃbel para o protocolo Â%sÂ"
 
 #: ../camel/camel-sasl-anonymous.c:35
+#: ../camel/providers/nntp/camel-nntp-provider.c:85
 msgid "Anonymous"
 msgstr "AnÃnimo"
 
@@ -2824,7 +2880,7 @@ msgstr "As credenciais indicadas caducaron."
 
 #: ../camel/camel-sasl-gssapi.c:175 ../camel/camel-sasl-gssapi.c:340
 #: ../camel/camel-sasl-gssapi.c:388 ../camel/camel-sasl-gssapi.c:405
-#: ../camel/providers/smtp/camel-smtp-transport.c:575
+#: ../camel/providers/smtp/camel-smtp-transport.c:574
 #, c-format
 msgid "Bad authentication response from server."
 msgstr "A resposta de autenticaciÃn desde o servidor non à valida."
@@ -2885,7 +2941,7 @@ msgstr "AutorizaciÃn POP antes de SMTP usando un transporte descoÃecido"
 msgid "POP Before SMTP authentication attempted with a %s service"
 msgstr "Tentouse a autorizaciÃn POP antes de SMTP cun servizo %s"
 
-#: ../camel/camel-search-private.c:112
+#: ../camel/camel-search-private.c:116
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Produciuse un fallo na compilaciÃn da expresiÃn regular: %s: %s"
@@ -2904,7 +2960,7 @@ msgstr "A autenticaciÃn %s fallou"
 msgid "Forwarding messages is not supported"
 msgstr "Non se permite o reenvÃo de mensaxes"
 
-#: ../camel/camel-session.c:1362
+#: ../camel/camel-session.c:1403
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Introduza o contrasinal de %s para %s no servidor %s."
@@ -3260,88 +3316,6 @@ msgstr "O nome do equipo à demasiado longo (mÃximo de 255 caracteres)"
 msgid "Invalid reply from proxy server"
 msgstr "Recibiuse unha resposta incorrecta desde o servidor proxy"
 
-#: ../camel/camel-tcp-stream-ssl.c:505
-#, c-format
-msgid ""
-"   Issuer:       %s\n"
-"   Subject:      %s\n"
-"   Fingerprint:  %s\n"
-"   Signature:    %s"
-msgstr ""
-"   Emisor:            %s\n"
-"   Asunto:            %s\n"
-"   Pegada dixital:    %s\n"
-"   Sinatura:          %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:512
-msgid "GOOD"
-msgstr "CORRECTO"
-
-#: ../camel/camel-tcp-stream-ssl.c:512
-msgid "BAD"
-msgstr "INCORRECTO"
-
-#: ../camel/camel-tcp-stream-ssl.c:517
-#, c-format
-msgid ""
-"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
-"\n"
-"Detailed information about the certificate:\n"
-"%s"
-msgstr ""
-"O certificado SSL para Â%s non à de confianza. Desexa aceptalo?\n"
-"\n"
-"InformaciÃn detallada sobre o certificado:\n"
-"%s"
-
-#: ../camel/camel-tcp-stream-ssl.c:523
-msgid "_Reject"
-msgstr "_Rexeitar"
-
-#: ../camel/camel-tcp-stream-ssl.c:524
-msgid "Accept _Temporarily"
-msgstr "Aceptar _temporalmente"
-
-#: ../camel/camel-tcp-stream-ssl.c:525
-msgid "_Accept Permanently"
-msgstr "_Aceptar permanentemente"
-
-#: ../camel/camel-tcp-stream-ssl.c:586
-#, c-format
-msgid ""
-"Certificate problem: %s\n"
-"Issuer: %s"
-msgstr ""
-"Problema co certificado: %s\n"
-"Emisor: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:638
-#, c-format
-msgid ""
-"Bad certificate domain: %s\n"
-"Issuer: %s"
-msgstr ""
-"O dominio do certificado à incorrecto: %s\n"
-"Emisor: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:656
-#, c-format
-msgid ""
-"Certificate expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"O certificado expirou: %s\n"
-"Emisor: %s"
-
-#: ../camel/camel-tcp-stream-ssl.c:673
-#, c-format
-msgid ""
-"Certificate revocation list expired: %s\n"
-"Issuer: %s"
-msgstr ""
-"A lista de revogaciÃn de certificados expirou: %s\n"
-"Emisor: %s"
-
 #: ../camel/camel-url.c:331
 #, c-format
 msgid "Could not parse URL '%s'"
@@ -3399,175 +3373,43 @@ msgstr "Non à posÃbel copiar as mensaxes ao cartafol do lixo"
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Non à posÃbel copiar as mensaxes ao cartafol do correo lixo"
 
-#: ../camel/providers/imap/camel-imap-command.c:200
-#: ../camel/providers/imap/camel-imap-command.c:299
-#, c-format
-msgid "No output stream"
-msgstr "Non hai fluxo de saÃda"
-
-#: ../camel/providers/imap/camel-imap-command.c:208
-#: ../camel/providers/imap/camel-imap-command.c:307
-#, c-format
-msgid "No input stream"
-msgstr "Non hai fluxo de entrada"
-
-#: ../camel/providers/imap/camel-imap-command.c:392
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "O servidor desconectouse inesperadamente: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:425
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s in folder %s:\n"
-"%s"
-msgstr ""
-"Alerta do servidor IMAP %s %s no cartafol %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:429
-#, c-format
-msgid ""
-"Alert from IMAP server %s %s:\n"
-"%s"
-msgstr ""
-"Alerta do servidor IMAP %s %s:\n"
-"%s"
-
-#: ../camel/providers/imap/camel-imap-command.c:512
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "Resposta inesperada do servidor IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:524
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "A orde IMAP fallou: %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:607
-#, c-format
-msgid "Server response ended too soon."
-msgstr "A resposta do servidor terminou moi cedo."
-
-#: ../camel/providers/imap/camel-imap-command.c:822
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "A resposta do servidor IMAP non contiÃa informaciÃn sobre %s"
-
-#: ../camel/providers/imap/camel-imap-command.c:860
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "Resposta positiva inesperada do servidor IMAP: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:356
-msgid "Always check for _new mail in this folder"
-msgstr "Comprobar sempre o correo _novo neste cartafol"
-
-#: ../camel/providers/imap/camel-imap-folder.c:447
-#, 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:468
-#, 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:1137
-#, c-format
-msgid "Scanning for changed messages in %s"
-msgstr "Buscando mensaxes modificadas en %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3494
-msgid "Unable to retrieve message: "
-msgstr "Non foi posÃbel obter a mensaxe:"
-
-#: ../camel/providers/imap/camel-imap-folder.c:3620
-#: ../camel/providers/imap/camel-imap-folder.c:4512
-#: ../camel/providers/nntp/camel-nntp-folder.c:493
-#, c-format
-msgid "This message is not currently available"
-msgstr "Esta mensaxe non està dispoÃÃbel actualmente"
-
-#: ../camel/providers/imap/camel-imap-folder.c:4085
-#: ../camel/providers/imap/camel-imap-folder.c:4167
-#, 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:4299
-#, 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:4309
-#, 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:4549
-#, c-format
-msgid "Could not find message body in FETCH response."
-msgstr "Non foi posÃbel atopar o corpo da mensaxe na resposta FETCH."
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:196
-#: ../camel/providers/imap/camel-imap-message-cache.c:253
-msgid "Could not open cache directory: "
-msgstr "Non foi posÃbel abrir o directorio da cachÃ: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:331
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "Produciuse un erro ao crear a cachà da mensaxe %s: %s"
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:397
-#, c-format
-msgid "Failed to cache message %s: "
-msgstr "Produciuse un erro ao crear a cachà da mensaxe %s: "
-
-#: ../camel/providers/imap/camel-imap-message-cache.c:539
-#, c-format
-msgid "Failed to cache %s: "
-msgstr "Produciuse un erro ao crear a cachà %s: "
-
-#: ../camel/providers/imap/camel-imap-provider.c:40
 #: ../camel/providers/imapx/camel-imapx-provider.c:38
 msgid "Checking for New Mail"
 msgstr "Comprobando o novo correo"
 
-#: ../camel/providers/imap/camel-imap-provider.c:42
 #: ../camel/providers/imapx/camel-imapx-provider.c:40
 msgid "C_heck for new messages in all folders"
 msgstr "C_omprobar as mensaxes novas en todos os cartafoles"
 
-#: ../camel/providers/imap/camel-imap-provider.c:44
 #: ../camel/providers/imapx/camel-imapx-provider.c:42
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "Comprobar as novas m_ensaxes nos cartafoles subscritos"
 
-#: ../camel/providers/imap/camel-imap-provider.c:47
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Usar a resincronizaciÃn _rÃpida se o servidor o permite"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
+msgid "_Listen for server change notifications"
+msgstr "_Escoitar as notificaciÃns de cambios do servidor"
+
 #: ../camel/providers/imapx/camel-imapx-provider.c:49
 #: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "Folders"
 msgstr "Cartafoles"
 
-#: ../camel/providers/imap/camel-imap-provider.c:49
 #: ../camel/providers/imapx/camel-imapx-provider.c:51
 msgid "_Show only subscribed folders"
 msgstr "_Mostrar sà os cartafoles subscritos"
 
-#: ../camel/providers/imap/camel-imap-provider.c:51
 #: ../camel/providers/imapx/camel-imapx-provider.c:54
 msgid "O_verride server-supplied folder namespace"
 msgstr "_Ignorar o espazo do nome do cartafol fornecido polo servidor"
 
-#: ../camel/providers/imap/camel-imap-provider.c:53
-msgid "Names_pace:"
-msgstr "Es_pazo do nome:"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Namespace:"
+msgstr "Espazo do nome:"
 
-#: ../camel/providers/imap/camel-imap-provider.c:55
 #: ../camel/providers/imapx/camel-imapx-provider.c:59
 #: ../camel/providers/local/camel-local-provider.c:41
 #: ../camel/providers/local/camel-local-provider.c:77
@@ -3576,94 +3418,45 @@ msgstr "Es_pazo do nome:"
 msgid "Options"
 msgstr "OpciÃns"
 
-#: ../camel/providers/imap/camel-imap-provider.c:57
 #: ../camel/providers/imapx/camel-imapx-provider.c:61
 #: ../camel/providers/nntp/camel-nntp-provider.c:43
 msgid "Apply _filters to new messages in all folders"
 msgstr "_Aplicar filtros Ãs mensaxes novas en todos os cartafoles"
 
-#: ../camel/providers/imap/camel-imap-provider.c:59
 #: ../camel/providers/imapx/camel-imapx-provider.c:63
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr ""
 "_Aplicar os filtros Ãs mensaxes novas na caixa de entrada deste servidor"
 
-#: ../camel/providers/imap/camel-imap-provider.c:61
 #: ../camel/providers/imapx/camel-imapx-provider.c:65
 msgid "Check new messages for _Junk contents"
 msgstr "Comprobar nas novas mensaxes os contidos _non desexados"
 
-#: ../camel/providers/imap/camel-imap-provider.c:63
 #: ../camel/providers/imapx/camel-imapx-provider.c:67
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr ""
 "Comprobar sà o correo lixo nas mensaxes do cartafol da CAIXA_DE_ENTRADA"
 
-#: ../camel/providers/imap/camel-imap-provider.c:65
 #: ../camel/providers/imapx/camel-imapx-provider.c:69
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Sincroni_zar localmente o correo remota de forma automÃtica"
 
-#: ../camel/providers/imap/camel-imap-provider.c:71
-msgid "IMAP default port"
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
+msgid "Default IMAP port"
 msgstr "Porto IMAP predeterminado"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "IMAP over SSL"
 msgstr "IMAP sobre SSL"
 
-#: ../camel/providers/imap/camel-imap-provider.c:78
-msgid "IMAP"
-msgstr "IMAP"
+#: ../camel/providers/imapx/camel-imapx-provider.c:83
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap/camel-imap-provider.c:80
 #: ../camel/providers/imapx/camel-imapx-provider.c:85
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: ../camel/providers/imap/camel-imap-store.c:2191
-#: ../camel/providers/local/camel-maildir-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:442
-#: ../camel/providers/local/camel-mh-store.c:564
-#, 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:2984
-#, c-format
-msgid "Retrieving list of folders at '%s'"
-msgstr "Obtendo a lista de cartafoles para Â%sÂ"
-
-#: ../camel/providers/imap/camel-imap-store.c:3334
-#, c-format
-msgid "Server unexpectedly disconnected"
-msgstr "O servidor desconectouse inesperadamente"
-
-#: ../camel/providers/imap/camel-imap-store.c:3338
-msgid "Server unexpectedly disconnected: "
-msgstr "O servidor desconectouse inesperadamente: "
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Use _Quick Resync if the server supports it"
-msgstr "Usar a resincronizaciÃn _rÃpida se o servidor o permite"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "_Listen for server change notifications"
-msgstr "_Escoitar as notificaciÃns de cambios do servidor"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "Namespace:"
-msgstr "Espazo do nome:"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:75
-msgid "Default IMAP port"
-msgstr "Porto IMAP predeterminado"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:83
-msgid "IMAP+"
-msgstr "IMAP+"
-
 #: ../camel/providers/local/camel-local-folder.c:194
 #, c-format
 msgid "~%s (%s)"
@@ -3878,6 +3671,13 @@ msgstr "Non à posÃbel obter o cartafol Â%sÂ: o cartafol non existe."
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Non à posÃbel obter o cartafol Â%sÂ: non à un cartafol maildir."
 
+#: ../camel/providers/local/camel-maildir-store.c:274
+#: ../camel/providers/local/camel-mbox-store.c:442
+#: ../camel/providers/local/camel-mh-store.c:564
+#, c-format
+msgid "Cannot create folder '%s': folder exists."
+msgstr "Non à posÃbel crear o cartafol Â%sÂ: o cartafol xa existe."
+
 #: ../camel/providers/local/camel-maildir-store.c:338
 #: ../camel/providers/local/camel-maildir-store.c:378
 #: ../camel/providers/local/camel-mh-store.c:682
@@ -3921,7 +3721,7 @@ msgstr "Comprobando mensaxes novas"
 #: ../camel/providers/local/camel-maildir-summary.c:746
 #: ../camel/providers/local/camel-mbox-summary.c:418
 #: ../camel/providers/local/camel-mbox-summary.c:650
-#: ../camel/providers/local/camel-mbox-summary.c:794
+#: ../camel/providers/local/camel-mbox-summary.c:798
 #: ../camel/providers/local/camel-spool-summary.c:132
 msgid "Storing folder"
 msgstr "Almacenando o cartafol"
@@ -4031,7 +3831,7 @@ msgid "Cannot check folder: %s: %s"
 msgstr "Non à posÃbel comprobar o cartafol: %s: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:663
-#: ../camel/providers/local/camel-mbox-summary.c:803
+#: ../camel/providers/local/camel-mbox-summary.c:807
 #: ../camel/providers/local/camel-spool-summary.c:139
 #, c-format
 msgid "Could not open file: %s: %s"
@@ -4044,29 +3844,29 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Non à posÃbel abrir a caixa de correo temporal: %s"
 
 #: ../camel/providers/local/camel-mbox-summary.c:694
-#: ../camel/providers/local/camel-mbox-summary.c:920
+#: ../camel/providers/local/camel-mbox-summary.c:924
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posÃbel pechar o cartafol orixe %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:705
+#: ../camel/providers/local/camel-mbox-summary.c:707
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Non foi posÃbel pechar o cartafol temporal: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:722
+#: ../camel/providers/local/camel-mbox-summary.c:726
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posÃbel renomear o cartafol: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:817
-#: ../camel/providers/local/camel-mbox-summary.c:1086
+#: ../camel/providers/local/camel-mbox-summary.c:821
+#: ../camel/providers/local/camel-mbox-summary.c:1090
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Non foi posÃbel almacenar o cartafol: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:856
-#: ../camel/providers/local/camel-mbox-summary.c:1123
+#: ../camel/providers/local/camel-mbox-summary.c:860
+#: ../camel/providers/local/camel-mbox-summary.c:1127
 #, c-format
 msgid ""
 "MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
@@ -4075,25 +3875,25 @@ msgstr ""
 "O ficheiro MBOX està corrompido, arrÃnxeo. (EsperÃbase unha liÃa ÂDe pero "
 "non se obtivo)"
 
-#: ../camel/providers/local/camel-mbox-summary.c:866
-#: ../camel/providers/local/camel-mbox-summary.c:1136
+#: ../camel/providers/local/camel-mbox-summary.c:870
+#: ../camel/providers/local/camel-mbox-summary.c:1140
 #, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "O resumo e o cartafol non coinciden, incluso despois da sincronizaciÃn"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1031
+#: ../camel/providers/local/camel-mbox-summary.c:1035
 #: ../camel/providers/local/camel-spool-summary.c:347
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoÃecido: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1194
-#: ../camel/providers/local/camel-mbox-summary.c:1224
+#: ../camel/providers/local/camel-mbox-summary.c:1198
+#: ../camel/providers/local/camel-mbox-summary.c:1228
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Produciuse un erro ao escribir na caixa de correo temporal: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1213
+#: ../camel/providers/local/camel-mbox-summary.c:1217
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Produciuse un erro ao escribir na caixa de correo temporal: %s: %s"
@@ -4222,21 +4022,26 @@ msgstr "Erro interno: UID nun formato incorrecto: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:328
 #: ../camel/providers/nntp/camel-nntp-folder.c:332
-#: ../camel/providers/pop3/camel-pop3-folder.c:630
-#: ../camel/providers/pop3/camel-pop3-folder.c:1033
+#: ../camel/providers/pop3/camel-pop3-folder.c:633
+#: ../camel/providers/pop3/camel-pop3-folder.c:1065
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Non à posÃbel obter a mensaxe %s: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:339
 #: ../camel/providers/nntp/camel-nntp-folder.c:504
-#: ../camel/providers/pop3/camel-pop3-folder.c:555
-#: ../camel/providers/pop3/camel-pop3-folder.c:620
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
+#: ../camel/providers/pop3/camel-pop3-folder.c:558
+#: ../camel/providers/pop3/camel-pop3-folder.c:623
+#: ../camel/providers/pop3/camel-pop3-folder.c:642
 #, c-format
 msgid "Cannot get message %s: "
 msgstr "Non à posÃbel obter a mensaxe %s: "
 
+#: ../camel/providers/nntp/camel-nntp-folder.c:493
+#, c-format
+msgid "This message is not currently available"
+msgstr "Esta mensaxe non està dispoÃÃbel actualmente"
+
 #: ../camel/providers/nntp/camel-nntp-folder.c:559
 #: ../camel/providers/nntp/camel-nntp-folder.c:565
 #: ../camel/providers/nntp/camel-nntp-folder.c:611
@@ -4288,28 +4093,36 @@ msgstr "Este à un provedor para ler e enviar aos grupos de noticias de USENET."
 
 #: ../camel/providers/nntp/camel-nntp-provider.c:87
 msgid ""
+"This option will connect to the NNTP server anonymously, without "
+"authentication."
+msgstr ""
+"Esta opciÃn conectarase co servidor NNTP de forma anÃnima, sen "
+"autenticaciÃn."
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:97
+msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 "Esta opciÃn autenticarase co servidor NNTP usando un contrasinal de texto "
 "plano."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:286
+#: ../camel/providers/nntp/camel-nntp-store.c:285
 #, 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:298
+#: ../camel/providers/nntp/camel-nntp-store.c:297
 #, 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:463
+#: ../camel/providers/nntp/camel-nntp-store.c:472
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vÃa %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1058
+#: ../camel/providers/nntp/camel-nntp-store.c:1073
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4320,26 +4133,26 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1152
+#: ../camel/providers/nntp/camel-nntp-store.c:1167
 #, 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:1168
+#: ../camel/providers/nntp/camel-nntp-store.c:1183
 #, 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:1191
+#: ../camel/providers/nntp/camel-nntp-store.c:1206
 #, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Non à posÃbel retirar un cartafol nun almacenamento de novas: en vez diso "
 "elimine a subscriciÃn."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1390
+#: ../camel/providers/nntp/camel-nntp-store.c:1405
 #, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
@@ -4350,7 +4163,7 @@ msgstr ""
 "\n"
 "o grupo non existe. O elemento seleccionado à probablemente un cartafol pai."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1438
+#: ../camel/providers/nntp/camel-nntp-store.c:1453
 #, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
@@ -4361,11 +4174,11 @@ msgstr ""
 "\n"
 "o grupo de novas non existe"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1628
+#: ../camel/providers/nntp/camel-nntp-store.c:1643
 msgid "NNTP Command failed: "
 msgstr "A orde NNTP fallou: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1713
+#: ../camel/providers/nntp/camel-nntp-store.c:1728
 #, c-format
 msgid "Not connected."
 msgstr "Non conectado."
@@ -4391,34 +4204,38 @@ msgstr "Resposta inesperada do servidor desde head: %s"
 msgid "Operation failed: %s"
 msgstr "Produciuse un fallo na operaciÃn: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:450
-#: ../camel/providers/pop3/camel-pop3-folder.c:523
+#: ../camel/providers/pop3/camel-pop3-folder.c:453
+#: ../camel/providers/pop3/camel-pop3-folder.c:526
 #, c-format
 msgid "No message with UID %s"
 msgstr "Non existe a mensaxe co UID %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:539
+#: ../camel/providers/pop3/camel-pop3-folder.c:542
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:631
+#: ../camel/providers/pop3/camel-pop3-folder.c:634
 msgid "Unknown reason"
 msgstr "RazÃn descoÃecida"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:679
+#: ../camel/providers/pop3/camel-pop3-folder.c:682
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:740
+#: ../camel/providers/pop3/camel-pop3-folder.c:741
+#: ../camel/providers/pop3/camel-pop3-folder.c:744
+#: ../camel/providers/pop3/camel-pop3-folder.c:757
+#: ../camel/providers/pop3/camel-pop3-folder.c:770
+#: ../camel/providers/pop3/camel-pop3-folder.c:784
 msgid "Cannot get POP summary: "
 msgstr "Non à posÃbel obter o resumo POP:"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:859
+#: ../camel/providers/pop3/camel-pop3-folder.c:891
 msgid "Expunging old messages"
 msgstr "Expurgando as mensaxes antigas"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:879
+#: ../camel/providers/pop3/camel-pop3-folder.c:911
 msgid "Expunging deleted messages"
 msgstr "Expurgando as mensaxes eliminadas"
 
@@ -4484,54 +4301,54 @@ msgstr ""
 msgid ": "
 msgstr ": "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:139
+#: ../camel/providers/pop3/camel-pop3-store.c:144
 #, 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:154
+#: ../camel/providers/pop3/camel-pop3-store.c:159
 #, 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:155
+#: ../camel/providers/pop3/camel-pop3-store.c:160
 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:176
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, 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:189
+#: ../camel/providers/pop3/camel-pop3-store.c:194
 #, 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:298
+#: ../camel/providers/pop3/camel-pop3-store.c:305
 #, 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:320
+#: ../camel/providers/pop3/camel-pop3-store.c:327
 #, 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:371
+#: ../camel/providers/pop3/camel-pop3-store.c:387
 #, c-format
 msgid "POP3 server %s"
 msgstr "Servidor POP3 %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:374
+#: ../camel/providers/pop3/camel-pop3-store.c:390
 #, c-format
 msgid "POP3 server for %s on %s"
 msgstr "Servidor POP3 para %s en %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/providers/pop3/camel-pop3-store.c:563
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4541,7 +4358,7 @@ msgstr ""
 "APOP incorrecto. SospÃitase dun ataque de suplantaciÃn. Contacte co seu "
 "administrador."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:598
+#: ../camel/providers/pop3/camel-pop3-store.c:615
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4552,7 +4369,7 @@ msgstr ""
 
 #. Translators: Last %s is an optional explanation
 #. * beginning with ": " separator.
-#: ../camel/providers/pop3/camel-pop3-store.c:613
+#: ../camel/providers/pop3/camel-pop3-store.c:630
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4561,11 +4378,6 @@ msgstr ""
 "Non foi posÃbel realizar a conexiÃn co servidor POP %s.\n"
 "Produciuse un erro ao enviar o nome de usuario%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:673
-#, 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:701
 #, c-format
 msgid "No such folder '%s'."
@@ -4596,37 +4408,42 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a travÃs do programa sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not parse recipient list"
 msgstr "Non foi posÃbel analizar a lista de destinatarios"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:140
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+#, c-format
+msgid "Could not parse arguments"
+msgstr "Non foi posÃbel analizar os argumentos"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:213
 #, c-format
 msgid "Could not create pipe to '%s': %s: mail not sent"
 msgstr ""
 "Non foi posÃbel crear unha canalizaciÃn a Â%sÂ: %s: o correo non se enviou"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:163
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:238
 #, c-format
 msgid "Could not fork '%s': %s: mail not sent"
 msgstr "Non foi posÃbel facer un fork de Â%sÂ: %s: o correo non se enviou"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:287
 msgid "Could not send message: "
 msgstr "Non foi posÃbel enviar a mensaxe: "
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:239
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:317
 #, c-format
 msgid "'%s' exited with signal %s: mail not sent."
 msgstr "Â%s saÃu co sinal %s: o correo non se enviou."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:327
 #, c-format
 msgid "Could not execute '%s': mail not sent."
 msgstr "Non foi posÃbel executar Â%sÂ: o correo non se enviou."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:252
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:332
 #, c-format
 msgid "'%s' exited with status %d: mail not sent."
 msgstr "Â%s saÃu con estado %d: o correo non se enviou."
@@ -4700,179 +4517,179 @@ msgstr "Non se especificou ningÃn mecanismo SASL"
 msgid "AUTH command failed: "
 msgstr "Produciuse un fallo na orde AUTH: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:654
+#: ../camel/providers/smtp/camel-smtp-transport.c:653
 #, 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:661
+#: ../camel/providers/smtp/camel-smtp-transport.c:660
 #, 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:665
+#: ../camel/providers/smtp/camel-smtp-transport.c:664
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:690
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
 #, 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:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:702
 #, 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:807
+#: ../camel/providers/smtp/camel-smtp-transport.c:806
 msgid "Syntax error, command unrecognized"
 msgstr "Existe un erro de sintaxe; a orde no se recoÃeceu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:809
+#: ../camel/providers/smtp/camel-smtp-transport.c:808
 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:811
+#: ../camel/providers/smtp/camel-smtp-transport.c:810
 msgid "Command not implemented"
 msgstr "A orde non està implementada"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:813
+#: ../camel/providers/smtp/camel-smtp-transport.c:812
 msgid "Command parameter not implemented"
 msgstr "O parÃmetro da orde non està implementado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:815
+#: ../camel/providers/smtp/camel-smtp-transport.c:814
 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:817
+#: ../camel/providers/smtp/camel-smtp-transport.c:816
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:819
+#: ../camel/providers/smtp/camel-smtp-transport.c:818
 msgid "Service ready"
 msgstr "Servizo preparado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:821
+#: ../camel/providers/smtp/camel-smtp-transport.c:820
 msgid "Service closing transmission channel"
 msgstr "O servizo està pechando o canal de transmisiÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:823
+#: ../camel/providers/smtp/camel-smtp-transport.c:822
 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:825
+#: ../camel/providers/smtp/camel-smtp-transport.c:824
 msgid "Requested mail action okay, completed"
 msgstr "A acciÃn de correo solicitada terminou correctamente"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:827
+#: ../camel/providers/smtp/camel-smtp-transport.c:826
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non à local; reenviarase a <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:829
+#: ../camel/providers/smtp/camel-smtp-transport.c:828
 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:831
+#: ../camel/providers/smtp/camel-smtp-transport.c:830
 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:833
+#: ../camel/providers/smtp/camel-smtp-transport.c:832
 msgid "Requested action aborted: error in processing"
 msgstr "Interrompeuse a acciÃn solicitada: produciuse un erro no procesamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:835
+#: ../camel/providers/smtp/camel-smtp-transport.c:834
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; tÃnteo con <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:837
+#: ../camel/providers/smtp/camel-smtp-transport.c:836
 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:839
+#: ../camel/providers/smtp/camel-smtp-transport.c:838
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Interrompeuse a acciÃn solicitada: excedeuse a asignaciÃn de almacenamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:841
+#: ../camel/providers/smtp/camel-smtp-transport.c:840
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "A acciÃn solicitada non se realizou: o nome da caixa de correo non se admite"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:843
+#: ../camel/providers/smtp/camel-smtp-transport.c:842
 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:845
+#: ../camel/providers/smtp/camel-smtp-transport.c:844
 msgid "Transaction failed"
 msgstr "Produciuseuse un fallo na transacciÃn"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:849
+#: ../camel/providers/smtp/camel-smtp-transport.c:848
 msgid "A password transition is needed"
 msgstr "PrecÃsase unha transiciÃn de contrasinal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:851
+#: ../camel/providers/smtp/camel-smtp-transport.c:850
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticaciÃn à demasiado dÃbil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:853
+#: ../camel/providers/smtp/camel-smtp-transport.c:852
 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:855
+#: ../camel/providers/smtp/camel-smtp-transport.c:854
 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:1111
 msgid "SMTP Greeting"
 msgstr "SaÃdo SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1139
-#: ../camel/providers/smtp/camel-smtp-transport.c:1157
-#: ../camel/providers/smtp/camel-smtp-transport.c:1165
+#: ../camel/providers/smtp/camel-smtp-transport.c:1138
+#: ../camel/providers/smtp/camel-smtp-transport.c:1156
+#: ../camel/providers/smtp/camel-smtp-transport.c:1164
 msgid "HELO command failed: "
 msgstr "Produciuse un fallo na orde HELO: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1240
-#: ../camel/providers/smtp/camel-smtp-transport.c:1255
-#: ../camel/providers/smtp/camel-smtp-transport.c:1265
+#: ../camel/providers/smtp/camel-smtp-transport.c:1239
+#: ../camel/providers/smtp/camel-smtp-transport.c:1254
+#: ../camel/providers/smtp/camel-smtp-transport.c:1264
 msgid "MAIL FROM command failed: "
 msgstr "Produciuse un fallo na orde MAIL FROM: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1292
+#: ../camel/providers/smtp/camel-smtp-transport.c:1291
 msgid "RCPT TO command failed: "
 msgstr "Produciuse un fallo na orde RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1309
-#: ../camel/providers/smtp/camel-smtp-transport.c:1319
+#: ../camel/providers/smtp/camel-smtp-transport.c:1308
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
 #, c-format
 msgid "RCPT TO <%s> failed: "
 msgstr "Produciuse un fallo na orde RCPT TO <%s>: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1362
-#: ../camel/providers/smtp/camel-smtp-transport.c:1373
-#: ../camel/providers/smtp/camel-smtp-transport.c:1384
-#: ../camel/providers/smtp/camel-smtp-transport.c:1443
-#: ../camel/providers/smtp/camel-smtp-transport.c:1463
-#: ../camel/providers/smtp/camel-smtp-transport.c:1477
-#: ../camel/providers/smtp/camel-smtp-transport.c:1486
+#: ../camel/providers/smtp/camel-smtp-transport.c:1361
+#: ../camel/providers/smtp/camel-smtp-transport.c:1372
+#: ../camel/providers/smtp/camel-smtp-transport.c:1383
+#: ../camel/providers/smtp/camel-smtp-transport.c:1442
+#: ../camel/providers/smtp/camel-smtp-transport.c:1462
+#: ../camel/providers/smtp/camel-smtp-transport.c:1476
+#: ../camel/providers/smtp/camel-smtp-transport.c:1485
 msgid "DATA command failed: "
 msgstr "Produciuse un erro na orde DATA: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1511
-#: ../camel/providers/smtp/camel-smtp-transport.c:1526
-#: ../camel/providers/smtp/camel-smtp-transport.c:1535
+#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1525
+#: ../camel/providers/smtp/camel-smtp-transport.c:1534
 msgid "RSET command failed: "
 msgstr "Produciuse un fallo na orde RSET: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1560
-#: ../camel/providers/smtp/camel-smtp-transport.c:1574
-#: ../camel/providers/smtp/camel-smtp-transport.c:1581
+#: ../camel/providers/smtp/camel-smtp-transport.c:1559
+#: ../camel/providers/smtp/camel-smtp-transport.c:1573
+#: ../camel/providers/smtp/camel-smtp-transport.c:1580
 msgid "QUIT command failed: "
 msgstr "Produciuse un fallo na orde QUIT: "
 
@@ -4917,8 +4734,7 @@ msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../data/sources/contacts-stub.source.in.h:1
-#: ../libedataserverui/e-name-selector-dialog.c:427
-#: ../modules/google-backend/module-google-backend.c:183
+#: ../modules/google-backend/module-google-backend.c:195
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -4953,8 +4769,8 @@ msgstr "WebDAV"
 
 #: ../libebackend/e-authentication-mediator.c:205
 #: ../libebackend/e-authentication-mediator.c:216
-#: ../libebackend/e-authentication-mediator.c:849
-#: ../libebackend/e-authentication-mediator.c:1179
+#: ../libebackend/e-authentication-mediator.c:852
+#: ../libebackend/e-authentication-mediator.c:1182
 msgid "Bus name vanished (client terminated?)"
 msgstr "O nome do bus desapareceu (terminou o cliente a conexiÃn?)"
 
@@ -4964,8 +4780,8 @@ msgstr "Non houbo resposta do cliente"
 
 #: ../libebackend/e-authentication-mediator.c:334
 #: ../libebackend/e-authentication-mediator.c:345
-#: ../libebackend/e-authentication-mediator.c:843
-#: ../libebackend/e-authentication-mediator.c:1173
+#: ../libebackend/e-authentication-mediator.c:846
+#: ../libebackend/e-authentication-mediator.c:1176
 msgid "Client cancelled the operation"
 msgstr "O cliente cancelou a operaciÃn"
 
@@ -4977,7 +4793,7 @@ msgstr "O cliente informou que o contrasinal foi rexeitado"
 msgid "Add this password to your keyring"
 msgstr "Engadir este contrasinal ao seu anel de chaves"
 
-#: ../libebackend/e-authentication-session.c:595
+#: ../libebackend/e-authentication-session.c:622
 msgid "Password was incorrect"
 msgstr "O contrasinal non foi correcto"
 
@@ -4986,12 +4802,12 @@ msgstr "O contrasinal non foi correcto"
 msgid "%s does not support authentication"
 msgstr "%s non permite a autenticaciÃn"
 
-#: ../libebackend/e-collection-backend.c:734
+#: ../libebackend/e-collection-backend.c:765
 #, c-format
 msgid "%s does not support creating remote resources"
 msgstr "%s non permite a creaciÃn de recursos remotos"
 
-#: ../libebackend/e-collection-backend.c:793
+#: ../libebackend/e-collection-backend.c:824
 #, c-format
 msgid "%s does not support deleting remote resources"
 msgstr "%s non permite a eliminaciÃn de recursos remotos"
@@ -5001,7 +4817,7 @@ msgstr "%s non permite a eliminaciÃn de recursos remotos"
 msgid "Data source is missing a [%s] group"
 msgstr "Falta [%s] grupo na orixe de datos"
 
-#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1111
+#: ../libebackend/e-server-side-source.c:916 ../libedataserver/e-source.c:1106
 #, c-format
 msgid "Data source '%s' does not support creating remote resources"
 msgstr "A orixe de datos Â%s non permite a creaciÃn de recursos remotos"
@@ -5014,7 +4830,7 @@ msgstr ""
 "A orixe de datos Â%s non ten infraestrutura de colecciÃn para crear o "
 "recurso remoto"
 
-#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1220
+#: ../libebackend/e-server-side-source.c:958 ../libedataserver/e-source.c:1215
 #, c-format
 msgid "Data source '%s' does not support deleting remote resources"
 msgstr "A orixe de datos Â%s non permite a eliminaciÃn de recursos remotos"
@@ -5032,16 +4848,21 @@ msgstr ""
 msgid "File must have a '.source' extension"
 msgstr "O ficheiro debe ter unha extensiÃn Â.sourceÂ"
 
-#: ../libebackend/e-source-registry-server.c:522
-#: ../libedataserver/e-source-registry.c:1535
+#: ../libebackend/e-source-registry-server.c:523
+#: ../libedataserver/e-source-registry.c:1594
 msgid "The user declined to authenticate"
 msgstr "O usuario rexeitou autenticarse"
 
-#: ../libebackend/e-source-registry-server.c:770
+#: ../libebackend/e-source-registry-server.c:792
 #, c-format
 msgid "UID '%s' is already in use"
 msgstr "o UID Â%s xa està en uso"
 
+#: ../libebackend/e-user-prompter-server.c:278
+#, c-format
+msgid "Extension dialog '%s' not found."
+msgstr "Non foi posÃbel atopar o diÃlogo da extensiÃn Â%sÂ."
+
 #: ../libedataserver/e-categories.c:46
 msgctxt "CategoryName"
 msgid "Anniversary"
@@ -5224,22 +5045,22 @@ msgstr "Escriba o contrasinal para a lista de tarefas Â%sÂ."
 msgid "Please enter the password for account \"%s\"."
 msgstr "Escriba o contrasinal para a conta Â%sÂ."
 
-#: ../libedataserver/e-source.c:621
+#: ../libedataserver/e-source.c:616
 #, c-format
 msgid "Source file is missing a [%s] group"
 msgstr "Falta [%s] grupo no ficheiro de orixe"
 
-#: ../libedataserver/e-source.c:938
+#: ../libedataserver/e-source.c:933
 #, c-format
 msgid "Data source '%s' is not removable"
 msgstr "A orixe de datos Â%s non se pode retirar"
 
-#: ../libedataserver/e-source.c:1020
+#: ../libedataserver/e-source.c:1015
 #, c-format
 msgid "Data source '%s' is not writable"
 msgstr "A orixe de datos Â%s non à escribÃbel:"
 
-#: ../libedataserver/e-source.c:1408
+#: ../libedataserver/e-source.c:1388
 msgid "Unnamed"
 msgstr "Sen nome"
 
@@ -5252,7 +5073,7 @@ msgstr "O script de sinatura debe ser un ficheiro local"
 #. * in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1949
+#: ../libedataserver/e-time-utils.c:1647 ../libedataserver/e-time-utils.c:1946
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -5260,7 +5081,7 @@ msgstr "%a %d/%m/%Y %I:%M:%S %p"
 #. * in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1655 ../libedataserver/e-time-utils.c:1940
+#: ../libedataserver/e-time-utils.c:1652 ../libedataserver/e-time-utils.c:1937
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -5268,7 +5089,7 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 #. * in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1660 ../libedataserver/e-time-utils.c:1945
+#: ../libedataserver/e-time-utils.c:1657 ../libedataserver/e-time-utils.c:1942
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -5276,79 +5097,79 @@ msgstr "%a %d/%m/%Y %I:%M %p"
 #. * in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1665 ../libedataserver/e-time-utils.c:1936
+#: ../libedataserver/e-time-utils.c:1662 ../libedataserver/e-time-utils.c:1933
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 12-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1670
+#: ../libedataserver/e-time-utils.c:1667
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a %d/%m/%Y %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. * in 24-hour format, without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1675
+#: ../libedataserver/e-time-utils.c:1672
 msgid "%a %m/%d/%Y %H"
 msgstr "%a %d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1678 ../libedataserver/e-time-utils.c:1798
-#: ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1675 ../libedataserver/e-time-utils.c:1795
+#: ../libedataserver/e-time-utils.c:1928
 msgid "%a %m/%d/%Y"
 msgstr "%a %d/%m/%Y"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1685
+#: ../libedataserver/e-time-utils.c:1682
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%d/%m/%Y %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1689
+#: ../libedataserver/e-time-utils.c:1686
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%d/%m/%Y %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1694
+#: ../libedataserver/e-time-utils.c:1691
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%d/%m/%Y %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1699
+#: ../libedataserver/e-time-utils.c:1696
 msgid "%m/%d/%Y %H:%M"
 msgstr "%d/%m/%Y %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1704
+#: ../libedataserver/e-time-utils.c:1701
 msgid "%m/%d/%Y %I %p"
 msgstr "%d/%m/%Y %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. * without minutes or seconds.
-#: ../libedataserver/e-time-utils.c:1709
+#: ../libedataserver/e-time-utils.c:1706
 msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1712 ../libedataserver/e-time-utils.c:1801
+#: ../libedataserver/e-time-utils.c:1709 ../libedataserver/e-time-utils.c:1798
 msgid "%m/%d/%Y"
 msgstr "%d/%m/%Y"
 
 # (pofilter) variables: do not translate: %I, %p
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1872 ../libedataserver/e-time-utils.c:1993
+#: ../libedataserver/e-time-utils.c:1869 ../libedataserver/e-time-utils.c:1990
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1876 ../libedataserver/e-time-utils.c:1985
+#: ../libedataserver/e-time-utils.c:1873 ../libedataserver/e-time-utils.c:1982
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -5356,25 +5177,25 @@ msgstr "%H:%M:%S"
 #. * in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1881 ../libedataserver/e-time-utils.c:1990
+#: ../libedataserver/e-time-utils.c:1878 ../libedataserver/e-time-utils.c:1987
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. * without seconds.
-#: ../libedataserver/e-time-utils.c:1885 ../libedataserver/e-time-utils.c:1982
+#: ../libedataserver/e-time-utils.c:1882 ../libedataserver/e-time-utils.c:1979
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format,
 #. * and no colon.
-#: ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1886
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1893
+#: ../libedataserver/e-time-utils.c:1890
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -5486,215 +5307,412 @@ msgstr "URL para a configuraciÃn automÃtica do proxy"
 msgid "Where to read automatic proxy configuration from."
 msgstr "De onde ler a configuraciÃn automÃtica do proxy."
 
-#: ../libedataserverui/e-categories-editor.c:230
-msgid "Currently _used categories:"
-msgstr "CategorÃas en _uso actualmente:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:223
+#, c-format
+msgid "Code: %u - Unexpected response from server"
+msgstr "CÃdigo: %u: resposta non agardada do servidor"
 
-#: ../libedataserverui/e-categories-editor.c:239
-msgid "_Available Categories:"
-msgstr "_CategorÃas dispoÃÃbeis:"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:244
+#, c-format
+msgid "Failed to parse autodiscover response XML"
+msgstr "Produciuse un erro ao analizar a resposta XML da autodetecciÃn"
 
-#: ../libedataserverui/e-categories-selector.c:325
-msgid "Icon"
-msgstr "Icona"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:253
+#, c-format
+msgid "Failed to find Autodiscover element"
+msgstr "Produciuse un erro ao buscar o elemento ÂAutodiscoverÂ"
 
-#: ../libedataserverui/e-categories-selector.c:330
-msgid "Category"
-msgstr "CategorÃa"
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:265
+#, c-format
+msgid "Failed to find Response element"
+msgstr "Produciuse un erro ao buscar o elemento ÂResponseÂ"
 
-#: ../libedataserverui/e-category-completion.c:300
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:277
 #, c-format
-msgid "Create category \"%s\""
-msgstr "Crear categorÃa Â%sÂ"
+msgid "Failed to find Account element"
+msgstr "Produciuse un erro ao buscar o elemento ÂAccountÂ"
+
+#. TODO: more specific
+#: ../modules/gnome-online-accounts/goaewsclient.c:291
+#, c-format
+msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgstr ""
+"Produciuse un erro ao buscar ÂASUrl e ÂAOBUrl na resposta da autodetecciÃn"
 
-#: ../libedataserverui/e-category-editor.c:137
-msgid "Category Icon"
-msgstr "Icona de categorÃa"
+#: ../modules/google-backend/module-google-backend.c:118
+#: ../modules/yahoo-backend/module-yahoo-backend.c:200
+msgid "Calendar"
+msgstr "Calendario"
 
-#: ../libedataserverui/e-category-editor.c:141
-msgid "_No Image"
-msgstr "_Sen imaxe"
+#: ../modules/trust-prompt/certificate-viewer.c:287
+msgid "Not part of certificate"
+msgstr "Non à parte do certificado"
+
+#: ../modules/trust-prompt/certificate-viewer.c:592
+msgid "This certificate has been verified for the following uses:"
+msgstr "Este certificado comprobouse para os seguintes usos:"
+
+#: ../modules/trust-prompt/certificate-viewer.c:596
+#: ../modules/trust-prompt/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "Certificado cliente X.509"
+
+#: ../modules/trust-prompt/certificate-viewer.c:601
+#: ../modules/trust-prompt/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "Certificado de servidor X.509"
 
-#: ../libedataserverui/e-category-editor.c:178
-msgid "Category _Name"
-msgstr "_Nome de categorÃa"
+#: ../modules/trust-prompt/certificate-viewer.c:606
+msgid "Email Signer Certificate"
+msgstr "Certificado do asinante do correo"
 
-#: ../libedataserverui/e-category-editor.c:186
-msgid "Category _Icon"
-msgstr "_Icona de categorÃa"
+#: ../modules/trust-prompt/certificate-viewer.c:611
+msgid "Email Recipient Certificate"
+msgstr "Certificado do destinatario do correo"
 
-#: ../libedataserverui/e-category-editor.c:226
-msgid "Category Properties"
-msgstr "Propiedades de categorÃa"
+#: ../modules/trust-prompt/certificate-viewer.c:625
+msgid "Issued To"
+msgstr "Emitido a"
 
-#: ../libedataserverui/e-category-editor.c:287
-#, c-format
-msgid ""
-"There is already a category '%s' in the configuration. Please use another "
-"name"
-msgstr "Xa existe unha categorÃa Â%s na configuraciÃn. Utilice outro nome"
+#: ../modules/trust-prompt/certificate-viewer.c:626
+#: ../modules/trust-prompt/certificate-viewer.c:632
+msgid "Common Name (CN)"
+msgstr "Nome comÃn (NC)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:627
+#: ../modules/trust-prompt/certificate-viewer.c:633
+msgid "Organization (O)"
+msgstr "OrganizaciÃn (O)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:628
+#: ../modules/trust-prompt/certificate-viewer.c:634
+msgid "Organizational Unit (OU)"
+msgstr "Unidade organizativa (UO)"
+
+#: ../modules/trust-prompt/certificate-viewer.c:629
+#: ../modules/trust-prompt/e-asn1-object.c:134
+msgid "Serial Number"
+msgstr "NÃmero de serie"
 
-#: ../libedataserverui/e-name-selector-dialog.c:278
-msgid "Show Contacts"
-msgstr "Mostrar contactos"
+#: ../modules/trust-prompt/certificate-viewer.c:631
+msgid "Issued By"
+msgstr "Emitido a"
 
-#: ../libedataserverui/e-name-selector-dialog.c:300
-msgid "Address B_ook:"
-msgstr "Axenda de _enderezos:"
+#: ../modules/trust-prompt/certificate-viewer.c:636
+msgid "Validity"
+msgstr "Validez"
 
-#: ../libedataserverui/e-name-selector-dialog.c:310
-msgid "Cat_egory:"
-msgstr "Ca_tegorÃa:"
+#: ../modules/trust-prompt/certificate-viewer.c:637
+msgid "Issued On"
+msgstr "Emitido a"
 
-#: ../libedataserverui/e-name-selector-dialog.c:332
-msgid "_Search:"
-msgstr "_Buscar:"
+#: ../modules/trust-prompt/certificate-viewer.c:638
+msgid "Expires On"
+msgstr "Caduca o"
 
-#: ../libedataserverui/e-name-selector-dialog.c:357
-#: ../libedataserverui/e-name-selector-dialog.c:1182
-msgid "Any Category"
-msgstr "Calquera categorÃa"
+#: ../modules/trust-prompt/certificate-viewer.c:640
+msgid "Fingerprints"
+msgstr "Pegadas dactilares"
 
-#: ../libedataserverui/e-name-selector-dialog.c:359
-msgid "Co_ntacts"
-msgstr "Co_ntactos"
+#: ../modules/trust-prompt/certificate-viewer.c:641
+msgid "SHA1 Fingerprint"
+msgstr "Pegada dixital SHA1"
 
-#: ../libedataserverui/e-name-selector-dialog.c:421
-msgid "Search"
-msgstr "Buscar"
+#: ../modules/trust-prompt/certificate-viewer.c:642
+msgid "MD5 Fingerprint"
+msgstr "Pegada dixital MD5"
 
-#: ../libedataserverui/e-name-selector-dialog.c:424
-msgid "Address Book"
-msgstr "Axenda de enderezos"
+#: ../modules/trust-prompt/certificate-viewer.c:644
+msgid "General"
+msgstr "Xeral"
 
-#: ../libedataserverui/e-name-selector-dialog.c:545
-msgid "Select Contacts from Address Book"
-msgstr "Seleccionar contactos da axenda de enderezos"
+#: ../modules/trust-prompt/certificate-viewer.c:661
+msgid "Certificate Hierarchy"
+msgstr "XerarquÃa do certificado"
 
-#: ../libedataserverui/e-name-selector-dialog.c:917
-msgid "_Add"
-msgstr "_Engadir"
+#: ../modules/trust-prompt/certificate-viewer.c:664
+msgid "Certificate Fields"
+msgstr "Campos do certificado"
 
-#: ../libedataserverui/e-name-selector-dialog.c:921
-msgid "_Remove"
-msgstr "_Retirar"
+#: ../modules/trust-prompt/certificate-viewer.c:667
+msgid "Field Value"
+msgstr "Valor do campo"
 
-#: ../libedataserverui/e-name-selector-dialog.c:1097
-#, c-format
-msgid "Error loading address book: %s"
-msgstr "Produciuse un erro ao cargar a axenda de enderezos: %s"
+#: ../modules/trust-prompt/certificate-viewer.c:669
+msgid "Details"
+msgstr "Detalles"
 
-#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:3043
-#, c-format
-msgid "E_xpand %s Inline"
-msgstr "E_xpandir %s en liÃa"
+#: ../modules/trust-prompt/e-asn1-object.c:95
+msgid "Version"
+msgstr "VersiÃn"
+
+#: ../modules/trust-prompt/e-asn1-object.c:110
+msgid "Version 1"
+msgstr "VersiÃn 1"
+
+#: ../modules/trust-prompt/e-asn1-object.c:113
+msgid "Version 2"
+msgstr "VersiÃn 2"
+
+#: ../modules/trust-prompt/e-asn1-object.c:116
+msgid "Version 3"
+msgstr "VersiÃn 3"
+
+#: ../modules/trust-prompt/e-asn1-object.c:192
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3059
-#, c-format
-msgid "Cop_y %s"
-msgstr "Cop_iar %s"
+#: ../modules/trust-prompt/e-asn1-object.c:195
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:3070
-#, c-format
-msgid "C_ut %s"
-msgstr "Co_rtar %s"
+#: ../modules/trust-prompt/e-asn1-object.c:198
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:3088
-#, c-format
-msgid "_Edit %s"
-msgstr "_Editar %s"
+#: ../modules/trust-prompt/e-asn1-object.c:201
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "PKCS #1 SHA-256 con cifrado RSA"
 
-#: ../libedataserverui/e-name-selector-list.c:532
-#, c-format
-msgid "_Delete %s"
-msgstr "E_liminar %s"
+#: ../modules/trust-prompt/e-asn1-object.c:204
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "PKCS #1 SHA-384 con cifrado RSA"
+
+#: ../modules/trust-prompt/e-asn1-object.c:207
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "PKCS #1 SHA-512 con cifrado RSA"
+
+#: ../modules/trust-prompt/e-asn1-object.c:234
+msgid "PKCS #1 RSA Encryption"
+msgstr "PKCS #1 cifrado RSA"
+
+#: ../modules/trust-prompt/e-asn1-object.c:237
+msgid "Certificate Key Usage"
+msgstr "Uso da chave de certificado"
+
+#: ../modules/trust-prompt/e-asn1-object.c:240
+msgid "Netscape Certificate Type"
+msgstr "Tipo de certificado Netscape"
+
+#: ../modules/trust-prompt/e-asn1-object.c:243
+msgid "Certificate Authority Key Identifier"
+msgstr "Identificador da chave da entidade de acreditaciÃn"
+
+#: ../modules/trust-prompt/e-asn1-object.c:255
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr "Identificador do obxecto (%s)"
+
+#: ../modules/trust-prompt/e-asn1-object.c:306
+msgid "Algorithm Identifier"
+msgstr "Identificador do algoritmo"
+
+#: ../modules/trust-prompt/e-asn1-object.c:314
+msgid "Algorithm Parameters"
+msgstr "ParÃmetros do algoritmo"
+
+#: ../modules/trust-prompt/e-asn1-object.c:336
+msgid "Subject Public Key Info"
+msgstr "InformaciÃn da chave pÃblica do titular"
+
+#: ../modules/trust-prompt/e-asn1-object.c:341
+msgid "Subject Public Key Algorithm"
+msgstr "Algoritmo da chave pÃblica do titular"
+
+#: ../modules/trust-prompt/e-asn1-object.c:356
+msgid "Subject's Public Key"
+msgstr "Chave pÃblica do titular"
+
+#: ../modules/trust-prompt/e-asn1-object.c:378
+#: ../modules/trust-prompt/e-asn1-object.c:428
+msgid "Error: Unable to process extension"
+msgstr "Erro: non à posÃbel procesar a extensiÃn"
+
+#: ../modules/trust-prompt/e-asn1-object.c:395
+msgid "Email"
+msgstr "Correo electroÌnico"
+
+#: ../modules/trust-prompt/e-asn1-object.c:399
+#: ../modules/trust-prompt/e-asn1-object.c:411
+msgid "Object Signer"
+msgstr "Asinante do obxecto"
+
+#: ../modules/trust-prompt/e-asn1-object.c:403
+msgid "SSL Certificate Authority"
+msgstr "Entidade de acreditaciÃn SSL"
+
+#: ../modules/trust-prompt/e-asn1-object.c:407
+msgid "Email Certificate Authority"
+msgstr "Entidade de acreditaciÃn SSL"
+
+#: ../modules/trust-prompt/e-asn1-object.c:436
+msgid "Signing"
+msgstr "Sinatura"
+
+#: ../modules/trust-prompt/e-asn1-object.c:440
+msgid "Non-repudiation"
+msgstr "Non rexeitar"
+
+#: ../modules/trust-prompt/e-asn1-object.c:444
+msgid "Key Encipherment"
+msgstr "Cifrado da chave"
+
+#: ../modules/trust-prompt/e-asn1-object.c:448
+msgid "Data Encipherment"
+msgstr "Cifrado de datos"
+
+#: ../modules/trust-prompt/e-asn1-object.c:452
+msgid "Key Agreement"
+msgstr "Acordo de chave"
+
+#: ../modules/trust-prompt/e-asn1-object.c:456
+msgid "Certificate Signer"
+msgstr "Campos do certificado"
+
+#: ../modules/trust-prompt/e-asn1-object.c:460
+msgid "CRL Signer"
+msgstr "Asinante da LRC"
+
+#: ../modules/trust-prompt/e-asn1-object.c:509
+msgid "Critical"
+msgstr "CrÃtico"
+
+#: ../modules/trust-prompt/e-asn1-object.c:511
+#: ../modules/trust-prompt/e-asn1-object.c:514
+msgid "Not Critical"
+msgstr "Non crÃtico"
+
+#: ../modules/trust-prompt/e-asn1-object.c:535
+msgid "Extensions"
+msgstr "ExtensiÃns"
+
+#. Translators: This string is used in Certificate
+#. * details for fields like Issuer or Subject, which
+#. * shows the field name on the left and its respective
+#. * value on the right, both as stored in the
+#. * certificate itself.  You probably do not need to
+#. * change this string, unless changing the order of
+#. * name and value.  As a result example:
+#. * "OU = VeriSign Trust Network"
+#: ../modules/trust-prompt/e-asn1-object.c:615
+#, c-format
+msgid "%s = %s"
+msgstr "%s = %s"
+
+#: ../modules/trust-prompt/e-asn1-object.c:658
+msgid "Certificate"
+msgstr "Certificado"
+
+#: ../modules/trust-prompt/e-asn1-object.c:672
+#: ../modules/trust-prompt/e-asn1-object.c:807
+msgid "Certificate Signature Algorithm"
+msgstr "Algoritmo de sinatura do certificado"
+
+#: ../modules/trust-prompt/e-asn1-object.c:681
+msgid "Issuer"
+msgstr "Emisor"
+
+#: ../modules/trust-prompt/e-asn1-object.c:712
+msgid "Subject"
+msgstr "Asunto"
+
+#: ../modules/trust-prompt/e-asn1-object.c:735
+msgid "Issuer Unique ID"
+msgstr "ID Ãnico do emisor"
+
+#: ../modules/trust-prompt/e-asn1-object.c:754
+msgid "Subject Unique ID"
+msgstr "ID Ãnico do titular"
+
+#: ../modules/trust-prompt/e-asn1-object.c:813
+msgid "Certificate Signature Value"
+msgstr "Algoritmo de sinatura do certificado"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:200
+msgid "The signing certificate authority is not known."
+msgstr "O asinado da autoridade certificadora non se recoÃece"
+
+#: ../modules/trust-prompt/module-trust-prompt.c:202
+msgid ""
+"The certificate does not match the expected identity of the site that it was "
+"retrieved from."
+msgstr ""
+"O certificado non coincide coa identidade agardada do sitio da que se "
+"obtivo."
+
+#: ../modules/trust-prompt/module-trust-prompt.c:204
+msgid "The certificate's activation time is still in the future."
+msgstr "A data de activaciÃn do certificado està aÃnda no futuro."
+
+#: ../modules/trust-prompt/module-trust-prompt.c:206
+msgid "The certificate has expired."
+msgstr "O certificado caducou."
 
-#: ../libedataserverui/e-passwords.c:127
-msgid "Keyring key is unusable: no user or host name"
+#: ../modules/trust-prompt/module-trust-prompt.c:208
+msgid ""
+"The certificate has been revoked according to the connection's certificate "
+"revocation list."
 msgstr ""
-"A chave do anel de chaves non à utilizÃbel: non existe o usuario ou nome do "
-"host"
-
-#: ../libedataserverui/e-passwords.c:460
-#: ../libedataserverui/e-passwords-win32.c:614
-msgid "You have the Caps Lock key on."
-msgstr "A tecla Bloq MaiÃs està activada."
-
-#: ../libedataserverui/e-passwords.c:580
-#: ../libedataserverui/e-passwords-win32.c:737
-msgid "_Remember this passphrase"
-msgstr "_Lembrar esta frase de paso"
-
-#: ../libedataserverui/e-passwords.c:581
-#: ../libedataserverui/e-passwords-win32.c:738
-msgid "_Remember this passphrase for the remainder of this session"
-msgstr "_Lembrar esta frase de paso durante a sesiÃn"
-
-#: ../libedataserverui/e-passwords.c:586
-#: ../libedataserverui/e-passwords-win32.c:743
-msgid "_Remember this password"
-msgstr "_Lembrar este contrasinal"
-
-#: ../libedataserverui/e-passwords.c:587
-#: ../libedataserverui/e-passwords-win32.c:744
-msgid "_Remember this password for the remainder of this session"
-msgstr "_Lembrar este contrasinal durante a sesiÃn"
-
-#: ../libedataserverui/e-source-selector-dialog.c:224
-msgid "_Destination"
-msgstr "_Destino"
-
-#: ../libedataserverui/e-source-selector-dialog.c:326
-msgid "Select destination"
-msgstr "Seelccionar un destino"
+"O certificado foi revogado de acordo ao lista de revogaciÃn do certificado "
+"da conexiÃn."
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:184
-#, c-format
-msgid "Code: %u - Unexpected response from server"
-msgstr "CÃdigo: %u: resposta non agardada do servidor"
+#: ../modules/trust-prompt/module-trust-prompt.c:210
+msgid "The certificate's algorithm is considered insecure."
+msgstr "O algoritmo do certificado considÃrase inseguro."
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:205
-#, c-format
-msgid "Failed to parse autodiscover response XML"
-msgstr "Produciuse un erro ao analizar a resposta XML da autodetecciÃn"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:158
+msgid "Certificate trust..."
+msgstr "Confianza do certificadoâ"
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:214
-#, c-format
-msgid "Failed to find Autodiscover element"
-msgstr "Produciuse un erro ao buscar o elemento ÂAutodiscoverÂ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:159
+msgid "_View Certificate"
+msgstr "_Ver certificado"
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:226
-#, c-format
-msgid "Failed to find Response element"
-msgstr "Produciuse un erro ao buscar o elemento ÂResponseÂ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:160
+msgid "_Reject"
+msgstr "_Rexeitar"
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:238
-#, c-format
-msgid "Failed to find Account element"
-msgstr "Produciuse un erro ao buscar o elemento ÂAccountÂ"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:161
+msgid "Accept _Temporarily"
+msgstr "Aceptar _temporalmente"
 
-#. TODO: more specific
-#: ../modules/gnome-online-accounts/goaewsclient.c:252
+#: ../modules/trust-prompt/trust-prompt-gtk.c:162
+msgid "_Accept Permanently"
+msgstr "_Aceptar permanentemente"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:193
 #, c-format
-msgid "Failed to find ASUrl and OABUrl in autodiscover response"
+msgid ""
+"SSL Certificate for '%s' is not trusted. Do you wish to accept it?\n"
+"\n"
+"Detailed information about the certificate:"
 msgstr ""
-"Produciuse un erro ao buscar ÂASUrl e ÂAOBUrl na resposta da autodetecciÃn"
+"O certificado SSL para Â%s non à de confianza. Desexa aceptalo?\n"
+"\n"
+"InformaciÃn detallada sobre o certificado:"
 
-#: ../modules/google-backend/module-google-backend.c:118
-#: ../modules/yahoo-backend/module-yahoo-backend.c:200
-msgid "Calendar"
-msgstr "Calendario"
+#: ../modules/trust-prompt/trust-prompt-gtk.c:207
+msgid "Issuer:"
+msgstr "Emisor:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:208
+msgid "Subject:"
+msgstr "Asunto:"
 
-#: ../modules/yahoo-backend/module-yahoo-backend.c:215
+#: ../modules/trust-prompt/trust-prompt-gtk.c:209
+msgid "Fingerprint:"
+msgstr "Pegada dixital:"
+
+#: ../modules/trust-prompt/trust-prompt-gtk.c:210
+msgid "Reason:"
+msgstr "RazÃn:"
+
+#: ../modules/yahoo-backend/module-yahoo-backend.c:227
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -5708,22 +5726,295 @@ msgstr "Manter en execuciÃn despois de pechar o Ãltimo cliente"
 msgid "Wait running until at least one client is connected"
 msgstr "Manter en execuciÃn atà que haxa cando menos un cliente conectado"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:620
-msgid "Evolution Source Viewer"
-msgstr "Visor de fontes de Evolution"
+#: ../services/evolution-user-prompter/prompt-user-gtk.c:111
+msgid "_Dismiss"
+msgstr "_Ignorar"
+
+#~ msgid "Failed to build summary for an address book %s"
+#~ msgstr ""
+#~ "Produciuse un erro ao construÃr o resumo para unha libreta de enderezos %s"
+
+#~ msgid "Using Distinguished Name (DN)"
+#~ msgstr "Usar nome distintivo (DN)"
+
+#~ msgid "Using Email Address"
+#~ msgstr "Usando o enderezo de correo electrÃnico"
+
+#~ msgid "Failed to open addressbook at '%s': %s"
+#~ msgstr "Produciuse un erro ao abrir a axenda de enderezos en Â%sÂ: %s"
+
+#~ msgid "Could not create synch slave thread"
+#~ msgstr "Non à posÃbel crear o fluxo escravo de sincronizaciÃn"
+
+#~ msgid "Could not connect to %s: "
+#~ msgstr "Non foi posÃbel realizar a conexiÃn con %s: "
+
+#~ msgid ""
+#~ "   Issuer:       %s\n"
+#~ "   Subject:      %s\n"
+#~ "   Fingerprint:  %s\n"
+#~ "   Signature:    %s"
+#~ msgstr ""
+#~ "   Emisor:            %s\n"
+#~ "   Asunto:            %s\n"
+#~ "   Pegada dixital:    %s\n"
+#~ "   Sinatura:          %s"
+
+#~ msgid "GOOD"
+#~ msgstr "CORRECTO"
+
+#~ msgid "BAD"
+#~ msgstr "INCORRECTO"
+
+#~ msgid ""
+#~ "Certificate problem: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "Problema co certificado: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Bad certificate domain: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "O dominio do certificado à incorrecto: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Certificate expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "O certificado expirou: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid ""
+#~ "Certificate revocation list expired: %s\n"
+#~ "Issuer: %s"
+#~ msgstr ""
+#~ "A lista de revogaciÃn de certificados expirou: %s\n"
+#~ "Emisor: %s"
+
+#~ msgid "No output stream"
+#~ msgstr "Non hai fluxo de saÃda"
+
+#~ msgid "No input stream"
+#~ msgstr "Non hai fluxo de entrada"
+
+#~ msgid "Server unexpectedly disconnected: %s"
+#~ msgstr "O servidor desconectouse inesperadamente: %s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s in folder %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Alerta do servidor IMAP %s %s no cartafol %s:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Alert from IMAP server %s %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Alerta do servidor IMAP %s %s:\n"
+#~ "%s"
+
+#~ msgid "Unexpected response from IMAP server: %s"
+#~ msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#~ msgid "IMAP command failed: %s"
+#~ msgstr "A orde IMAP fallou: %s"
+
+#~ msgid "Server response ended too soon."
+#~ msgstr "A resposta do servidor terminou moi cedo."
+
+#~ msgid "IMAP server response did not contain %s information"
+#~ 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"
+
+#~ msgid "Always check for _new mail in this folder"
+#~ msgstr "Comprobar sempre o correo _novo neste cartafol"
 
-#. Translators: The name that is displayed in the user interface
-#: ../tests/libedataserverui/evolution-source-viewer.c:650
-msgid "Display Name"
-msgstr "Nome en pantalla"
+#~ msgid "Could not create directory %s: %s"
+#~ msgstr "Non foi posÃbel crear o directorio %s: %s"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:659
-msgid "Flags"
-msgstr "Bandeiras"
+#~ msgid "Could not load summary for %s"
+#~ msgstr "Non foi posÃbel cargar o resumo de %s"
 
-#: ../tests/libedataserverui/evolution-source-viewer.c:711
-msgid "Identity"
-msgstr "Identidade"
+#~ msgid "Scanning for changed messages in %s"
+#~ msgstr "Buscando mensaxes modificadas en %s"
+
+#~ msgid "Fetching summary information for new messages in %s"
+#~ msgstr "Recollendo a informaciÃn de resumo para as mensaxes novas en %s"
+
+#~ msgid "Incomplete server response: no information provided for message %d"
+#~ msgstr ""
+#~ "Resposta do servidor incompleta: non se forneceu informaciÃn para a "
+#~ "mensaxe %d"
+
+#~ msgid "Incomplete server response: no UID provided for message %d"
+#~ msgstr ""
+#~ "Resposta do servidor incompleta: non se forneceu UID para a mensaxe %d"
+
+#~ msgid "Could not find message body in FETCH response."
+#~ msgstr "Non foi posÃbel atopar o corpo da mensaxe na resposta FETCH."
+
+#~ msgid "Could not open cache directory: "
+#~ msgstr "Non foi posÃbel abrir o directorio da cachÃ: "
+
+#~ msgid "Failed to cache message %s: %s"
+#~ msgstr "Produciuse un erro ao crear a cachà da mensaxe %s: %s"
+
+#~ msgid "Failed to cache message %s: "
+#~ msgstr "Produciuse un erro ao crear a cachà da mensaxe %s: "
+
+#~ msgid "Failed to cache %s: "
+#~ msgstr "Produciuse un erro ao crear a cachà %s: "
+
+#~ msgid "Names_pace:"
+#~ msgstr "Es_pazo do nome:"
+
+#~ msgid "IMAP default port"
+#~ msgstr "Porto IMAP predeterminado"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Retrieving list of folders at '%s'"
+#~ msgstr "Obtendo a lista de cartafoles para Â%sÂ"
+
+#~ msgid "Server unexpectedly disconnected"
+#~ msgstr "O servidor desconectouse inesperadamente"
+
+#~ msgid "Server unexpectedly disconnected: "
+#~ msgstr "O servidor desconectouse inesperadamente: "
+
+#~ msgid "Could not connect to POP server %s"
+#~ msgstr "Non foi posÃbel conectar co servidor POP %s"
+
+#~ msgid "Currently _used categories:"
+#~ msgstr "CategorÃas en _uso actualmente:"
+
+#~ msgid "_Available Categories:"
+#~ msgstr "_CategorÃas dispoÃÃbeis:"
+
+#~ msgid "Icon"
+#~ msgstr "Icona"
+
+#~ msgid "Category"
+#~ msgstr "CategorÃa"
+
+#~ msgid "Create category \"%s\""
+#~ msgstr "Crear categorÃa Â%sÂ"
+
+#~ msgid "Category Icon"
+#~ msgstr "Icona de categorÃa"
+
+#~ msgid "_No Image"
+#~ msgstr "_Sen imaxe"
+
+#~ msgid "Category _Name"
+#~ msgstr "_Nome de categorÃa"
+
+#~ msgid "Category _Icon"
+#~ msgstr "_Icona de categorÃa"
+
+#~ msgid "Category Properties"
+#~ msgstr "Propiedades de categorÃa"
+
+#~ msgid ""
+#~ "There is already a category '%s' in the configuration. Please use another "
+#~ "name"
+#~ msgstr "Xa existe unha categorÃa Â%s na configuraciÃn. Utilice outro nome"
+
+#~ msgid "Show Contacts"
+#~ msgstr "Mostrar contactos"
+
+#~ msgid "Address B_ook:"
+#~ msgstr "Axenda de _enderezos:"
+
+#~ msgid "Cat_egory:"
+#~ msgstr "Ca_tegorÃa:"
+
+#~ msgid "_Search:"
+#~ msgstr "_Buscar:"
+
+#~ msgid "Any Category"
+#~ msgstr "Calquera categorÃa"
+
+#~ msgid "Co_ntacts"
+#~ msgstr "Co_ntactos"
+
+#~ msgid "Search"
+#~ msgstr "Buscar"
+
+#~ msgid "Address Book"
+#~ msgstr "Axenda de enderezos"
+
+#~ msgid "Select Contacts from Address Book"
+#~ msgstr "Seleccionar contactos da axenda de enderezos"
+
+#~ msgid "_Add"
+#~ msgstr "_Engadir"
+
+#~ msgid "_Remove"
+#~ msgstr "_Retirar"
+
+#~ msgid "Error loading address book: %s"
+#~ msgstr "Produciuse un erro ao cargar a axenda de enderezos: %s"
+
+#~ msgid "E_xpand %s Inline"
+#~ msgstr "E_xpandir %s en liÃa"
+
+#~ msgid "Cop_y %s"
+#~ msgstr "Cop_iar %s"
+
+#~ msgid "C_ut %s"
+#~ msgstr "Co_rtar %s"
+
+#~ msgid "_Edit %s"
+#~ msgstr "_Editar %s"
+
+#~ msgid "_Delete %s"
+#~ msgstr "E_liminar %s"
+
+#~ msgid "Keyring key is unusable: no user or host name"
+#~ msgstr ""
+#~ "A chave do anel de chaves non à utilizÃbel: non existe o usuario ou nome "
+#~ "do host"
+
+#~ msgid "You have the Caps Lock key on."
+#~ msgstr "A tecla Bloq MaiÃs està activada."
+
+#~ msgid "_Remember this passphrase"
+#~ msgstr "_Lembrar esta frase de paso"
+
+#~ msgid "_Remember this passphrase for the remainder of this session"
+#~ msgstr "_Lembrar esta frase de paso durante a sesiÃn"
+
+#~ msgid "_Remember this password"
+#~ msgstr "_Lembrar este contrasinal"
+
+#~ msgid "_Remember this password for the remainder of this session"
+#~ msgstr "_Lembrar este contrasinal durante a sesiÃn"
+
+#~ msgid "_Destination"
+#~ msgstr "_Destino"
+
+#~ msgid "Select destination"
+#~ msgstr "Seelccionar un destino"
+
+#~ msgid "Evolution Source Viewer"
+#~ msgstr "Visor de fontes de Evolution"
+
+#~ msgid "Display Name"
+#~ msgstr "Nome en pantalla"
+
+#~ msgid "Flags"
+#~ msgstr "Bandeiras"
+
+#~ msgid "Identity"
+#~ msgstr "Identidade"
 
 #~ msgid "Cannot remove book: "
 #~ msgstr "Non à posÃbel retirar o caderno: "
@@ -5913,9 +6204,6 @@ msgstr "Identidade"
 #~ msgid "Could not instantiate backend"
 #~ msgstr "Non à posÃbel instanciar o ÂbackendÂ"
 
-#~ msgid "Could not connect to %s: %s"
-#~ msgstr "Non foi posÃbel realizar a conexiÃn con %s: %s"
-
 #~ msgid "SSL unavailable"
 #~ msgstr "SSL non dispoÃÃbel"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]