[evolution-data-server] Updated Galician translations



commit 76de167dc2ce082bde39b051fd6ed0d19c72757a
Author: Francisco Diéguez <fran dieguez mabishu com>
Date:   Sat Apr 17 21:10:05 2010 +0200

    Updated Galician translations

 po/gl.po | 3174 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 1528 insertions(+), 1646 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 44eb4fa..26603a7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -14,22 +14,21 @@
 # Ignacio Casal Quinteiro <nacho resa gmail com>, 2005, 2006.
 # Ignacio Casal Quinteiro <icq svn gnome org>, 2007, 2008.
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n mancomun org>, 2009.
-# Fran Diéguez <fran dieguez glug es>, 2009.
 # Antón Méixome <meixome mancomun org>, 2009.
-# Fran Diéguez <frandieguez ubuntu com>, 2010.
+# Fran Diéguez <frandieguez ubuntu com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-data-server-master-po-gl-71644\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-15 14:56+0100\n"
-"PO-Revision-Date: 2010-02-12 00:39+0100\n"
+"POT-Creation-Date: 2010-04-17 21:09+0200\n"
+"PO-Revision-Date: 2010-04-17 21:09+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez ubuntu com>\n"
-"Language-Team: Gallician <proxecto trasno net>\n"
+"Language-Team: Galician <proxecto trasno net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
@@ -42,13 +41,13 @@ msgstr "Cargando..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4553
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Buscando..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4717
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Descargando os contactos (%d)... "
@@ -60,54 +59,54 @@ msgstr "Descargando os contactos (%d)... "
 msgid "Updating contacts cache (%d)... "
 msgstr "Actualizando a caché de contactos (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:818
 msgid "Using Distinguished Name (DN)"
 msgstr "Utilizando o Nome distintivo (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:821
 msgid "Using Email Address"
 msgstr "Usando o enderezo de correo electrónico"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1098
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando novamente ao servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1740
 msgid "Adding contact to LDAP server..."
 msgstr "Engadindo o contacto ao servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1874
 msgid "Removing contact from LDAP server..."
 msgstr "Eliminando o contacto do servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2311
 msgid "Modifying contact from LDAP server..."
 msgstr "Modificando o contacto do servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4414
 msgid "Receiving LDAP search results..."
 msgstr "Recibindo os resultados da busca no LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4575
 msgid "Error performing search"
 msgstr "Produciuse un erro ao realizar a busca"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/libebook/e-book.c:2152
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: non existía unha orixe para o uid `%s' almacenada no Gconf."
 
 #. Dummy row as EContactField starts from 1
-#: ../addressbook/libebook/e-contact.c:113
+#: ../addressbook/libebook/e-contact.c:115
 msgid "Unique ID"
 msgstr "ID Ã?nico"
 
-#: ../addressbook/libebook/e-contact.c:114
+#: ../addressbook/libebook/e-contact.c:116
 msgid "File Under"
 msgstr "Arquivar como"
 
 #. URI of the book to which the contact belongs to
-#: ../addressbook/libebook/e-contact.c:116
+#: ../addressbook/libebook/e-contact.c:118
 msgid "Book URI"
 msgstr "URI da axenda"
 
@@ -115,520 +114,520 @@ msgstr "URI da axenda"
 #. FN isn't really a structured field - we use a getter/setter
 #. so we can set the N property (since evo 1.4 works fine with
 #. vcards that don't even have a N attribute.  *sigh*)
-#: ../addressbook/libebook/e-contact.c:122
+#: ../addressbook/libebook/e-contact.c:124
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../addressbook/libebook/e-contact.c:123
+#: ../addressbook/libebook/e-contact.c:125
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../addressbook/libebook/e-contact.c:124
+#: ../addressbook/libebook/e-contact.c:126
 msgid "Family Name"
 msgstr "Apelido"
 
-#: ../addressbook/libebook/e-contact.c:125
+#: ../addressbook/libebook/e-contact.c:127
 msgid "Nickname"
 msgstr "Alcume"
 
 #. Email fields
-#: ../addressbook/libebook/e-contact.c:128
+#: ../addressbook/libebook/e-contact.c:130
 msgid "Email 1"
 msgstr "Correo electrónico 1"
 
-#: ../addressbook/libebook/e-contact.c:129
+#: ../addressbook/libebook/e-contact.c:131
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
-#: ../addressbook/libebook/e-contact.c:130
+#: ../addressbook/libebook/e-contact.c:132
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
-#: ../addressbook/libebook/e-contact.c:131
+#: ../addressbook/libebook/e-contact.c:133
 msgid "Email 4"
 msgstr "Correo electrónico 4"
 
-#: ../addressbook/libebook/e-contact.c:133
+#: ../addressbook/libebook/e-contact.c:135
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
 #. Address Labels
-#: ../addressbook/libebook/e-contact.c:136
+#: ../addressbook/libebook/e-contact.c:138
 msgid "Home Address Label"
 msgstr "Etiqueta do enderezo persoal"
 
-#: ../addressbook/libebook/e-contact.c:137
+#: ../addressbook/libebook/e-contact.c:139
 msgid "Work Address Label"
 msgstr "Etiqueta do enderezo do traballo"
 
-#: ../addressbook/libebook/e-contact.c:138
+#: ../addressbook/libebook/e-contact.c:140
 msgid "Other Address Label"
 msgstr "Etiqueta doutro enderezo"
 
 #. Phone fields
-#: ../addressbook/libebook/e-contact.c:141
+#: ../addressbook/libebook/e-contact.c:143
 msgid "Assistant Phone"
 msgstr "Teléfono do axudante"
 
-#: ../addressbook/libebook/e-contact.c:142
+#: ../addressbook/libebook/e-contact.c:144
 msgid "Business Phone"
 msgstr "Teléfono do traballo"
 
-#: ../addressbook/libebook/e-contact.c:143
+#: ../addressbook/libebook/e-contact.c:145
 msgid "Business Phone 2"
 msgstr "Teléfono do traballo 2"
 
-#: ../addressbook/libebook/e-contact.c:144
+#: ../addressbook/libebook/e-contact.c:146
 msgid "Business Fax"
 msgstr "Fax do traballo"
 
-#: ../addressbook/libebook/e-contact.c:145
+#: ../addressbook/libebook/e-contact.c:147
 msgid "Callback Phone"
 msgstr "Teléfono de devolución de chamadas"
 
-#: ../addressbook/libebook/e-contact.c:146
+#: ../addressbook/libebook/e-contact.c:148
 msgid "Car Phone"
 msgstr "Teléfono do automóbil"
 
-#: ../addressbook/libebook/e-contact.c:147
+#: ../addressbook/libebook/e-contact.c:149
 msgid "Company Phone"
 msgstr "Teléfono de empresa"
 
-#: ../addressbook/libebook/e-contact.c:148
+#: ../addressbook/libebook/e-contact.c:150
 msgid "Home Phone"
 msgstr "Teléfono particular"
 
-#: ../addressbook/libebook/e-contact.c:149
+#: ../addressbook/libebook/e-contact.c:151
 msgid "Home Phone 2"
 msgstr "Teléfono particular 2"
 
-#: ../addressbook/libebook/e-contact.c:150
+#: ../addressbook/libebook/e-contact.c:152
 msgid "Home Fax"
 msgstr "Fax particular"
 
-#: ../addressbook/libebook/e-contact.c:151
+#: ../addressbook/libebook/e-contact.c:153
 msgid "ISDN"
 msgstr "RDSI"
 
-#: ../addressbook/libebook/e-contact.c:152
+#: ../addressbook/libebook/e-contact.c:154
 msgid "Mobile Phone"
 msgstr "Teléfono móbil"
 
-#: ../addressbook/libebook/e-contact.c:153
+#: ../addressbook/libebook/e-contact.c:155
 msgid "Other Phone"
 msgstr "Outro teléfono"
 
-#: ../addressbook/libebook/e-contact.c:154
+#: ../addressbook/libebook/e-contact.c:156
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: ../addressbook/libebook/e-contact.c:155
+#: ../addressbook/libebook/e-contact.c:157
 msgid "Pager"
 msgstr "Buscador"
 
-#: ../addressbook/libebook/e-contact.c:156
+#: ../addressbook/libebook/e-contact.c:158
 msgid "Primary Phone"
 msgstr "Teléfono principal"
 
-#: ../addressbook/libebook/e-contact.c:157
+#: ../addressbook/libebook/e-contact.c:159
 msgid "Radio"
 msgstr "Radio"
 
-#: ../addressbook/libebook/e-contact.c:158
+#: ../addressbook/libebook/e-contact.c:160
 msgid "Telex"
 msgstr "Télex"
 
 #. To translators: TTY is Teletypewriter
-#: ../addressbook/libebook/e-contact.c:160
+#: ../addressbook/libebook/e-contact.c:162
 msgid "TTY"
 msgstr "TTY"
 
 #. Organizational fields
-#: ../addressbook/libebook/e-contact.c:163
+#: ../addressbook/libebook/e-contact.c:165
 msgid "Organization"
 msgstr "Organización"
 
-#: ../addressbook/libebook/e-contact.c:164
+#: ../addressbook/libebook/e-contact.c:166
 msgid "Organizational Unit"
 msgstr "Unidade de organización"
 
-#: ../addressbook/libebook/e-contact.c:165
+#: ../addressbook/libebook/e-contact.c:167
 msgid "Office"
 msgstr "Oficina"
 
-#: ../addressbook/libebook/e-contact.c:166
+#: ../addressbook/libebook/e-contact.c:168
 msgid "Title"
 msgstr "Título"
 
-#: ../addressbook/libebook/e-contact.c:167
+#: ../addressbook/libebook/e-contact.c:169
 msgid "Role"
 msgstr "Rol"
 
-#: ../addressbook/libebook/e-contact.c:168
+#: ../addressbook/libebook/e-contact.c:170
 msgid "Manager"
 msgstr "Xestor"
 
-#: ../addressbook/libebook/e-contact.c:169
+#: ../addressbook/libebook/e-contact.c:171
 msgid "Assistant"
 msgstr "Axudante"
 
 #. Web fields
-#: ../addressbook/libebook/e-contact.c:172
+#: ../addressbook/libebook/e-contact.c:174
 msgid "Homepage URL"
 msgstr "URL da páxina inicial"
 
-#: ../addressbook/libebook/e-contact.c:173
+#: ../addressbook/libebook/e-contact.c:175
 msgid "Weblog URL"
 msgstr "URL do blog"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:669
+#: ../addressbook/libebook/e-contact.c:178
+#: ../libedataserverui/e-categories-dialog.c:671
 msgid "Categories"
 msgstr "Categorías"
 
 #. Collaboration fields
-#: ../addressbook/libebook/e-contact.c:179
+#: ../addressbook/libebook/e-contact.c:181
 msgid "Calendar URI"
 msgstr "URI do calendario"
 
-#: ../addressbook/libebook/e-contact.c:180
+#: ../addressbook/libebook/e-contact.c:182
 msgid "Free/Busy URL"
 msgstr "URL de dispoñibilidade"
 
-#: ../addressbook/libebook/e-contact.c:181
+#: ../addressbook/libebook/e-contact.c:183
 msgid "ICS Calendar"
 msgstr "Calendario ICS"
 
-#: ../addressbook/libebook/e-contact.c:182
+#: ../addressbook/libebook/e-contact.c:184
 msgid "Video Conferencing URL"
 msgstr "URL de videoconferencia"
 
 #. Misc fields
-#: ../addressbook/libebook/e-contact.c:185
+#: ../addressbook/libebook/e-contact.c:187
 msgid "Spouse's Name"
 msgstr "Nome da cónxuxe"
 
-#: ../addressbook/libebook/e-contact.c:186
+#: ../addressbook/libebook/e-contact.c:188
 msgid "Note"
 msgstr "Nota"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:189
+#: ../addressbook/libebook/e-contact.c:191
 msgid "AIM Home Screen Name 1"
 msgstr "Nome de pantalla persoal AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:190
+#: ../addressbook/libebook/e-contact.c:192
 msgid "AIM Home Screen Name 2"
 msgstr "Nome de pantalla persoal AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:191
+#: ../addressbook/libebook/e-contact.c:193
 msgid "AIM Home Screen Name 3"
 msgstr "Nome de pantalla persoal AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:192
+#: ../addressbook/libebook/e-contact.c:194
 msgid "AIM Work Screen Name 1"
 msgstr "Nome de pantalla profesional AIM 1"
 
-#: ../addressbook/libebook/e-contact.c:193
+#: ../addressbook/libebook/e-contact.c:195
 msgid "AIM Work Screen Name 2"
 msgstr "Nome de pantalla profesional AIM 2"
 
-#: ../addressbook/libebook/e-contact.c:194
+#: ../addressbook/libebook/e-contact.c:196
 msgid "AIM Work Screen Name 3"
 msgstr "Nome de pantalla profesional AIM 3"
 
-#: ../addressbook/libebook/e-contact.c:195
+#: ../addressbook/libebook/e-contact.c:197
 msgid "GroupWise Home Screen Name 1"
 msgstr "Nome de pantalla persoal GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:196
+#: ../addressbook/libebook/e-contact.c:198
 msgid "GroupWise Home Screen Name 2"
 msgstr "Nome de pantalla persoal GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:197
+#: ../addressbook/libebook/e-contact.c:199
 msgid "GroupWise Home Screen Name 3"
 msgstr "Nome de pantalla persoal GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:198
+#: ../addressbook/libebook/e-contact.c:200
 msgid "GroupWise Work Screen Name 1"
 msgstr "Nome de pantalla profesional GroupWise 1"
 
-#: ../addressbook/libebook/e-contact.c:199
+#: ../addressbook/libebook/e-contact.c:201
 msgid "GroupWise Work Screen Name 2"
 msgstr "Nome de pantalla profesional GroupWise 2"
 
-#: ../addressbook/libebook/e-contact.c:200
+#: ../addressbook/libebook/e-contact.c:202
 msgid "GroupWise Work Screen Name 3"
 msgstr "Nome de pantalla profesional GroupWise 3"
 
-#: ../addressbook/libebook/e-contact.c:201
+#: ../addressbook/libebook/e-contact.c:203
 msgid "Jabber Home Id 1"
 msgstr "Id Jabber persoal 1"
 
-#: ../addressbook/libebook/e-contact.c:202
+#: ../addressbook/libebook/e-contact.c:204
 msgid "Jabber Home Id 2"
 msgstr "Id Jabber persoal 2"
 
-#: ../addressbook/libebook/e-contact.c:203
+#: ../addressbook/libebook/e-contact.c:205
 msgid "Jabber Home Id 3"
 msgstr "Id Jabber persoal 3"
 
-#: ../addressbook/libebook/e-contact.c:204
+#: ../addressbook/libebook/e-contact.c:206
 msgid "Jabber Work Id 1"
 msgstr "Id Jabber profesional 1"
 
-#: ../addressbook/libebook/e-contact.c:205
+#: ../addressbook/libebook/e-contact.c:207
 msgid "Jabber Work Id 2"
 msgstr "Id Jabber profesional 2"
 
-#: ../addressbook/libebook/e-contact.c:206
+#: ../addressbook/libebook/e-contact.c:208
 msgid "Jabber Work Id 3"
 msgstr "Id Jabber profesional 3"
 
-#: ../addressbook/libebook/e-contact.c:207
+#: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
 msgstr "Nome de pantalla persoal Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:208
+#: ../addressbook/libebook/e-contact.c:210
 msgid "Yahoo! Home Screen Name 2"
 msgstr "Nome de pantalla persoal Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:209
+#: ../addressbook/libebook/e-contact.c:211
 msgid "Yahoo! Home Screen Name 3"
 msgstr "Nome de pantalla persoal Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:210
+#: ../addressbook/libebook/e-contact.c:212
 msgid "Yahoo! Work Screen Name 1"
 msgstr "Nome de pantalla profesional Yahoo! 1"
 
-#: ../addressbook/libebook/e-contact.c:211
+#: ../addressbook/libebook/e-contact.c:213
 msgid "Yahoo! Work Screen Name 2"
 msgstr "Nome de pantalla profesional Yahoo! 2"
 
-#: ../addressbook/libebook/e-contact.c:212
+#: ../addressbook/libebook/e-contact.c:214
 msgid "Yahoo! Work Screen Name 3"
 msgstr "Nome de pantalla profesional Yahoo! 3"
 
-#: ../addressbook/libebook/e-contact.c:213
+#: ../addressbook/libebook/e-contact.c:215
 msgid "MSN Home Screen Name 1"
 msgstr "Nome de pantalla persoal MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:214
+#: ../addressbook/libebook/e-contact.c:216
 msgid "MSN Home Screen Name 2"
 msgstr "Nome de pantalla persoal MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:215
+#: ../addressbook/libebook/e-contact.c:217
 msgid "MSN Home Screen Name 3"
 msgstr "Nome de pantalla persoal MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:216
+#: ../addressbook/libebook/e-contact.c:218
 msgid "MSN Work Screen Name 1"
 msgstr "Nome de pantalla profesional MSN 1"
 
-#: ../addressbook/libebook/e-contact.c:217
+#: ../addressbook/libebook/e-contact.c:219
 msgid "MSN Work Screen Name 2"
 msgstr "Nome de pantalla profesional MSN 2"
 
-#: ../addressbook/libebook/e-contact.c:218
+#: ../addressbook/libebook/e-contact.c:220
 msgid "MSN Work Screen Name 3"
 msgstr "Nome de pantalla profesional MSN 3"
 
-#: ../addressbook/libebook/e-contact.c:219
+#: ../addressbook/libebook/e-contact.c:221
 msgid "ICQ Home Id 1"
 msgstr "Id ICQ Persoal 1"
 
-#: ../addressbook/libebook/e-contact.c:220
+#: ../addressbook/libebook/e-contact.c:222
 msgid "ICQ Home Id 2"
 msgstr "Id ICQ Persoal 2"
 
-#: ../addressbook/libebook/e-contact.c:221
+#: ../addressbook/libebook/e-contact.c:223
 msgid "ICQ Home Id 3"
 msgstr "Id ICQ Persoal 3"
 
-#: ../addressbook/libebook/e-contact.c:222
+#: ../addressbook/libebook/e-contact.c:224
 msgid "ICQ Work Id 1"
 msgstr "Id ICQ Profesional 1"
 
-#: ../addressbook/libebook/e-contact.c:223
+#: ../addressbook/libebook/e-contact.c:225
 msgid "ICQ Work Id 2"
 msgstr "Id ICQ Profesional 2"
 
-#: ../addressbook/libebook/e-contact.c:224
+#: ../addressbook/libebook/e-contact.c:226
 msgid "ICQ Work Id 3"
 msgstr "Id ICQ Profesional 3"
 
 #. Last modified time
-#: ../addressbook/libebook/e-contact.c:227
+#: ../addressbook/libebook/e-contact.c:229
 msgid "Last Revision"
 msgstr "�ltima revisión"
 
-#: ../addressbook/libebook/e-contact.c:228
+#: ../addressbook/libebook/e-contact.c:230
 msgid "Name or Org"
 msgstr "Nome ou Org"
 
 #. Address fields
-#: ../addressbook/libebook/e-contact.c:231
+#: ../addressbook/libebook/e-contact.c:233
 msgid "Address List"
 msgstr "Lista de enderezos"
 
-#: ../addressbook/libebook/e-contact.c:232
+#: ../addressbook/libebook/e-contact.c:234
 msgid "Home Address"
 msgstr "Enderezo de casa"
 
-#: ../addressbook/libebook/e-contact.c:233
+#: ../addressbook/libebook/e-contact.c:235
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../addressbook/libebook/e-contact.c:234
+#: ../addressbook/libebook/e-contact.c:236
 msgid "Other Address"
 msgstr "Outro enderezo"
 
 #. Contact categories
-#: ../addressbook/libebook/e-contact.c:237
+#: ../addressbook/libebook/e-contact.c:239
 msgid "Category List"
 msgstr "Lista de categorías"
 
 #. Photo/Logo
-#: ../addressbook/libebook/e-contact.c:240
+#: ../addressbook/libebook/e-contact.c:242
 msgid "Photo"
 msgstr "Foto"
 
-#: ../addressbook/libebook/e-contact.c:241
+#: ../addressbook/libebook/e-contact.c:243
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../addressbook/libebook/e-contact.c:243
+#: ../addressbook/libebook/e-contact.c:245
 msgid "Name"
 msgstr "Nome"
 
-#: ../addressbook/libebook/e-contact.c:244
+#: ../addressbook/libebook/e-contact.c:246
 msgid "Email List"
 msgstr "Lista de correo electrónico"
 
 #. Instant messaging fields
-#: ../addressbook/libebook/e-contact.c:247
+#: ../addressbook/libebook/e-contact.c:249
 msgid "AIM Screen Name List"
 msgstr "Lista de nomes de pantalla AIM"
 
-#: ../addressbook/libebook/e-contact.c:248
+#: ../addressbook/libebook/e-contact.c:250
 msgid "GroupWise Id List"
 msgstr "Lista de Id GroupWise"
 
-#: ../addressbook/libebook/e-contact.c:249
+#: ../addressbook/libebook/e-contact.c:251
 msgid "Jabber Id List"
 msgstr "Lista de Id Jabber"
 
-#: ../addressbook/libebook/e-contact.c:250
+#: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
 msgstr "Lista de nomes de pantalla Yahoo!"
 
-#: ../addressbook/libebook/e-contact.c:251
+#: ../addressbook/libebook/e-contact.c:253
 msgid "MSN Screen Name List"
 msgstr "Lista de nomes de pantalla MSN"
 
-#: ../addressbook/libebook/e-contact.c:252
+#: ../addressbook/libebook/e-contact.c:254
 msgid "ICQ Id List"
 msgstr "Lista de Id ICQ"
 
-#: ../addressbook/libebook/e-contact.c:254
+#: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
 msgstr "Quere o correo en HTML"
 
-#: ../addressbook/libebook/e-contact.c:256
+#: ../addressbook/libebook/e-contact.c:258
 msgid "List"
 msgstr "Lista"
 
-#: ../addressbook/libebook/e-contact.c:257
+#: ../addressbook/libebook/e-contact.c:259
 msgid "List Show Addresses"
 msgstr "Lista de presentación de enderezos"
 
-#: ../addressbook/libebook/e-contact.c:259
+#: ../addressbook/libebook/e-contact.c:261
 msgid "Birth Date"
 msgstr "Data de nacemento"
 
-#: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
+#: ../addressbook/libebook/e-contact.c:262
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Security fields
-#: ../addressbook/libebook/e-contact.c:263
+#: ../addressbook/libebook/e-contact.c:265
 msgid "X.509 Certificate"
 msgstr "Certificado X.509"
 
-#: ../addressbook/libebook/e-contact.c:265
+#: ../addressbook/libebook/e-contact.c:267
 msgid "Gadu-Gadu Home Id 1"
 msgstr "Id Gadu-Gadu persoal 1"
 
-#: ../addressbook/libebook/e-contact.c:266
+#: ../addressbook/libebook/e-contact.c:268
 msgid "Gadu-Gadu Home Id 2"
 msgstr "Id Gadu-Gadu persoal 2"
 
-#: ../addressbook/libebook/e-contact.c:267
+#: ../addressbook/libebook/e-contact.c:269
 msgid "Gadu-Gadu Home Id 3"
 msgstr "Id Gadu-Gadu persoal 3"
 
-#: ../addressbook/libebook/e-contact.c:268
+#: ../addressbook/libebook/e-contact.c:270
 msgid "Gadu-Gadu Work Id 1"
 msgstr "Id Gadu-Gadu profesional 1"
 
-#: ../addressbook/libebook/e-contact.c:269
+#: ../addressbook/libebook/e-contact.c:271
 msgid "Gadu-Gadu Work Id 2"
 msgstr "Id Gadu-Gadu profesional 2"
 
-#: ../addressbook/libebook/e-contact.c:270
+#: ../addressbook/libebook/e-contact.c:272
 msgid "Gadu-Gadu Work Id 3"
 msgstr "Id Gadu-Gadu profesional 3"
 
-#: ../addressbook/libebook/e-contact.c:271
+#: ../addressbook/libebook/e-contact.c:273
 msgid "Gadu-Gadu Id List"
 msgstr "Lista de Id de Gadu-Gadu"
 
 #. Geo information
-#: ../addressbook/libebook/e-contact.c:274
+#: ../addressbook/libebook/e-contact.c:276
 msgid "Geographic Information"
 msgstr "Información xeográfica"
 
-#: ../addressbook/libebook/e-contact.c:276
+#: ../addressbook/libebook/e-contact.c:278
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../addressbook/libebook/e-contact.c:278
+#: ../addressbook/libebook/e-contact.c:280
 msgid "Skype Home Name 1"
 msgstr "Nome persoal en Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:279
+#: ../addressbook/libebook/e-contact.c:281
 msgid "Skype Home Name 2"
 msgstr "Nome persoal en Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:280
+#: ../addressbook/libebook/e-contact.c:282
 msgid "Skype Home Name 3"
 msgstr "Nome persoal en Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:281
+#: ../addressbook/libebook/e-contact.c:283
 msgid "Skype Work Name 1"
 msgstr "Nome do traballo en Skype 1"
 
-#: ../addressbook/libebook/e-contact.c:282
+#: ../addressbook/libebook/e-contact.c:284
 msgid "Skype Work Name 2"
 msgstr "Nome do traballo en Skype 2"
 
-#: ../addressbook/libebook/e-contact.c:283
+#: ../addressbook/libebook/e-contact.c:285
 msgid "Skype Work Name 3"
 msgstr "Nome do traballo en Skype 3"
 
-#: ../addressbook/libebook/e-contact.c:284
+#: ../addressbook/libebook/e-contact.c:286
 msgid "Skype Name List"
 msgstr "Lista de nomes do Skype"
 
-#: ../addressbook/libebook/e-contact.c:286
+#: ../addressbook/libebook/e-contact.c:288
 msgid "SIP address"
 msgstr "Enderezo SIP"
 
-#: ../addressbook/libebook/e-contact.c:1535
-#: ../addressbook/libebook/e-destination.c:761
+#: ../addressbook/libebook/e-contact.c:1515
+#: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Lista sen nome"
 
@@ -681,7 +680,7 @@ msgid "Cannot remove contacts"
 msgstr "Non é posíbel eliminar o contacto"
 
 #: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Invalid query"
 msgstr "A consulta non é correcta"
 
@@ -693,27 +692,27 @@ msgstr "Non é posíbel obter os cambios"
 msgid "Cannot complete operation"
 msgstr "Non é posíbel completar a operación"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
 #, c-format
 msgid "Birthday: %s"
 msgstr "Aniversario: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Datas especiais: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:234
+#: ../calendar/backends/file/e-cal-backend-file.c:236
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Non foi posíbel gardar os datos do calendario: o URI está mal formado."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:241
-#: ../calendar/backends/file/e-cal-backend-file.c:247
+#: ../calendar/backends/file/e-cal-backend-file.c:243
+#: ../calendar/backends/file/e-cal-backend-file.c:249
 msgid "Cannot save calendar data"
 msgstr "Non é posíbel gardar os datos do calendario"
 
@@ -722,114 +721,114 @@ msgid "Could not create thread for getting deltas"
 msgstr "Non foi posíbel crear un fío de execución para obter deltas"
 
 #: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1142
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
-#: ../calendar/backends/http/e-cal-backend-http.c:676
-#: ../calendar/backends/weather/e-cal-backend-weather.c:490
+#: ../calendar/backends/google/e-cal-backend-google.c:1144
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1088
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1386
+#: ../calendar/backends/http/e-cal-backend-http.c:678
+#: ../calendar/backends/weather/e-cal-backend-weather.c:492
 msgid "Could not create cache file"
 msgstr "Non foi posíbel crear o ficheiro da caché"
 
 #: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1101
 msgid "Could not create thread for populating cache"
 msgstr "Non foi posíbel crear o fío de execución para encher a caché"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2122
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2136
 msgid "Reply Requested: by "
 msgstr "Resposta requirida: por "
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2127
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2141
 msgid "Reply Requested: When convenient"
 msgstr "Resposta requirida: cando sexa oportuno"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:293
 #, c-format
 msgid "Loading %s items"
 msgstr "Cargando %s os elementos"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:927
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:985
 msgid "Invalid server URI"
 msgstr "O URI do servidor non é correcto"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:4016
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1335
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1371
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1013
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1106
+#: ../calendar/libecal/e-cal.c:4019
+#: ../calendar/libedata-cal/e-cal-backend-util.c:119
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1378
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1393
+#: ../camel/providers/groupwise/camel-groupwise-store.c:587
+#: ../camel/providers/groupwise/camel-groupwise-store.c:762
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:145
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:172
 msgid "Authentication failed"
 msgstr "A autenticación fallou"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:333
+#: ../calendar/backends/http/e-cal-backend-http.c:335
 msgid "Redirected to Invalid URI"
 msgstr "Redireccionado a un URI que non é correcto"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:356
+#: ../calendar/backends/http/e-cal-backend-http.c:358
 msgid "Bad file format."
 msgstr "O formato de ficheiro non é correcto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:363
+#: ../calendar/backends/http/e-cal-backend-http.c:365
 msgid "Not a calendar."
 msgstr "Non é un calendario."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:150
+#: ../calendar/backends/weather/e-cal-backend-weather.c:152
 msgid "Could not retrieve weather data"
 msgstr "Non foi posíbel obter os datos meteorolóxicos"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:249
+#: ../calendar/backends/weather/e-cal-backend-weather.c:251
 msgid "Weather: Fog"
 msgstr "Tempo: néboa"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:250
+#: ../calendar/backends/weather/e-cal-backend-weather.c:252
 msgid "Weather: Cloudy Night"
 msgstr "Tempo: noite anubrada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:253
 msgid "Weather: Cloudy"
 msgstr "Tempo: anubrado"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:254
 msgid "Weather: Overcast"
 msgstr "Tempo: moi anubrado"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:255
 msgid "Weather: Showers"
 msgstr "Tempo: chuvias fortes"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:256
 msgid "Weather: Snow"
 msgstr "Tempo: neve"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:257
 msgid "Weather: Clear Night"
 msgstr "Tempo: noite despexada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:258
 msgid "Weather: Sunny"
 msgstr "Tempo: sol"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:259
 msgid "Weather: Thunderstorms"
 msgstr "Tempo: treboada"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:403
+#: ../calendar/backends/weather/e-cal-backend-weather.c:405
 msgid "Forecast"
 msgstr "Prognóstico"
 
-#: ../calendar/libecal/e-cal-component.c:1316
+#: ../calendar/libecal/e-cal-component.c:1286
 msgid "Untitled appointment"
 msgstr "Cita sen título"
 
@@ -974,7 +973,7 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: ../calendar/libecal/e-cal.c:1169 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1172 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
@@ -983,183 +982,177 @@ msgstr "Introduza o contrasinal para %s (usuario %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1183
+#: ../calendar/libecal/e-cal.c:1186
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Introduza o contrasinal de %s para activar o proxy para o usuario %s"
 
-#: ../calendar/libecal/e-cal.c:3988
+#: ../calendar/libecal/e-cal.c:3991
 msgid "Invalid argument"
 msgstr "O argumento non é correcto"
 
-#: ../calendar/libecal/e-cal.c:3990
+#: ../calendar/libecal/e-cal.c:3993
 msgid "Backend is busy"
 msgstr "O motor da infraestrutura está ocupado"
 
-#: ../calendar/libecal/e-cal.c:3992
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:3995
+#: ../calendar/libedata-cal/e-cal-backend-util.c:107
 msgid "Repository is offline"
 msgstr "O repositorio está desconectado"
 
-#: ../calendar/libecal/e-cal.c:3994
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:3997
+#: ../calendar/libedata-cal/e-cal-backend-util.c:131
 msgid "No such calendar"
 msgstr "Non existe dito calendario"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
-#: ../servers/groupwise/e-gw-connection.c:233
+#: ../calendar/libecal/e-cal.c:3999
+#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "O obxecto non se encontrou"
 
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
-#: ../servers/groupwise/e-gw-connection.c:227
+#: ../calendar/libecal/e-cal.c:4001
+#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "O obxecto non é correcto"
 
-#: ../calendar/libecal/e-cal.c:4000
+#: ../calendar/libecal/e-cal.c:4003
 msgid "URI not loaded"
 msgstr "O URI non se cargou"
 
-#: ../calendar/libecal/e-cal.c:4002
+#: ../calendar/libecal/e-cal.c:4005
 msgid "URI already loaded"
 msgstr "O URI xa se cargou"
 
-#: ../calendar/libecal/e-cal.c:4004
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
+#: ../calendar/libecal/e-cal.c:4007
+#: ../calendar/libedata-cal/e-cal-backend-util.c:109
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../calendar/libecal/e-cal.c:4006
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:235
+#: ../calendar/libecal/e-cal.c:4009
+#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Usuario descoñecido"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4011
+#: ../calendar/libedata-cal/e-cal-backend-util.c:117
 msgid "Object ID already exists"
 msgstr "O ID do obxecto xa existe"
 
-#: ../calendar/libecal/e-cal.c:4010
+#: ../calendar/libecal/e-cal.c:4013
 msgid "Protocol not supported"
 msgstr "O protocolo non é compatíbel"
 
-#: ../calendar/libecal/e-cal.c:4012
+#: ../calendar/libecal/e-cal.c:4015
 msgid "Operation has been canceled"
 msgstr "A operación cancelouse"
 
-#: ../calendar/libecal/e-cal.c:4014
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4017
+#: ../calendar/libedata-cal/e-cal-backend-util.c:145
 msgid "Could not cancel operation"
 msgstr "Non foi posíbel cancelar a operación"
 
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4021
+#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Authentication required"
 msgstr "Autenticación requirida"
 
-#: ../calendar/libecal/e-cal.c:4020
+#: ../calendar/libecal/e-cal.c:4023
 msgid "A CORBA exception has occurred"
 msgstr "Produciuse unha excepción CORBA"
 
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
-#: ../servers/groupwise/e-gw-connection.c:241
+#: ../calendar/libecal/e-cal.c:4025
+#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../camel/camel-net-utils.c:534
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
+#: ../camel/providers/imap/camel-imap-command.c:428
+#: ../camel/providers/imap/camel-imap-store.c:729
+#: ../camel/providers/pop3/camel-pop3-store.c:574
+#: ../servers/groupwise/e-gw-connection.c:243
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../calendar/libecal/e-cal.c:4024
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4027
+#: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "No error"
 msgstr "Sen erros"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:67
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:674
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:693
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:802
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:830
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1023
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1050
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:69
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:676
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:695
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:804
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:832
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1025
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1052
 #, c-format
 msgid "\"%s\" expects no arguments"
 msgstr "\"%s\" non espera argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:100
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:210
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:252
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:288
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1088
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:102
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:212
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:254
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:290
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1090
 #, c-format
 msgid "\"%s\" expects one argument"
 msgstr "\"%s\" espera un argumento"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:106
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:113
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:294
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:735
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:108
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:115
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:296
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:737
 #, c-format
 msgid "\"%s\" expects the first argument to be a string"
 msgstr "\"%s\" espera que o primeiro argumento sexa unha cadea"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:121
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:123
 #, c-format
 msgid "\"%s\" expects the first argument to be an ISO 8601 date/time string"
 msgstr ""
 "\"%s\" espera que o primeiro argumento sexa unha cadea de data e hora ISO "
 "8601"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:160
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:361
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:413
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:729
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:862
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:162
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:363
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:415
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:731
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:864
 #, c-format
 msgid "\"%s\" expects two arguments"
 msgstr "\"%s\" espera 2 argumentos"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:166
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:216
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:258
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:367
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:419
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:868
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1094
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:168
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:218
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:260
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:369
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:421
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:870
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:1096
 #, c-format
 msgid "\"%s\" expects the first argument to be a time_t"
 msgstr "\"%s\" espera que o primeiro argumento sexa un time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:174
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:176
 #, c-format
 msgid "\"%s\" expects the second argument to be an integer"
 msgstr "\"%s\" espera que o segundo argumento sexa un enteiro"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:375
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:428
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:876
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:377
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:430
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:878
 #, c-format
 msgid "\"%s\" expects the second argument to be a time_t"
 msgstr "\"%s\" espera que o segundo argumento sexa un time_t"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:743
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:745
 #, c-format
 msgid "\"%s\" expects the second argument to be a string"
 msgstr "\"%s\" espera que o segundo argumento sexa unha cadea"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:775
 #, c-format
 msgid ""
 "\"%s\" expects the first argument to be either \"any\", \"summary\", or "
@@ -1170,12 +1163,12 @@ msgstr ""
 "\"description\", ou \"location\", ou \"attendee\", ou \"organizer\", ou "
 "\"classification\""
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:927
 #, c-format
 msgid "\"%s\" expects at least one argument"
 msgstr "\"%s\" espera polo menos un argumento"
 
-#: ../calendar/libedata-cal/e-cal-backend-sexp.c:939
+#: ../calendar/libedata-cal/e-cal-backend-sexp.c:941
 #, c-format
 msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
@@ -1184,158 +1177,158 @@ msgstr ""
 "\"%s\" espera que todos os argumentos sexan cadeas ou que un, e só un "
 "argumento, sexa un falso booleano (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-cal-backend-util.c:111
 msgid "Invalid range"
 msgstr "O intervalo non é correcto"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
+#: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported field"
 msgstr "O campo non é compatíbel"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported method"
 msgstr "O método non é compatíbel"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
+#: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "Unsupported authentication method"
 msgstr "O método de autenticación non é compatíbel"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
+#: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "TLS not available"
 msgstr "O TLS non está dispoñíbel"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
+#: ../calendar/libedata-cal/e-cal-backend-util.c:135
 msgid "Offline mode unavailable"
 msgstr "O modo sen conexión non está dispoñíbel"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
+#: ../calendar/libedata-cal/e-cal-backend-util.c:137
 msgid "Search size limit exceeded"
 msgstr "Excedeuse o límite do tamaño de busca"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
 msgid "Search time limit exceeded"
 msgstr "Excedeuse o tempo límite de busca"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
+#: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Query refused"
 msgstr "Rexeitouse a consulta"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
+#: ../calendar/libedata-cal/e-cal-backend-util.c:150
 msgid "Invalid server version"
 msgstr "A versión do servidor non é correcta"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#: ../calendar/libedata-cal/e-data-cal.c:501
 #, c-format
 msgid "Cannot retrieve calendar address"
 msgstr "Non é posíbel obter o enderezo do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#: ../calendar/libedata-cal/e-data-cal.c:519
 #, c-format
 msgid "Cannot retrieve calendar alarm e-mail address"
 msgstr ""
 "Non é posíbel obter o enderezo de correo electrónico da alarma do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#: ../calendar/libedata-cal/e-data-cal.c:537
 #, c-format
 msgid "Cannot retrieve calendar's ldap attribute"
 msgstr "Non é posíbel obter o atributo de ldap do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#: ../calendar/libedata-cal/e-data-cal.c:555
 #, c-format
 msgid "Cannot retrieve calendar scheduling information"
 msgstr "Non é posíbel recuperar a información da axenda do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#: ../calendar/libedata-cal/e-data-cal.c:572
 #, c-format
 msgid "Cannot open calendar"
 msgstr "Non é posíbel abrir o calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#: ../calendar/libedata-cal/e-data-cal.c:591
 #, c-format
 msgid "Cannot refresh calendar"
 msgstr "Non é posíbel actualizar o calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
 msgid "Cannot remove calendar"
 msgstr "Non é posíbel eliminar o calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#: ../calendar/libedata-cal/e-data-cal.c:627
 #, c-format
 msgid "Cannot create calendar object"
 msgstr "Non é posíbel crear o obxecto de calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#: ../calendar/libedata-cal/e-data-cal.c:649
 #, c-format
 msgid "Cannot modify calendar object"
 msgstr "Non é posíbel modificar o obxecto do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#: ../calendar/libedata-cal/e-data-cal.c:673
 #, c-format
 msgid "Cannot remove calendar object"
 msgstr "Non é posíbel eliminar o obxecto do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#: ../calendar/libedata-cal/e-data-cal.c:692
 #, c-format
 msgid "Cannot receive calendar objects"
 msgstr "Non é posíbel recibir os obxectos do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#: ../calendar/libedata-cal/e-data-cal.c:709
 #, c-format
 msgid "Cannot discard calendar alarm"
 msgstr "Non é posíbel rexeitar a alarma do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
 msgid "Cannot send calendar objects"
 msgstr "Non é posíbel enviar os obxectos do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#: ../calendar/libedata-cal/e-data-cal.c:763
 #, c-format
 msgid "Cannot retrieve default calendar object path"
 msgstr "Non é posíbel obter o camiño ao obxecto do calendario predefinido"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#: ../calendar/libedata-cal/e-data-cal.c:781
 #, c-format
 msgid "Cannot retrieve calendar object path"
 msgstr "Non é posíbel obter o camiño do obxecto do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#: ../calendar/libedata-cal/e-data-cal.c:799
 #, c-format
 msgid "Cannot retrieve calendar object list"
 msgstr "Non é posíbel obter a lista de obxectos de calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#: ../calendar/libedata-cal/e-data-cal.c:837
 #, c-format
 msgid "Could not retrieve attachment list"
 msgstr "Non é posíbel obter a lista de anexos"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#: ../calendar/libedata-cal/e-data-cal.c:859
 #, c-format
 msgid "Could not complete calendar query"
 msgstr "Non é posíbel completar a consulta de calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#: ../calendar/libedata-cal/e-data-cal.c:877
 #, c-format
 msgid "Could not retrieve calendar time zone"
 msgstr "Non é posíbel obter a zona horaria do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#: ../calendar/libedata-cal/e-data-cal.c:895
 #, c-format
 msgid "Could not add calendar time zone"
 msgstr "Non é posíbel engadir a zona horaria do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#: ../calendar/libedata-cal/e-data-cal.c:912
 #, c-format
 msgid "Could not set default calendar time zone"
 msgstr "Non é posíbel estabelecer a zona horaria do calendario predefinido"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#: ../calendar/libedata-cal/e-data-cal.c:933
 #, c-format
 msgid "Cannot retrieve calendar changes"
 msgstr "Non é posíbel obter os cambios do calendario"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#: ../calendar/libedata-cal/e-data-cal.c:983
 #, c-format
 msgid "Cannot retrieve calendar free/busy list"
 msgstr "Non é posíbel obter a lista de días libres/ocupados do calendario"
@@ -1355,60 +1348,60 @@ msgstr "Non hai ningún motor de factoría de backend para '%s' de '%s'"
 msgid "Could not instantiate backend"
 msgstr "Non é posíbel instanciar o motor de infraestrutura"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:65
 msgid "Signing is not supported by this cipher"
 msgstr "Este tipo de cifrado non é compatíbel coa sinaturas"
 
-#: ../camel/camel-cipher-context.c:128
+#: ../camel/camel-cipher-context.c:100
 msgid "Signing message"
 msgstr "Asinando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:120
 msgid "Verifying is not supported by this cipher"
 msgstr "Este tipo de cifrado non é compatíbel coa verificación"
 
-#: ../camel/camel-cipher-context.c:171
+#: ../camel/camel-cipher-context.c:153
 msgid "Verifying message"
 msgstr "Verificando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:176
 msgid "Encryption is not supported by this cipher"
 msgstr "O proceso de cifrado non é compatíbel con este algoritmo de cifrado"
 
-#: ../camel/camel-cipher-context.c:215
+#: ../camel/camel-cipher-context.c:211
 msgid "Encrypting message"
 msgstr "Cifrando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:233
 msgid "Decryption is not supported by this cipher"
 msgstr "O proceso de descifrado non é compatíbel con este algoritmo"
 
-#: ../camel/camel-cipher-context.c:254
+#: ../camel/camel-cipher-context.c:263
 msgid "Decrypting message"
 msgstr "Descifrando a mensaxe"
 
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:283
 msgid "You may not import keys with this cipher"
 msgstr "Non pode importar chaves con este tipo de cifrado"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:323
 msgid "You may not export keys with this cipher"
 msgstr "Non pode exportar chaves con este tipo de cifrado"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-data-cache.c:137
 msgid "Unable to create cache path"
 msgstr "Non é posíbel crear o camiño á caché"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:427
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Non foi posíbel eliminar a entrada da caché: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-db.c:458
 msgid "Insufficient memory"
 msgstr "Memoria insuficiente"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:196
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1420,7 +1413,7 @@ msgstr ""
 "se conecte de novo á rede."
 
 #: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:313
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1431,122 +1424,125 @@ msgstr ""
 " %s\n"
 "Os cambios feitos a este cartafol non se sincronizarán de novo."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:300
 msgid "Resynchronizing with server"
 msgstr "Sincronizando de novo co servidor"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
+#: ../camel/camel-disco-folder.c:39 ../camel/camel-offline-folder.c:39
 msgid "Copy folder content locally for offline operation"
 msgstr ""
 "Copiar o contido do cartafol localmente para unha operación en modo sen "
 "conexión"
 
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:58 ../camel/camel-offline-folder.c:56
 msgid "Downloading new messages for offline mode"
 msgstr "Descargando as mensaxes novas para o modo sen conexión"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:368
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando o cartafol '%s' para o modo sen conexión"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-store.c:386
+#: ../camel/providers/groupwise/camel-groupwise-store.c:214
+#: ../camel/providers/imap/camel-imap-store.c:989
+#: ../camel/providers/imap/camel-imap-store.c:1831
+#: ../camel/providers/imap/camel-imap-store.c:2267
+#: ../camel/providers/imap/camel-imap-store.c:3075
+#: ../camel/providers/imapx/camel-imapx-store.c:150
+#: ../camel/providers/imapx/camel-imapx-store.c:603
+#: ../camel/providers/imapx/camel-imapx-store.c:663
+#: ../camel/providers/imapx/camel-imapx-store.c:712
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando con conexión para completar esta operación"
 
-#: ../camel/camel-exception.c:260
+#: ../camel/camel-exception.c:259
 msgid "No description available"
 msgstr "Sen descrición dispoñíbel"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:788 ../camel/camel-filter-search.c:583
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Non foi posíbel crear o proceso fillo '%s': %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:831
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Recibiuse un fluxo de mensaxe incorrecto de %s: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1020 ../camel/camel-filter-driver.c:1029
 msgid "Syncing folders"
 msgstr "Sincronizando os cartafoles"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1117 ../camel/camel-filter-driver.c:1544
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Produciuse un erro ao analizar o filtro: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1127 ../camel/camel-filter-driver.c:1554
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Produciuse un erro ao executar o filtro: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1219
 msgid "Unable to open spool folder"
 msgstr "Non é posíbel abrir o cartafol spool"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1230
 msgid "Unable to process spool folder"
 msgstr "Non é posíbel procesar o cartafol spool"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1247
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Recibindo a mensaxe %d (%d%%)"
 
-#: ../camel/camel-filter-driver.c:1245
+#: ../camel/camel-filter-driver.c:1253
 msgid "Cannot open message"
 msgstr "Non é posíbel abrir a mensaxe"
 
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1254 ../camel/camel-filter-driver.c:1275
 #, c-format
 msgid "Failed on message %d"
 msgstr "Fallo na mensaxe %d"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1289 ../camel/camel-filter-driver.c:1386
 msgid "Syncing folder"
 msgstr "Sincronizando o cartafol"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1293 ../camel/camel-filter-driver.c:1391
 msgid "Complete"
 msgstr "Terminado"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1353
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1371
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Fallou na mensaxe %d de %d"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Non foi posíbel obter a mensaxe"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:402
 msgid "Invalid arguments to (system-flag)"
 msgstr "Os argumentos non son correctos para (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:417
 msgid "Invalid arguments to (user-tag)"
 msgstr "Os argumentos non son correctos para (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:742 ../camel/camel-filter-search.c:751
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Produciuse un erro ao executar a busca por filtro: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:348 ../camel/camel-folder-search.c:460
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1555,8 +1551,8 @@ msgstr ""
 "Non é posíbel analizar a expresión de busca: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:473
+#: ../camel/camel-folder-search.c:637
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1565,73 +1561,65 @@ msgstr ""
 "Produciuse un erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:831 ../camel/camel-folder-search.c:873
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) require un único resultado booleano"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:926
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) non está permitido dentro de %s"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:932 ../camel/camel-folder-search.c:939
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) require unha cadea de coincidencia"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:966
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) require como resultado unha matriz"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) require un conxunto de cartafoles"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Operación non compatíbel: anexar unha mensaxe: para %s"
-
-#: ../camel/camel-folder.c:1381
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Operación non compatíbel: busca por expresión: para %s"
-
-#: ../camel/camel-folder.c:1422
-#, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Operación non compatíbel: conta por expresión: para %s"
-
-#: ../camel/camel-folder.c:1461
-#, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Operación non compatíbel: busca polos UID: para %s"
-
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:602
+#: ../camel/providers/local/camel-maildir-folder.c:378
 msgid "Moving messages"
 msgstr "Movendo as mensaxes"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:604
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Aprendendo de correo lixo"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2076
+#, c-format
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Aprendendo a nova mensaxe de correo non desexado en %s"
+msgstr[1] "Aprendendo as novas mensaxes de correo non desexado en %s"
 
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Aprendendo de correo que non é lixo"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2095
+#, fuzzy, c-format
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Examinando as mensaxes cambiadas en '%s'"
+msgstr[1] "Examinando mensaxes cambiadas en %s"
 
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Filtrando as mensaxes novas"
+#. Translators: The %s is replaced with a folder name where the operation is running.
+#: ../camel/camel-folder.c:2116
+#, 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-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:733
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1642,15 +1630,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:750
 msgid "Failed to parse gpg userid hint."
 msgstr "Produciuse un fallo ao analizar a suxestión de id de usuario gpg."
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:775 ../camel/camel-gpg-context.c:790
 msgid "Failed to parse gpg passphrase request."
 msgstr "Produciuse un fallo ao analizar a solicitude de frase de paso gpg."
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:810
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1659,7 +1647,7 @@ msgstr ""
 "Necesita un PIN para desbloquear a chave para o seu\n"
 "SmartCard: \"%s\""
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:814
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1668,294 +1656,291 @@ msgstr ""
 "Necesita unha frase de paso para desbloquear a chave\n"
 "para o usuario: \"%s\""
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:820
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "Solicitude inesperada do GnuPg para '%s'"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
+#: ../camel/camel-gpg-context.c:848 ../camel/camel-gpg-context.c:1100
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:863
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Produciuse un fallo ao desbloquear a chave secreta: especificáronse 3 frases "
 "de paso incorrectas."
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:875
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:975
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Produciuse un fallo ao cifrar: non se especificou ningún destinatario "
 "correcto."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
+#: ../camel/camel-gpg-context.c:1254 ../camel/camel-gpg-context.c:1393
+#: ../camel/camel-gpg-context.c:2015 ../camel/camel-gpg-context.c:2067
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Produciuse un fallo ao executar gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
+#: ../camel/camel-gpg-context.c:1359 ../camel/camel-smime-context.c:758
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non foi posíbel xerar os datos da sinatura: %s"
 
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1412 ../camel/camel-gpg-context.c:1658
+#: ../camel/camel-gpg-context.c:1677 ../camel/camel-gpg-context.c:1770
+#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1913
+#: ../camel/camel-gpg-context.c:1931 ../camel/camel-gpg-context.c:2034
+#: ../camel/camel-gpg-context.c:2086
 msgid "Failed to execute gpg."
 msgstr "Produciuse un fallo ao executar gpg."
 
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1552 ../camel/camel-gpg-context.c:1560
+#: ../camel/camel-gpg-context.c:1568 ../camel/camel-gpg-context.c:1585
+#: ../camel/camel-smime-context.c:880 ../camel/camel-smime-context.c:893
+#: ../camel/camel-smime-context.c:901
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Non é posíbel verificar a sinatura da mensaxe: o formato da mensaxe é "
 "incorrecto"
 
-#: ../camel/camel-gpg-context.c:1600
+#: ../camel/camel-gpg-context.c:1626
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Non é posíbel verificar a sinatura da mensaxe: Non foi posíbel crear un "
 "ficheiro temporal: %s"
 
-#: ../camel/camel-gpg-context.c:1711
+#: ../camel/camel-gpg-context.c:1751
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posíbel xerar os datos de cifrado: %s"
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1807
 msgid "This is a digitally encrypted message part"
 msgstr "Isto é unha parte da mensaxe cifrada dixitalmente"
 
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1863 ../camel/camel-gpg-context.c:1872
+#: ../camel/camel-gpg-context.c:1894
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Non é posíbel descifrar a mensaxe: o formato da mensaxe non é correcto"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1883
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Produciuse un fallo ao descifrar a parte MIME: erro de protocolo"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:1967 ../camel/camel-smime-context.c:1174
 msgid "Encrypted content"
 msgstr "Contido cifrado"
 
-#: ../camel/camel-gpg-context.c:1930
+#: ../camel/camel-gpg-context.c:1989
 msgid "Unable to parse message content"
 msgstr "Non é posíbel analizar o contido da mensaxe"
 
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
+#: ../camel/camel-gpg-context.c:2016 ../camel/camel-gpg-context.c:2068
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
+#: ../camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:105
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Non é posíbel crear unha canalización do asistente de bloqueo: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:128
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Non é posíbel facer un fork do asistente de bloqueo: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:208 ../camel/camel-lock-client.c:234
 #, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 "Non foi posíbel bloquear '%s': erro de protocolo co asistente de bloqueo"
 
-#: ../camel/camel-lock-client.c:216
+#: ../camel/camel-lock-client.c:223
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Non foi posíbel bloquear '%s'"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:104
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Non foi posíbel crear o ficheiro de bloqueo para %s: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:147
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 "O tempo de espera terminou tentando obter o ficheiro de bloqueo para %s. "
 "Ténteo de novo máis tarde."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:206
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Non foi posíbel obter un bloqueo usando fcntl(2): %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non foi posíbel obter un bloqueo usando flock(2): %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:108
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Non foi posíbel verificar o ficheiro de correo %s: %s"
 
-#: ../camel/camel-movemail.c:119
+#: ../camel/camel-movemail.c:121
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posíbel abrir o ficheiro de correo %s: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:130
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posíbel abrir o ficheiro de correo temporal %s: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Non foi posíbel almacenar o correo no ficheiro temporal %s: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:192
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posíbel crear unha canalización: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:205
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posíbel facer fork: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:243
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa Movemail fallou: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:244
 msgid "(Unknown error)"
 msgstr "(Erro descoñecido)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:270
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Produciuse un erro ao ler o ficheiro de correo: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:282
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Produciuse un erro ao escribir o ficheiro temporal de correo: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:478 ../camel/camel-movemail.c:546
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Produciuse un erro ao copiar o ficheiro temporal de correo: %s"
 
-#: ../camel/camel-multipart-signed.c:592
+#: ../camel/camel-multipart-signed.c:582
 msgid "parse error"
 msgstr "erro na análise"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
+#: ../camel/camel-net-utils.c:511 ../camel/camel-net-utils.c:694
+#: ../camel/camel-net-utils.c:842
+#: ../camel/providers/pop3/camel-pop3-store.c:468
+#: ../camel/providers/pop3/camel-pop3-store.c:568
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../camel/camel-net-utils.c:521
+#: ../camel/camel-net-utils.c:533
 msgid "cannot create thread"
 msgstr "non é posíbel crear o fío"
 
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:698
 #, c-format
 msgid "Resolving: %s"
 msgstr "Resolvendo: %s"
 
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:720
 msgid "Host lookup failed"
 msgstr "Produciuse un fallo ao buscar o servidor"
 
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Produciuse un fallo ao buscar o servidor: %s: %s"
 
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:846
 msgid "Resolving address"
 msgstr "Resolvendo enderezo"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "Produciuse un fallo ao buscar o nome"
 
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:871
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Produciuse un fallo ao buscar o nome: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:191
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "Sincronizando as mensaxes no cartafol '%s' para o disco"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:155 ../camel/camel-offline-journal.c:179
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Non é posíbel escribir sen conexión o diario para o cartafol '%s': %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "Provedor de correo do cartafol virtual"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:61
 msgid "For reading mail as a query of another set of folders"
 msgstr "Para ler o correo como unha consulta doutro conxunto de cartafoles"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:187
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr ""
 "Non foi posíbel cargar %s: a carga de módulos non é compatíbel neste sistema."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:196
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Non foi posíbel cargar %s: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:205
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Non foi posíbel cargar %s: non hai código de inicialización no módulo."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:385 ../camel/camel-session.c:128
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Non hai ningún provedor dispoñíbel para o protocolo '%s'"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Esta opción conectarase ao servidor usando un inicio de sesión anónimo."
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:65
 msgid "Authentication failed."
 msgstr "Produciuse un fallo na autenticación."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:75
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1964,7 +1949,7 @@ msgstr ""
 "A información de rastro de enderezo de correo non é válida:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:88
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1973,7 +1958,7 @@ msgstr ""
 "A información de rastro opaco non é válida:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:101
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1982,11 +1967,11 @@ msgstr ""
 "A información de rastro non é válida:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1994,11 +1979,11 @@ msgstr ""
 "Esta opción conectarase ao servidor usando un contrasinal seguro CRAM-MD5, "
 "se o servidor o permite."
 
-#: ../camel/camel-sasl-digest-md5.c:48
+#: ../camel/camel-sasl-digest-md5.c:52
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:54
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2006,40 +1991,40 @@ msgstr ""
 "Esta opción conectarase ao servidor usando un contrasinal seguro DIGEST-MD5, "
 "se o servidor o permite."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:812
 msgid "Server challenge too long (>2048 octets)"
 msgstr "O desafío do servidor é demasiado longo (>2048 octetos)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "O desafío do servidor non é correcto\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:829
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
 "O desafío do servidor contiña un token \"Quality of Protection\" incorrecto"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:860
 msgid "Server response did not contain authorization data"
 msgstr "A resposta do servidor non contiña datos de autorización"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:880
 msgid "Server response contained incomplete authorization data"
 msgstr "A resposta do servidor contiña datos incompletos de autorización"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:892
 msgid "Server response does not match"
 msgstr "A resposta do servidor non coincide"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:76
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:78
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "Esta opción conectará ao servidor usando a autenticación Kerberos 5."
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:115
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2047,11 +2032,11 @@ msgstr ""
 "O mecanismo especificado non é compatíbel coa credencial proporcionada ou "
 "non é recoñecido pola implementación."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:120
 msgid "The provided target_name parameter was ill-formed."
 msgstr "O parámetro do target_name indicado é incorrecto."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:123
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2060,7 +2045,7 @@ msgstr ""
 "non compatíbel."
 
 # (pofilter) accelerators: accelerator _ occurs 3 time(s) in original and 2 time(s) in translation
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:127
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2069,7 +2054,7 @@ msgstr ""
 "parámetro input_chan_bindings."
 
 # (pofilter) accelerators: accelerator _ is missing from translation
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:132
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
@@ -2077,7 +2062,7 @@ msgstr ""
 "O input_token contén unha sinatura incorrecta ou unha sinatura que non pode "
 "ser verificada."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:136
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2085,53 +2070,53 @@ msgstr ""
 "As credenciais dispoñíbeis non son correctas para a inicialización do "
 "contexto ou o manipulador de credenciais non indicou ningunha credencial."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:141
 msgid "The supplied context handle did not refer to a valid context."
 msgstr "O manipulador de contexto dispoñíbel non refire un contexto correcto."
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:144
 msgid "The consistency checks performed on the input_token failed."
 msgstr ""
 "Produciuse un fallo nas verificacións de coherencia efectuadas sobre "
 "input_token."
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:147
 msgid "The consistency checks performed on the credential failed."
 msgstr ""
 "Produciuse un fallo nas verificacións de coherencia efectuadas sobre a "
 "credencial."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:150
 msgid "The referenced credentials have expired."
 msgstr "As credenciais indicadas caducaron."
 
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:156 ../camel/camel-sasl-gssapi.c:287
+#: ../camel/camel-sasl-gssapi.c:330 ../camel/camel-sasl-gssapi.c:346
+#: ../camel/providers/imap/camel-imap-store.c:1260
 msgid "Bad authentication response from server."
 msgstr "A resposta de autenticación desde o servidor non é válida."
 
-#: ../camel/camel-sasl-gssapi.c:383
+#: ../camel/camel-sasl-gssapi.c:357
 msgid "Unsupported security layer."
 msgstr "A capa de seguranza non é compatíbel."
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Esta opción conectarase ao servidor usando un contrasinal simple."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:96
 msgid "Unknown authentication state."
 msgstr "Estado de autenticación descoñecido."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2139,51 +2124,51 @@ msgstr ""
 "Esta opción conectarase ao servidor baseado en Windows usando NTLM / "
 "Autenticación de contrasinal seguro."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "PLAIN"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP antes de SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Esta opción autorizará unha conexión POP antes de tentar SMTP"
 
-#: ../camel/camel-sasl-popb4smtp.c:106
+#: ../camel/camel-sasl-popb4smtp.c:78
 msgid "POP Source URI"
 msgstr "URI da fonte POP"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
+#: ../camel/camel-sasl-popb4smtp.c:84
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "Autorización POP antes de SMTP usando un transporte descoñecido"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
+#: ../camel/camel-sasl-popb4smtp.c:91
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "Autorización POP antes de SMTP usando unha fonte non-pop"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:113
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Produciuse un fallo na compilación da expresión regular: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:210
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "O URL '%s' necesita un compoñente do nome do usuario"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:214
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "O URL '%s' necesita un compoñente de servidor"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:218
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita un compoñente do camiño"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:186
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2192,257 +2177,234 @@ msgstr ""
 "Non foi posíbel crear o cartafol %s:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:652
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Introduza o contrasinal %s para %s no servidor %s."
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "A sesión Camel non é compatíbel co reenvío dunha mensaxe."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:340 ../camel/camel-smime-context.c:975
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Non é posíbel encontrar o certificado para '%s'"
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:346
 msgid "Cannot create CMS message"
 msgstr "Non é posíbel crear a mensaxe CMS"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:351
 msgid "Cannot create CMS signed data"
 msgstr "Non é posíbel crear os datos asinados CMS"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:357
 msgid "Cannot attach CMS signed data"
 msgstr "Non é posíbel anexar os datos asinados CMS"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:364
 msgid "Cannot attach CMS data"
 msgstr "Non é posíbel anexar os datos CMS"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:370
 msgid "Cannot create CMS Signer information"
 msgstr "Non é posíbel crear información do asinante CMS"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:376
 msgid "Cannot find certificate chain"
 msgstr "Non é posíbel encontrar a cadea do certificado"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:382
 msgid "Cannot add CMS Signing time"
 msgstr "Non é posíbel engadir a data de sinatura CMS"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:406 ../camel/camel-smime-context.c:421
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "O certificado de cifrado de '%s' non existe"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:428
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Non é posíbel engadir o atributo SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:433
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Non é posíbel engadir o atributo MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:438
 msgid "Cannot add encryption certificate"
 msgstr "Non é posíbel engadir o certificado de cifrado"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:444
 msgid "Cannot add CMS Signer information"
 msgstr "Non é posíbel engadir información do asinante CMS"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Non é posíbel crear un contexto de codificación"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Non foi posíbel engadir datos ao codificador CMS"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Produciuse un fallo ao codificar os datos"
-
-#: ../camel/camel-smime-context.c:700
+#: ../camel/camel-smime-context.c:476
 msgid "Unverified"
 msgstr "Non verificada"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:478
 msgid "Good signature"
 msgstr "Sinatura boa"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:480
 msgid "Bad signature"
 msgstr "A sinatura non é boa"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:482
 msgid "Content tampered with or altered in transit"
 msgstr "Contido alterado ou adulterado durante o transporte"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:484
 msgid "Signing certificate not found"
 msgstr "Non se encontrou o certificado de sinatura"
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:486
 msgid "Signing certificate not trusted"
 msgstr "O certificado de sinatura non é fiábel"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:488
 msgid "Signature algorithm unknown"
 msgstr "O algoritmo de sinatura é descoñecido"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:490
 msgid "Signature algorithm unsupported"
 msgstr "O algoritmo de sinatura non é compatíbel"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:492
 msgid "Malformed signature"
 msgstr "A sinatura está formada incorrectamente"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:494
 msgid "Processing error"
 msgstr "Procesando erro"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:536
 msgid "No signed data in signature"
 msgstr "Non hai datos asinados na sinatura"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:541
 msgid "Digests missing from enveloped data"
 msgstr "Falta o resumo dos datos empaquetados"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:554 ../camel/camel-smime-context.c:565
 msgid "Cannot calculate digests"
 msgstr "Non é posíbel calcular os resumos\t"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:572 ../camel/camel-smime-context.c:576
 msgid "Cannot set message digests"
 msgstr "Non é posíbel definir os resumos de mensaxe"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:586 ../camel/camel-smime-context.c:591
 msgid "Certificate import failed"
 msgstr "A importación do certificado fallou"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:601
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr ""
 "O certificado é a única mensaxe, non é posíbel verificar os certificados"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:604
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "O certificado é a única mensaxe, certificados importados e verificados"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:608
 msgid "Cannot find signature digests"
 msgstr "Non é posíbel encontrar o resumo da sinatura"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:624
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Asinante: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:769 ../camel/camel-smime-context.c:1047
+msgid "Cannot create encoder context"
+msgstr "Non é posíbel crear un contexto de codificación"
+
+#: ../camel/camel-smime-context.c:775
+msgid "Failed to add data to CMS encoder"
+msgstr "Non foi posíbel engadir datos ao codificador CMS"
+
+#: ../camel/camel-smime-context.c:780 ../camel/camel-smime-context.c:1065
+msgid "Failed to encode data"
+msgstr "Produciuse un fallo ao codificar os datos"
+
+#: ../camel/camel-smime-context.c:915 ../camel/camel-smime-context.c:1153
 msgid "Decoder failed"
 msgstr "O descodificador fallou"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:982
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Non é posíbel encontrar un algoritmo de codificación en bloque común"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:990
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Non é posíbel asignar un espazo para a chave de cifrado en bloque"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1001
 msgid "Cannot create CMS Message"
 msgstr "Non é posíbel crear a mensaxe CMS"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1007
 msgid "Cannot create CMS Enveloped data"
 msgstr "Non é posíbel crear os datos empaquetados CMS"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1013
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Non é posíbel anexar os datos empaquetados CMS"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot attach CMS data object"
 msgstr "Non é posíbel anexar o obxecto de datos CMS"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1028
 msgid "Cannot create CMS Recipient information"
 msgstr "Non é posíbel crear información do destinatario CMS"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1033
 msgid "Cannot add CMS Recipient information"
 msgstr "Non é posíbel engadir información do destinatario CMS"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1059
 msgid "Failed to add data to encoder"
 msgstr "Produciuse un fallo ao engadir os datos ao codificador"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1160
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Descodificado: non se encontrou contido cifrado"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "importar chaves: non implementado"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "exportar chaves: non implementado"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr ""
-"Non é posíbel obter o cartafol: a operación non é válida neste almacenamento"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:354
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Non é posíbel crear o cartafol '%s': o cartafol existe"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr ""
-"Non é posíbel crear o cartafol: a operación non é válida neste almacenamento"
-
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:458
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Non é posíbel crear o cartafol: %s: o ficheiro xa existe"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:526 ../camel/camel-vee-store.c:232
+#: ../camel/providers/local/camel-maildir-store.c:214
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Non é posíbel eliminar o cartafol: %s: a operación non é correcta"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:585 ../camel/camel-vee-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:286
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non é posíbel renomear o cartafol: %s: a operación non é correcta"
 
 #. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:898 ../camel/camel-vtrash-folder.c:49
 msgid "Trash"
 msgstr "Lixo"
 
 #. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:901 ../camel/camel-vtrash-folder.c:51
 msgid "Junk"
 msgstr "Correo lixo"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:711
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2455,16 +2417,16 @@ msgstr ""
 "Impresión dixital:       %s\n"
 "Sinatura:         %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:717
 msgid "GOOD"
 msgstr "BO"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:717
 msgid "BAD"
 msgstr "MALO"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:721
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2479,7 +2441,7 @@ msgstr ""
 "\n"
 " Quere aceptalo?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:765
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2488,7 +2450,7 @@ msgstr ""
 "Problema do certificado: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:817
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2497,7 +2459,7 @@ msgstr ""
 "O dominio do certificado é incorrecto: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2506,7 +2468,7 @@ msgstr ""
 "O certificado expirou: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:852
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2515,49 +2477,49 @@ msgstr ""
 "A lista de revogación de certificados expirou: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:315
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Non foi posíbel analizar o URL '%s'"
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:586
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Produciuse un erro ao almacenar '%s': %s"
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:663
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
+#: ../camel/camel-vee-folder.c:822 ../camel/camel-vee-folder.c:828
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Non é posíbel copiar ou mover as mensaxes a un cartafol virtual"
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:122 ../camel/camel-vee-store.c:123
+#: ../camel/camel-vee-store.c:378
 msgid "Unmatched"
 msgstr "Sen equivalencia"
 
-#: ../camel/camel-vee-store.c:400
-#, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Non é posíbel eliminar o cartafol: %s: ese cartafol non existe"
-
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:195
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non é posíbel renomear o cartafol: %s: ese cartafol non existe"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vee-store.c:257
+#, c-format
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Non é posíbel eliminar o cartafol: %s: ese cartafol non existe"
+
+#: ../camel/camel-vtrash-folder.c:50
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Non é posíbel copiar as mensaxes ao cartafol do lixo"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:52
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Non poden copiar as mensaxes ao cartafol de correo lixo"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -2566,247 +2528,240 @@ msgstr ""
 "Non é posíbel obter a mensaxe: %s\n"
 "  %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:128
+#: ../camel/providers/local/camel-maildir-folder.c:258
+#: ../camel/providers/local/camel-maildir-folder.c:286
+#: ../camel/providers/local/camel-maildir-folder.c:391
+#: ../camel/providers/local/camel-mbox-folder.c:354
+#: ../camel/providers/local/camel-mbox-folder.c:404
+#: ../camel/providers/local/camel-mh-folder.c:221
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:140
+#: ../camel/providers/pop3/camel-pop3-folder.c:262
+#: ../camel/providers/pop3/camel-pop3-folder.c:581
+#: ../camel/providers/pop3/camel-pop3-folder.c:641
+#: ../camel/providers/pop3/camel-pop3-folder.c:659
 msgid "User canceled"
 msgstr "Usuario cancelado"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:147
+#: ../camel/providers/nntp/camel-nntp-folder.c:147
+#: ../camel/providers/nntp/camel-nntp-folder.c:149
+#: ../camel/providers/nntp/camel-nntp-folder.c:158
+#: ../camel/providers/nntp/camel-nntp-folder.c:233
+#: ../camel/providers/pop3/camel-pop3-folder.c:382
+#: ../camel/providers/pop3/camel-pop3-folder.c:584
+#: ../camel/providers/pop3/camel-pop3-folder.c:644
+#: ../camel/providers/pop3/camel-pop3-folder.c:651
+#: ../camel/providers/pop3/camel-pop3-folder.c:662
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Non é posíbel obter a mensaxe %s: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2507
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:164
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2522
 msgid "This message is not available in offline mode."
 msgstr "Esta mensaxe non está dispoñíbel en modo sen conexión."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2010
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2061
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:186
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:193
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2024
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2075
 msgid "Could not get message"
 msgstr "Non foi posíbel obter a mensaxe"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:983
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:991
+#: ../camel/providers/imap/camel-imap-folder.c:272
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Non foi posíbel cargar o resumo de %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1056
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1064
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Comprobando as mensaxes borradas %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1331
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1338
 msgid "Trash Folder Full. Please Empty."
 msgstr "O cartafol do lixo está cheo. Baléireo."
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1565
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2728
-#: ../camel/providers/imapx/camel-imapx-server.c:2813
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1570
+#: ../camel/providers/groupwise/camel-groupwise-store.c:622
+#: ../camel/providers/groupwise/camel-groupwise-store.c:752
+#: ../camel/providers/imap/camel-imap-folder.c:3407
+#: ../camel/providers/imap/camel-imap-folder.c:3483
+#: ../camel/providers/imapx/camel-imapx-server.c:2969
+#: ../camel/providers/imapx/camel-imapx-server.c:3055
 #, 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/groupwise/camel-groupwise-folder.c:2361
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2404
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2376
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2419
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Non é posíbel engadir a mensaxe ao cartafol '%s': %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2392
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2407
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Non é posíbel crear a mensaxe: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:275
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Non é posíbel obter o contedor do cartafol %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:337
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr ""
 "Non é posíbel engadir a mensaxe en modo sen conexión: a caché non está "
 "dispoñíbel"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:353
 #, c-format
 msgid "Cannot append message in offline mode: %s"
 msgstr "Non é posíbel engadir a mensaxe en modo sen conexión: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:49
 msgid "Checking for new mail"
 msgstr "Comprobando o correo novo"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:51
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:45
 msgid "C_heck for new messages in all folders"
 msgstr "C_omprobar as mensaxes novas en todos os cartafoles"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
-#: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
+#: ../camel/providers/imap/camel-imap-provider.c:64
+#: ../camel/providers/imapx/camel-imapx-provider.c:71
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:82
+#: ../camel/providers/local/camel-local-provider.c:102
 msgid "Options"
 msgstr "Opcións"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Aplicar filtros ás mensaxes novas na caixa de entrada neste servidor"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:58
 msgid "Check new messages for J_unk contents"
 msgstr "Comprobar nas mensaxes novas contidos _non desexados"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
-#: ../camel/providers/imapx/camel-imapx-provider.c:78
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:60
+#: ../camel/providers/imap/camel-imap-provider.c:70
+#: ../camel/providers/imapx/camel-imapx-provider.c:77
 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/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:62
 msgid "Automatically synchroni_ze account locally"
 msgstr "Sincroni_zar automaticamente a conta de modo local"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "SOAP Settings"
 msgstr "Configuración SOAP"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:70
 msgid "Post Office Agent SOAP _Port:"
 msgstr "_Porto do axente de correo SOAP:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:82
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:84
 msgid "For accessing Novell GroupWise servers"
 msgstr "Para acceder a servidores Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:99
+#: ../camel/providers/imap/camel-imap-provider.c:96
+#: ../camel/providers/imapx/camel-imapx-provider.c:103
+#: ../camel/providers/nntp/camel-nntp-provider.c:72
+#: ../camel/providers/pop3/camel-pop3-provider.c:70
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:101
 msgid ""
 "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ao servidor GroupWise usando un contrasinal de texto "
 "simple."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:100
 msgid "Host or user not available in url"
 msgstr "O servidor ou usuario non está dispoñíbel no URL"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:195
+#: ../camel/providers/imap/camel-imap-store.c:1344
+#: ../camel/providers/imapx/camel-imapx-server.c:2299
 msgid "You did not enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:308
 msgid "Some features may not work correctly with your current server version"
 msgstr ""
 "Algunhas características poderán non funcionar correctamente coa versión "
 "actual do seu servidor"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:529
+#: ../camel/providers/imap/camel-imap-store.c:1867
+#: ../camel/providers/imap/camel-imap-store.c:2064
+#: ../camel/providers/imapx/camel-imapx-store.c:314
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1197
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Non é posíbel crear cartafoles GroupWise en modo sen conexión."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1211
+#: ../camel/providers/imap/camel-imap-store.c:1942
+#: ../camel/providers/imap/camel-imap-store.c:2342
+#: ../camel/providers/imapx/camel-imapx-store.c:749
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1290
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1313
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Non é posíbel renomear o cartafol GroupWise de '%s' a '%s'"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1345
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:111
 #, c-format
 msgid "GroupWise server %s"
 msgstr "Servidor GroupWise %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1347
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "Servizo GroupWise para %s en %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:113
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "Distribución de correo GroupWise vía %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:155
 msgid "Sending Message"
 msgstr "Enviando a mensaxe"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:162
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr ""
+"Non é posíbel obter o cartafol: a operación non é válida neste almacenamento"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:203
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2816,102 +2771,38 @@ msgstr ""
 "cola da caixa de saída. Tente envialos premendo en Enviar/Recibir despois de "
 "eliminar ou arquivar algúns dos seus correos.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:205
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:201
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Non foi posíbel enviar a mensaxe: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Comprobando o novo correo"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Conexión ao servidor"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Usar unha orde personalizada para conectar co servidor"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Orde:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Cartafoles"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "_Mostrar só os cartafoles subscritos"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "_Ignorar o espazo de nomes do cartafol fornecido polo servidor"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Espazo de nomes"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Para acceder a servidores Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Esta opción conectarase co servidor Hula usando un contrasinal de texto "
-"simple."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:177
+#: ../camel/providers/imap/camel-imap-command.c:261
 msgid "No output stream"
 msgstr "Non hai fluxo de saída"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:182
+#: ../camel/providers/imap/camel-imap-command.c:266
 msgid "No input stream"
 msgstr "Non hai fluxo de entrada"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:225
+#: ../camel/providers/imap/camel-imap-command.c:274
+#: ../camel/providers/imap/camel-imap-command.c:488
+#: ../camel/providers/imap/camel-imap-store.c:3112
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:327
+#: ../camel/providers/imap/camel-imap-store.c:3117
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectouse inesperadamente: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:348
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2920,265 +2811,288 @@ msgstr ""
 "Alerta do servidor IMAP %s %s:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:417
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:427
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "A orde IMAP fallou: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:502
 msgid "Server response ended too soon."
 msgstr "A resposta do servidor terminou moi cedo."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:708
 #, 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:748
+#: ../camel/providers/imap/camel-imap-command.c:744
 #, 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:90
+#: ../camel/providers/imap/camel-imap-folder.c:67
 msgid "Always check for new mail in this folder"
 msgstr "Comprobar sempre o correo novo neste cartafol"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:253
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posíbel crear o directorio %s: %s"
 
 #. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2758
+#: ../camel/providers/imap/camel-imap-folder.c:895
+#: ../camel/providers/imapx/camel-imapx-server.c:2998
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Examinando mensaxes cambiadas en %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
+#: ../camel/providers/imap/camel-imap-folder.c:1964
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
 msgstr "Estado de resposta inesperado '%s' despois da orde APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2001
+#: ../camel/providers/imap/camel-imap-folder.c:1979
 msgid "No response on continuation after APPEND command"
 msgstr "Non houbo resposta de continuación despois da orde APPEND"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2046
+#: ../camel/providers/imap/camel-imap-folder.c:2024
 msgid "Unknown error occurred during APPEND command!"
 msgstr "Produciuse un erro descoñecido durante a orde APPEND!"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2877
+#: ../camel/providers/imap/camel-imap-folder.c:2855
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non é posíbel obter a mensaxe: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:2890
+#: ../camel/providers/imapx/camel-imapx-server.c:3979
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Non é posíbel obter a mensaxe co ID de mensaxe %s: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:2891
+#: ../camel/providers/imapx/camel-imapx-server.c:3980
 msgid "No such message available."
 msgstr "A mensaxe non está dispoñíbel."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:2952
+#: ../camel/providers/imap/camel-imap-folder.c:3797
+#: ../camel/providers/nntp/camel-nntp-folder.c:219
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñíbel actualmente"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3610
 #, 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:3640
+#: ../camel/providers/imap/camel-imap-folder.c:3618
 #, 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:3857
+#: ../camel/providers/imap/camel-imap-folder.c:3835
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posíbel encontrar o corpo da mensaxe na resposta FETCH."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
+#: ../camel/providers/imap/camel-imap-message-cache.c:176
+#: ../camel/providers/imap/camel-imap-message-cache.c:239
 #, c-format
 msgid "Could not open cache directory: %s"
 msgstr "Non foi posíbel abrir o directorio da caché: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:325
+#: ../camel/providers/imap/camel-imap-message-cache.c:382
+#: ../camel/providers/imap/camel-imap-message-cache.c:413
+#: ../camel/providers/imap/camel-imap-message-cache.c:445
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Produciuse un fallo ao facer a caché da mensaxe %s: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:525
 #, c-format
 msgid "Failed to cache %s: %s"
 msgstr "Produciuse un fallo ao facer a caché %s: %s"
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:41
+msgid "Checking for New Mail"
+msgstr "Comprobando o novo correo"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:47
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "V_erificar as novas mensaxes nos cartafoles subscritos"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "Espazo de nome:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:51
+msgid "Connection to Server"
+msgstr "Conexión ao servidor"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
+#: ../camel/providers/imap/camel-imap-provider.c:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:53
+msgid "_Use custom command to connect to server"
+msgstr "_Usar unha orde personalizada para conectar co servidor"
+
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "_Orde:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:61
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Cartafoles"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:63
+msgid "_Show only subscribed folders"
+msgstr "_Mostrar só os cartafoles subscritos"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
+msgid "O_verride server-supplied folder namespace"
+msgstr "_Ignorar o espazo de nomes do cartafol fornecido polo servidor"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "Es_pazo de nome:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:73
 msgid "_Apply filters to new messages in INBOX on this server"
 msgstr ""
 "_Aplicarlles os filtros ás mensaxes novas da caixa de entrada neste servidor"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
-#: ../camel/providers/imapx/camel-imapx-provider.c:76
+#: ../camel/providers/imap/camel-imap-provider.c:68
+#: ../camel/providers/imapx/camel-imapx-provider.c:75
 msgid "Check new messages for Jun_k contents"
 msgstr "Comprobar nas mensaxes novas _contidos non desexados"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
-#: ../camel/providers/imapx/camel-imapx-provider.c:80
+#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imapx/camel-imapx-provider.c:79
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "Sincroni_zar automaticamente o correo electrónico remoto localmente"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:79
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:81
+#: ../camel/providers/imapx/camel-imapx-provider.c:89
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:98
+#: ../camel/providers/imapx/camel-imapx-provider.c:105
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ao servidor IMAP usando un contrasinal de texto "
 "simple."
 
-#: ../camel/providers/imap/camel-imap-store.c:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
+#: ../camel/providers/imap/camel-imap-store.c:423
+#: ../camel/providers/imapx/camel-imapx-store.c:184
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/imapx/camel-imapx-store.c:186
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servizo IMAP para %s en %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/nntp/camel-nntp-store.c:174
+#: ../camel/providers/nntp/camel-nntp-store.c:189
+#: ../camel/providers/pop3/camel-pop3-store.c:182
+#: ../camel/providers/pop3/camel-pop3-store.c:196
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:261
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Non foi posíbel realizar a conexión con %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:555
+#: ../camel/providers/nntp/camel-nntp-store.c:175
+#: ../camel/providers/pop3/camel-pop3-store.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:247
 msgid "SSL unavailable"
 msgstr "SSL non dispoñíbel"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2017
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:848
+#: ../camel/providers/imapx/camel-imapx-server.c:2161
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2057
-#: ../camel/providers/imapx/camel-imapx-server.c:2071
+#: ../camel/providers/imap/camel-imap-store.c:677
+#: ../camel/providers/imap/camel-imap-store.c:696
+#: ../camel/providers/imap/camel-imap-store.c:702
+#: ../camel/providers/imap/camel-imap-store.c:728
+#: ../camel/providers/imapx/camel-imapx-server.c:2206
+#: ../camel/providers/imapx/camel-imapx-server.c:2228
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Non foi posíbel realizar a conexión ao servidor IMAP %s en modo seguro: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2058
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:678
+#: ../camel/providers/imapx/camel-imapx-server.c:2207
+#: ../camel/providers/smtp/camel-smtp-transport.c:319
 msgid "STARTTLS not supported"
 msgstr "O STARTTLS non é compatíbel"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2072
+#: ../camel/providers/imap/camel-imap-store.c:697
+#: ../camel/providers/imapx/camel-imapx-server.c:2229
 msgid "SSL negotiations failed"
 msgstr "As negociacións SSL fallaron"
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:703
+#: ../camel/providers/smtp/camel-smtp-transport.c:358
 msgid "SSL is not available in this build"
 msgstr "O SSL non está dispoñíbel nesta compilación"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:851
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Non foi posíbel conectar coa orde \"%s\": %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
+#: ../camel/providers/imap/camel-imap-store.c:1039
+#: ../camel/providers/imap/camel-imap-store.c:2438
+#: ../camel/providers/imapx/camel-imapx-store.c:366
+#: ../camel/providers/imapx/camel-imapx-store.c:918
+#: ../camel/providers/local/camel-maildir-folder.c:76
+#: ../camel/providers/local/camel-maildir-store.c:214
+#: ../camel/providers/local/camel-maildir-store.c:286
+#: ../camel/providers/local/camel-maildir-store.c:512
+#: ../camel/providers/local/camel-maildir-store.c:525
+#: ../camel/providers/local/camel-spool-store.c:455
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:1291
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non permite o tipo de autenticación solicitado %s "
 
-#: ../camel/providers/imap/camel-imap-store.c:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:1301
+#: ../camel/providers/smtp/camel-smtp-transport.c:493
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non é compatíbel co tipo de autenticación %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:1375
+#: ../camel/providers/imapx/camel-imapx-server.c:2327
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3189,454 +3103,129 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2280
+#: ../camel/providers/imapx/camel-imapx-store.c:734
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "O nome do cartafol \"%s\" non é correcto porque contén o carácter \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1996
+#: ../camel/providers/local/camel-maildir-store.c:187
+#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mh-store.c:243
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Non é posíbel crear o cartafol '%s': o cartafol existe."
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2291
+#: ../camel/providers/imapx/camel-imapx-store.c:742
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartafol pai descoñecido: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3114
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectouse inesperadamente"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Non foi posíbel enviarlle a orde ao servidor IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Resposta do servidor IMAP4 inesperada %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Saúdo inesperado do servidor IMAP %s."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel seleccionar o cartafol '%s': o nome da caixa de correo non é "
-"correcto"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Non é posíbel seleccionar o cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Produciuse un fallo no envío da orde para o servidor IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "servizo non dispoñíbel"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "O servidor IMAP4 %s desconectouse inesperadamente: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Activar a detección de lista de mensaxes necesaria para algunhas regras de "
-"filtros e cartafoles virtuais"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Expirar as mensaxes na caché que non foran lidas en X segundos"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Expirar as mensaxes na caché máis antigas que X segundos"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Non é posíbel acceder ao cartafol '%s': %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr ""
-"Non é posíbel sincronizar os parámetros para o cartafol '%s': erro "
-"descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr ""
-"Non é posíbel sincronizar os parámetros para o cartafol '%s': orde incorrecta"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Non é posíbel expurgar o cartafol '%s': erro descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Non é posíbel expurgar o cartafol '%s': a orde é incorrecta"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr ""
-"Non é posíbel obter a mensaxe %s do cartafol '%s': a mensaxe non existe"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr ""
-"Non é posíbel obter a mensaxe %s do cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr ""
-"Non é posíbel engadir a mensaxe ao cartafol '%s': o cartafol é só de lectura"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Non é posíbel engadir a mensaxe ao cartafol '%s': o erro é descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr ""
-"Non é posíbel engadir a mensaxe ao cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Non é posíbel mover mensaxes do cartafol '%s' ao cartafol '%s': o erro é "
-"descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr ""
-"Non é posíbel copiar mensaxes do cartafol '%s' ao cartafol '%s': o erro é "
-"descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Non é posíbel mover mensaxes do cartafol '%s' ao cartafol '%s': a orde non é "
-"válida"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr ""
-"Non é posíbel copiar mensaxes do cartafol '%s' ao cartafol '%s': a orde non "
-"é válida"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Verificar nas novas mensaxes os contidos _non desexados"
-
-# (pofilter) accelerators: accelerator _ is missing from translation
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Verificar as mensa_xes non desexadas no cartafol da caixa de entrada"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "Para ler e almacenar correo en servidores IMAPv4rev1."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Esta opción conectarase ao servidor IMAPv4rev1 usando un contrasinal de "
-"texto simple."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Conexión cancelada"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Produciuse un fallo ao conectar co servidor IMAP %s en modo seguro: o "
-"servidor non permite STARTTLS"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "As negociacións TLS fallaron"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Non é posíbel autenticar no servidor IMAP %s utilizando o mecanismo de "
-"autenticación %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Non é posíbel autenticar no servidor IMAP %s empregando %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Non é posíbel crear cartafol IMAP en modo sen conexión."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr ""
-"Non é posíbel obter o cartafol '%s' do servidor IMAP %s: erro descoñecido"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Non é posíbel obter a información LIST '%s' do servidor IMAP %s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "A orde é mala"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel crear o cartafol '%s': o nome da caixa de correo non é correcto"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Non é posíbel crear o cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Non é posíbel eliminar o cartafol '%s': cartafol especial"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Non é posíbel eliminar os cartafoles IMAP no modo sen conexión."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel eliminar o cartafol '%s': o nome da caixa de correo non é "
-"correcto"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
-#, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Non é posíbel eliminar o cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Non é posíbel renomear o cartafol '%s' a '%s': cartafol especial"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Non é posíbel renomear os cartafoles IMAP no modo sen conexión."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel renomear o cartafol '%s' a '%s': o nome da caixa de correo non "
-"é correcto"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Non é posíbel renomear o cartafol '%s' a '%s': a orde non é correcta"
-
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr ""
-"Non é posíbel obter información de '%s' para o patrón '%s' no servidor IMAP %"
-"s: %s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Non é posíbel subscribir aos cartafoles IMAP en modo sen conexión."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel subscribir ao cartafol '%s': o nome da caixa de correo non é "
-"correcto"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Non é posíbel subscribir ao cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr ""
-"Non é posíbel eliminar a subscrición dos cartafoles IMAP en modo sen "
-"conexión."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr ""
-"Non é posíbel eliminar a subscrición do cartafol '%s': o nome da caixa de "
-"correo non é correcto"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr ""
-"Non é posíbel eliminar a subscrición do cartafol '%s': a orde non é correcta"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Examinando mensaxes cambiadas"
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
-#, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "O servidor IMAP %s está nun estado inconsistente."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Obtendo os envoltorios das novas mensaxes"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
-#, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Token inesperado na resposta do servidor IMAP %s: "
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Non hai datos"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "O servidor IMAP %s desconectouse inesperadamente: %s"
-
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
+#: ../camel/providers/imapx/camel-imapx-folder.c:73
 #, c-format
 msgid "Could not create folder summary for %s"
 msgstr "Non foi posíbel crear o cartafol de resumo para %s"
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-folder.c:81
 #, c-format
 msgid "Could not create cache for %s"
 msgstr "Non foi posíbel crear a caché para %s"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
+#: ../camel/providers/imapx/camel-imapx-provider.c:43
 msgid "Use I_dle if the server supports it"
 msgstr "Usar I_dle se o servidor o admite"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:55
+msgid "Command:"
+msgstr "Orde:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:57
 msgid "Numbe_r of cached connections to use"
 msgstr "Número de conexións _cacheadas para usar"
 
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
+msgid "Namespace:"
+msgstr "Espazo de nome:"
+
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2020
+#: ../camel/providers/imapx/camel-imapx-server.c:2164
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Non foi posíbel conectar a %s (porto %s): %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2100
-#, c-format
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%sIntroduza o contrasinal de IMAP para %s %s"
-
-#: ../camel/providers/local/camel-local-folder.c:178
+#: ../camel/providers/local/camel-local-folder.c:169
 msgid "Index message body data"
 msgstr "Datos do índice do corpo da mensaxe"
 
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
+#. Translators: This is used for a folder description, for folders being under $HOME.
+#. The first %s is replaced with a relative path under $HOME,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#. Translators: This is used for a folder description, for folders being under /var/spool/mail.
+#. The first %s is replaced with a relative path under /var/spool/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#. Translators: This is used for a folder description, for folders being under /var/mail.
+#. The first %s is replaced with a relative path under /var/mail,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
+#: ../camel/providers/local/camel-local-folder.c:394
+#: ../camel/providers/local/camel-local-folder.c:400
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "caixa de correo: %s (%s)"
 
-#. a full path + protocol
+#. Translators: This is used for a folder description.
+#. The first %s is replaced with a folder's full path,
+#. the second %s is replaced with a protocol name, like mbox/maldir/...
 #: ../camel/providers/local/camel-local-folder.c:406
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#. Translators: The first %s is replaced with a message ID,
+#. the second %s is replaced with the folder path,
+#. the third %s is replaced with a detailed error string
+#: ../camel/providers/local/camel-local-folder.c:662
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Non é posíbel obter a mensaxe: %s do cartafol %s\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_Usar o ficheiro de resumo de cartafoles (exmh) '.folders'"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "Directorios de correo en formato MH"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Para almacenar correo local en directorios de correo tipo MH."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:69
 msgid "Local delivery"
 msgstr "Entrega local"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3644,29 +3233,29 @@ msgstr ""
 "Para recuperar (mover) correo local de spools estándar en formato mbox para "
 "cartafoles xestionados polo Evolution."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:103
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Aplicar filtros ás mensaxes novas da caixa de entrada"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:91
 msgid "Maildir-format mail directories"
 msgstr "Cartafoles de correo en formato maildir"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:92
 msgid "For storing local mail in maildir directories."
 msgstr "Para almacenar correo local en cartafoles maildir."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:104
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Almacenar cabeceiras de estado en formato Elm/Pine/Mutt"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:111
 msgid "Standard Unix mbox spool file"
 msgstr "Ficheiro spool mbox estándar de Unix"
 
-#: ../camel/providers/local/camel-local-provider.c:116
-#: ../camel/providers/local/camel-local-provider.c:127
+#: ../camel/providers/local/camel-local-provider.c:112
+#: ../camel/providers/local/camel-local-provider.c:123
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
@@ -3676,212 +3265,191 @@ msgstr ""
 "Tamén pode ser utilizado para ler unha árbore de cartafoles estilo Elm, Pine "
 "ou Mutt."
 
-#: ../camel/providers/local/camel-local-provider.c:126
+#: ../camel/providers/local/camel-local-provider.c:122
 msgid "Standard Unix mbox spool directory"
 msgstr "Cartafol estándar spool mbox de Unix"
 
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:156
+#: ../camel/providers/local/camel-local-store.c:267
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-spool-store.c:120
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é un camiño absoluto"
 
-#: ../camel/providers/local/camel-local-store.c:170
+#: ../camel/providers/local/camel-local-store.c:163
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "A raíz de almacenamento %s non é un cartafol normal"
 
-#: ../camel/providers/local/camel-local-store.c:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:172
+#: ../camel/providers/local/camel-local-store.c:180
+#: ../camel/providers/local/camel-local-store.c:278
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Non é posíbel obter o cartafol: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:192
 msgid "Local stores do not have an inbox"
 msgstr "Os almacenamentos locais non teñen unha caixa de entrada"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:238
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posíbel renomear o cartafol %s a %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:408
+#: ../camel/providers/local/camel-local-store.c:401
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posíbel renomear '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:426
+#: ../camel/providers/local/camel-mbox-store.c:292
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Non foi posíbel eliminar o ficheiro de índice de cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:449
+#: ../camel/providers/local/camel-mbox-store.c:316
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Non foi posíbel eliminar o metaficheiro do cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:508
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Non foi posíbel engadir a mensaxe ao resumo: motivo descoñecido"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
+#: ../camel/providers/local/camel-maildir-folder.c:225
 msgid "Maildir append message canceled"
 msgstr "Cancelouse a adición da mensaxe maildir"
 
-#: ../camel/providers/local/camel-maildir-folder.c:233
+#: ../camel/providers/local/camel-maildir-folder.c:228
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non é posíbel engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
 #: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Non é posíbel obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "O contido da mensaxe non é correcto"
 
-#: ../camel/providers/local/camel-maildir-folder.c:419
+#: ../camel/providers/local/camel-maildir-folder.c:408
 msgid "Cannot transfer message to destination folder"
 msgstr "Non é posíbel transferir a mensaxe ao cartafol de destino"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:143
+#: ../camel/providers/local/camel-maildir-store.c:168
+#: ../camel/providers/local/camel-mbox-store.c:168
+#: ../camel/providers/local/camel-mbox-store.c:180
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Non é posíbel crear o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:156
+#: ../camel/providers/local/camel-mbox-store.c:139
+#: ../camel/providers/local/camel-mh-store.c:211
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Non é posíbel obter o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:160
+#: ../camel/providers/local/camel-mbox-store.c:147
+#: ../camel/providers/local/camel-mh-store.c:218
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Non é posíbel obter o cartafol '%s': o cartafol non existe."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:184
 #, c-format
 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:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:229
+#: ../camel/providers/local/camel-maildir-store.c:267
+#: ../camel/providers/local/camel-mh-store.c:267
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Non foi posíbel eliminar o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:231
 msgid "not a maildir directory"
 msgstr "non é un cartafol maildir"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:435
+#: ../camel/providers/local/camel-spool-store.c:322
+#: ../camel/providers/local/camel-spool-store.c:336
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Non foi posíbel examinar o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-summary.c:422
+#: ../camel/providers/local/camel-maildir-summary.c:541
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Non é posíbel abrir o camiño do cartafol maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:534
 msgid "Checking folder consistency"
 msgstr "Comprobando a coherencia do cartafol"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:627
 msgid "Checking for new messages"
 msgstr "Comprobando mensaxes novas"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:714
+#: ../camel/providers/local/camel-mbox-summary.c:516
+#: ../camel/providers/local/camel-mbox-summary.c:712
+#: ../camel/providers/local/camel-mbox-summary.c:832
+#: ../camel/providers/local/camel-spool-summary.c:145
 msgid "Storing folder"
 msgstr "Almacenando o cartafol"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
+#: ../camel/providers/local/camel-mbox-folder.c:155
+#: ../camel/providers/local/camel-spool-folder.c:139
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Non é posíbel crear o bloqueo de cartafol en %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:231
+#: ../camel/providers/local/camel-mbox-folder.c:219
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Non é posíbel abrir a caixa de correo: %s: %s\n"
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
+#: ../camel/providers/local/camel-mbox-folder.c:285
 msgid "Mail append canceled"
 msgstr "A adición de correo cancelouse"
 
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:288
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non é posíbel engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:454
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar danado sen recuperación posíbel."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
+#: ../camel/providers/local/camel-mbox-folder.c:461
+#: ../camel/providers/local/camel-mh-folder.c:238
 msgid "Message construction failed."
 msgstr "Produciuse un fallo na construción da mensaxe."
 
-#: ../camel/providers/local/camel-mbox-store.c:164
-#: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:158
+#: ../camel/providers/local/camel-mbox-store.c:357
 msgid "Cannot create a folder by this name."
 msgstr "Non é posíbel crear un cartafol con este nome."
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:190
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Non é posíbel obter o cartafol '%s': non é un ficheiro estándar."
 
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:220
+#: ../camel/providers/local/camel-mbox-store.c:231
+#: ../camel/providers/local/camel-mbox-store.c:254
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3890,166 +3458,166 @@ msgstr ""
 "Non foi posíbel eliminar o cartafol '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:239
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' non é un ficheiro normal."
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:246
 #, c-format
 msgid "Folder '%s' is not empty. Not deleted."
 msgstr "O cartafol '%s' non está baleiro. Non se eliminou."
 
-#: ../camel/providers/local/camel-mbox-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:268
+#: ../camel/providers/local/camel-mbox-store.c:280
 #, c-format
 msgid "Could not delete folder summary file '%s': %s"
 msgstr "Non foi posíbel eliminar o ficheiro de resumo de cartafoles '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:370
 #, c-format
 msgid "Cannot create directory '%s': %s."
 msgstr "Non é posíbel crear o directorio '%s': %s."
 
-#: ../camel/providers/local/camel-mbox-store.c:390
+#: ../camel/providers/local/camel-mbox-store.c:384
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posíbel crear o cartafol: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:392
+#: ../camel/providers/local/camel-mbox-store.c:386
 msgid "Folder already exists"
 msgstr "O cartafol xa existe"
 
-#: ../camel/providers/local/camel-mbox-store.c:483
+#: ../camel/providers/local/camel-mbox-store.c:477
 msgid "The new folder name is illegal."
 msgstr "O novo nome do cartafol non é correcto."
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:490
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Non foi posíbel renomear '%s': '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:571
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Non foi posíbel renomear o cartafol '%s' a %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:522
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Non é posíbel abrir o cartafol: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:572
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 "Produciuse un erro moi grave no analizador de correo próximo á posición %ld "
 "no cartafol %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:649
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Non é posíbel verificar o cartafol: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:717
+#: ../camel/providers/local/camel-mbox-summary.c:837
+#: ../camel/providers/local/camel-spool-summary.c:150
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Non foi posíbel abrir o ficheiro: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:729
+#: ../camel/providers/local/camel-spool-summary.c:163
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non é posíbel abrir a caixa de correo temporal: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:742
+#: ../camel/providers/local/camel-mbox-summary.c:947
 #, 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:761
+#: ../camel/providers/local/camel-mbox-summary.c:751
 #, 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:776
+#: ../camel/providers/local/camel-mbox-summary.c:766
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posíbel renomear o cartafol: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:848
+#: ../camel/providers/local/camel-mbox-summary.c:1074
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Non foi posíbel almacenar o cartafol: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:887
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1104
+#: ../camel/providers/local/camel-mbox-summary.c:1112
 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:1046
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1037
+#: ../camel/providers/local/camel-spool-summary.c:329
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoñecido: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1180
+#: ../camel/providers/local/camel-mbox-summary.c:1206
 #, 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:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1197
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Produciuse un erro ao escribir na caixa de correo temporal: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
+#: ../camel/providers/local/camel-mh-folder.c:176
 msgid "MH append message canceled"
 msgstr "Cancelouse o proceso de engadir mensaxe MH"
 
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:179
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non se lle pode engadir a mensaxe ao cartafol mh: %s: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:226
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Non foi posíbel crear o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:238
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Non é posíbel obter o cartafol '%s': non é un cartafol."
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:235
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Non é posíbel abrir o camiño do cartafol MH: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:126
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "Non é posíbel abrir o spool '%s': %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:138
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "O spool '%s' non é un ficheiro ou cartafol estándar"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:157
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "Non existe o cartafol '%s/%s'."
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:167
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4058,12 +3626,12 @@ msgstr ""
 "Non foi posíbel abrir o cartafol '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:171
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "O cartafol '%s' non existe."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:176
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4072,48 +3640,48 @@ msgstr ""
 "Non foi posíbel crear o cartafol '%s':\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:184
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' non é un ficheiro de caixa de correo."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:201
 msgid "Store does not support an INBOX"
 msgstr "O almacenamento non permite unha caixa de entrada"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:213
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Ficheiro de correo spool %s"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:213
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Ã?rbore de cartafol spool %s"
 
-#: ../camel/providers/local/camel-spool-store.c:227
+#: ../camel/providers/local/camel-spool-store.c:221
 msgid "Spool folders cannot be renamed"
 msgstr "Non é posíbel renomear os cartafoles spool"
 
-#: ../camel/providers/local/camel-spool-store.c:235
+#: ../camel/providers/local/camel-spool-store.c:229
 msgid "Spool folders cannot be deleted"
 msgstr "Non é posíbel elminar os cartafoles de spool"
 
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:175
+#: ../camel/providers/local/camel-spool-summary.c:185
+#: ../camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Non foi posíbel sincronizar o cartafol temporal %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Non foi posíbel sincronizar o cartafol spool %s: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:241
+#: ../camel/providers/local/camel-spool-summary.c:258
+#: ../camel/providers/local/camel-spool-summary.c:269
 #, c-format
 msgid ""
 "Could not sync spool folder %s: %s\n"
@@ -4122,50 +3690,58 @@ msgstr ""
 "Non foi posíbel sincronizar o cartafol spool %s: %s\n"
 "O cartafol pode estar danado, gardouse unha copia en '%s'"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:119
+#: ../camel/providers/nntp/camel-nntp-folder.c:175
+#: ../camel/providers/nntp/camel-nntp-folder.c:207
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Erro interno: UID nun formato incorrecto: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:156
+#: ../camel/providers/nntp/camel-nntp-folder.c:231
+#: ../camel/providers/nntp/camel-nntp-folder.c:392
+#: ../camel/providers/nntp/camel-nntp-store.c:1307
+#: ../camel/providers/nntp/camel-nntp-summary.c:412
+msgid "User cancelled the operation"
+msgstr "O usuario cancelou a operación"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:348
+#: ../camel/providers/nntp/camel-nntp-folder.c:351
+#: ../camel/providers/nntp/camel-nntp-folder.c:394
+#: ../camel/providers/nntp/camel-nntp-folder.c:396
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Produciuse un fallo no envío: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:414
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 "Non pode enviar mensaxes NNTP mentres estea a traballar en modo sen conexión!"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:425
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Non pode copiar mensaxes dun cartafol NNTP!"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid ""
 "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr ""
 "_Mostrar os cartafoles cunha anotación abreviada (por ex. c.o.linux en vez "
 "de comp.os.linux)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Mostrar os nomes relativos dos cartafoles no _diálogo de subscrición"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
 msgid "USENET news"
 msgstr "Noticias USENET"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:55
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Este é un provedor para ler e enviar aos grupos de noticias de USENET."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:74
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4173,22 +3749,29 @@ msgstr ""
 "Esta opción autenticarase co servidor NNTP usando un contrasinal de texto "
 "simple."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:186
+#: ../camel/providers/nntp/camel-nntp-store.c:205
+#: ../camel/providers/pop3/camel-pop3-store.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:258
+msgid "Connection canceled"
+msgstr "Conexión cancelada"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:208
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Non foi posíbel ler o saúdo de %s: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:220
 #, 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:410
+#: ../camel/providers/nntp/camel-nntp-store.c:402
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:811
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4199,7 +3782,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:905
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4209,7 +3792,7 @@ msgstr ""
 "\n"
 "o grupo non existe. O elemento seleccionado é probablemente un cartafol pai."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:937
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4219,130 +3802,126 @@ msgstr ""
 "\n"
 "o grupo de noticias non existe!"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:962
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Non pode crear un cartafol dun almacenamento de Noticias: en vez disto "
 "subscríbao."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:970
 msgid "You cannot rename a folder in a News store."
 msgstr "Non pode renomear o cartafol dun almacenamento de Noticias."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:978
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Non pode eliminar un cartafol dun almacenamento de Noticias: en vez diso "
 "desubscríbase."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
+#: ../camel/providers/nntp/camel-nntp-store.c:1172
 msgid "Authentication requested but no username provided"
 msgstr "Requírese a autenticación mais non se forneceu ningún nome de usuario"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1184
 #, c-format
 msgid "Cannot authenticate to server: %s"
 msgstr "Non é posíbel autenticar co servidor: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
+#: ../camel/providers/nntp/camel-nntp-store.c:1309
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "A orde NNTP fallou: %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
+#: ../camel/providers/nntp/camel-nntp-store.c:1363
 msgid "Not connected."
 msgstr "Non conectado."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
+#: ../camel/providers/nntp/camel-nntp-store.c:1416
 #, c-format
 msgid "No such folder: %s"
 msgstr "Non existe o cartafol: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:261
+#: ../camel/providers/nntp/camel-nntp-summary.c:362
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Examinando as mensaxes novas"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:271
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Resposta inesperada do servidor desde xover: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:376
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Resposta inesperada do servidor desde head: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Use cancelar"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:414
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Produciuse un fallo na operación: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "Recibindo o resumo de POP"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Non é posíbel obter o resumo POP: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging old messages"
 msgstr "Expurgando as mensaxes antigas"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:316
 msgid "Expunging deleted messages"
 msgstr "Expurgando as mensaxes eliminadas"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
+#: ../camel/providers/pop3/camel-pop3-folder.c:533
+#: ../camel/providers/pop3/camel-pop3-folder.c:555
 #, c-format
 msgid "No message with UID %s"
 msgstr "Non existe a mensaxe co UID %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: ../camel/providers/pop3/camel-pop3-folder.c:559
+#: ../camel/providers/pop3/camel-pop3-folder.c:562
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
+#: ../camel/providers/pop3/camel-pop3-folder.c:651
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Almacenamento da mensaxe"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Deixar as mensaxes no servidor"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#: ../camel/providers/pop3/camel-pop3-provider.c:43
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Eliminar despois de %s días"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:45
 msgid "Disable _support for all POP3 extensions"
 msgstr "Desactivar _compatibilidade para todas as extensións POP3"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:53
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "Para conectarse con servidores POP e descargar correo deles."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:72
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4350,7 +3929,7 @@ msgstr ""
 "Esta opción conectarase co servidor POP usando un contrasinal de texto "
 "simple. Esta é a única opción que permiten moitos servidores POP."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:82
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4360,38 +3939,48 @@ msgstr ""
 "través do protocolo APOP. Pode que isto non funcione para todos os usuarios, "
 "incluso en servidores que indican que o permiten."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:156
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:219
 #, 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:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:236
+#: ../camel/providers/pop3/camel-pop3-store.c:265
+#: ../camel/providers/pop3/camel-pop3-store.c:271
 #, 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:247
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 msgid "STLS not supported by server"
 msgstr "O servidor non é compatíbel con STLS"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:253
 #, 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:281
+#: ../camel/providers/pop3/camel-pop3-store.c:266
+msgid "TLS negotiations failed"
+msgstr "As negociacións TLS fallaron"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:272
 msgid "TLS is not available in this build"
 msgstr "TLS non está dispoñíbel nesta compilación"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
+#: ../camel/providers/pop3/camel-pop3-store.c:378
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Non foi posíbel estabelecer a conexión co servidor POP %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:419
+#: ../camel/providers/pop3/camel-pop3-store.c:557
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4400,23 +3989,24 @@ msgstr ""
 "Non foi posíbel realizar a conexión co servidor POP %s: non hai "
 "compatibilidade co mecanismo de autenticación solicitado."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:438
 #, c-format
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "Produciuse un fallo no inicio de sesión '%s' SASL para o servidor %s%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:452
 #, 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:479
+#: ../camel/providers/pop3/camel-pop3-store.c:471
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Non foi posíbel autenticar co servidor POP %s: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:530
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4426,7 +4016,7 @@ msgstr ""
 "incorrecto. Sospéitase dun ataque de suplantación. Contacte co seu "
 "administrador."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:571
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4435,7 +4025,8 @@ msgstr ""
 "Non fio posíbel realizar a conexión co servidor POP %s.\n"
 "Produciuse un erro ao enviar o contrasinal: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:581
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4444,7 +4035,8 @@ 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:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:591
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4453,200 +4045,200 @@ msgstr ""
 "Non foi posíbel realizar a conexión co servidor POP %s.\n"
 "Produciuse un erro ao enviar o contrasinal: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:697
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Non existe o cartafol '%s'."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 "Para entregar o correo pasándollo ao programa \"sendmail\" no sistema local."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:107
 msgid "Could not parse recipient list"
 msgstr "Non foi posíbel analizar a lista de destinatarios"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:138
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Non foi posíbel crear unha canalización para o sendmail: %s: o correo non se "
 "enviou"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:159
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Non foi posíbel facer un fork do sendmail: %s: o correo non se enviou"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:229
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail saíu co sinal %s: o correo non se enviou."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:236
 #, 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:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:241
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail saíu con estado %d: o correo non se enviou."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:255
 msgid "sendmail"
 msgstr "sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:257
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:45
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 "Para entregar o correo conectándose a un servidor de correo remoto usando "
 "SMTP."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:154
 msgid "Syntax error, command unrecognized"
 msgstr "Existe un erro de sintaxe; a orde no se recoñeceu"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:156
 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:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:158
 msgid "Command not implemented"
 msgstr "A orde non está implementada"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:160
 msgid "Command parameter not implemented"
 msgstr "O parámetro da orde non está implementada"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:162
 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:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:164
 msgid "Help message"
 msgstr "Mensaxe de axuda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:166
 msgid "Service ready"
 msgstr "Servizo preparado"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:168
 msgid "Service closing transmission channel"
 msgstr "Servizo pechando o canal de transmisión"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:170
 msgid "Service not available, closing transmission channel"
 msgstr "Servizo non dispoñíbel; pechando o canal de transmisión"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:172
 msgid "Requested mail action okay, completed"
 msgstr "A acción de correo solicitada terminou correctamente"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:174
 msgid "User not local; will forward to <forward-path>"
 msgstr "O usuario non é local; remitirase a <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr ""
 "A acción de correo pedida non se realizou: a caixa de correo non está "
 "dispoñíbel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "A acción pedida non se realizou: a caixa de correo non está dispoñíbel"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Requested action aborted: error in processing"
 msgstr "Cancelouse a acción solicitada: produciuse un erro no procesamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:182
 msgid "User not local; please try <forward-path>"
 msgstr "Usuario non local; ténteo con <forward-path>"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:184
 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:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Cancelouse a acción solicitada: excedeuse a asignación de almacenamento"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "A acción pedida non se realizou: o nome da caixa de correo non se admite"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:190
 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:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Transaction failed"
 msgstr "Produciuseuse un fallo na transacción"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:196
 msgid "A password transition is needed"
 msgstr "Precísase unha transición de contrasinal"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Authentication mechanism is too weak"
 msgstr "O mecanismo de autenticación é demasiado débil"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
 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:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:202
 msgid "Temporary authentication failure"
 msgstr "Produciuse un fallo temporal de autenticación"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
+#: ../camel/providers/smtp/camel-smtp-transport.c:283
 msgid "Welcome response error"
 msgstr "Erro da resposta de benvida"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
+#: ../camel/providers/smtp/camel-smtp-transport.c:318
+#: ../camel/providers/smtp/camel-smtp-transport.c:351
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Non foi posíbel conectar co servidor SMTP %s en modo seguro: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
+#: ../camel/providers/smtp/camel-smtp-transport.c:327
 #, c-format
 msgid "STARTTLS command failed: %s"
 msgstr "Produciuse un fallo na orde STARTTLS: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
+#: ../camel/providers/smtp/camel-smtp-transport.c:342
 msgid "STARTTLS command failed"
 msgstr "Produciuse un fallo na orde STARTTLS"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
+#: ../camel/providers/smtp/camel-smtp-transport.c:483
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "O servidor SMTP %s non é compatíbel co tipo de autenticación %s solicitado."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:567
+#: ../camel/providers/smtp/camel-smtp-transport.c:554
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -4657,95 +4249,95 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
+#: ../camel/providers/smtp/camel-smtp-transport.c:687
 #, c-format
 msgid "SMTP server %s"
 msgstr "Servidor de SMTP %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
+#: ../camel/providers/smtp/camel-smtp-transport.c:689
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "Entrega de correo SMTP vía %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
+#: ../camel/providers/smtp/camel-smtp-transport.c:707
 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:726
+#: ../camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: sender address not valid."
 msgstr ""
 "Non é posíbel enviar a mensaxe: o enderezo do remitente non é correcto."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:730
+#: ../camel/providers/smtp/camel-smtp-transport.c:717
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
+#: ../camel/providers/smtp/camel-smtp-transport.c:732
 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:756
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 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:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:972
 msgid "SMTP Greeting"
 msgstr "Saúdo SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
+#: ../camel/providers/smtp/camel-smtp-transport.c:997
 #, c-format
 msgid "HELO command failed: %s"
 msgstr "Produciuse un fallo na orde HELO: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
+#: ../camel/providers/smtp/camel-smtp-transport.c:1014
 msgid "HELO command failed"
 msgstr "Fallou a orde HELO"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1080
 msgid "SMTP Authentication"
 msgstr "Autenticación SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1086
 msgid "Error creating SASL authentication object."
 msgstr "Produciuse un erro ao crear o obxecto de autenticación SASL."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
+#: ../camel/providers/smtp/camel-smtp-transport.c:1103
+#: ../camel/providers/smtp/camel-smtp-transport.c:1114
 #, c-format
 msgid "AUTH command failed: %s"
 msgstr "Produciuse un fallo na orde AUTH: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
+#: ../camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "AUTH command failed"
 msgstr "Produciuse un fallo na orde AUTH"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
+#: ../camel/providers/smtp/camel-smtp-transport.c:1190
 msgid "Bad authentication response from server.\n"
 msgstr "A resposta de autenticación do servidor non é correcta.\n"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
+#: ../camel/providers/smtp/camel-smtp-transport.c:1217
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "Produciuse un fallo na orde MAIL FROM : %s:  o correo non se enviou"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
+#: ../camel/providers/smtp/camel-smtp-transport.c:1234
 msgid "MAIL FROM command failed"
 msgstr "Produciuse un fallo na orde MAIL FROM"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
+#: ../camel/providers/smtp/camel-smtp-transport.c:1258
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "Produciuse un erro na orde RCPT TO: %s: o correo non se enviou"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
+#: ../camel/providers/smtp/camel-smtp-transport.c:1277
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> fallou"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
+#: ../camel/providers/smtp/camel-smtp-transport.c:1317
+#: ../camel/providers/smtp/camel-smtp-transport.c:1386
+#: ../camel/providers/smtp/camel-smtp-transport.c:1405
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "Produciuse un erro na orde DATA: %s: o correo non se enviou"
@@ -4753,26 +4345,26 @@ msgstr "Produciuse un erro na orde DATA: %s: o correo non se enviou"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: ../camel/providers/smtp/camel-smtp-transport.c:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
+#: ../camel/providers/smtp/camel-smtp-transport.c:1334
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
 msgid "DATA command failed"
 msgstr "Produciuse un fallo na orde DATA"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
+#: ../camel/providers/smtp/camel-smtp-transport.c:1444
 #, c-format
 msgid "RSET command failed: %s"
 msgstr "Produciuse un fallo na orde RSET: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
+#: ../camel/providers/smtp/camel-smtp-transport.c:1460
 msgid "RSET command failed"
 msgstr "Produciuse un fallo na orde RSET"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
+#: ../camel/providers/smtp/camel-smtp-transport.c:1483
 #, c-format
 msgid "QUIT command failed: %s"
 msgstr "Produciuse un fallo na orde QUIT: %s"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
+#: ../camel/providers/smtp/camel-smtp-transport.c:1497
 msgid "QUIT command failed"
 msgstr "Produciuse un fallo na orde QUIT"
 
@@ -4862,7 +4454,7 @@ msgstr "En espera"
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1902
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
@@ -4870,7 +4462,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:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1893
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
@@ -4878,7 +4470,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:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1898
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
@@ -4886,79 +4478,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:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1889
 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:1653
+#: ../libedataserver/e-time-utils.c:1655
 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:1658
+#: ../libedataserver/e-time-utils.c:1660
 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:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1765
+#: ../libedataserver/e-time-utils.c:1884
 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:1668
+#: ../libedataserver/e-time-utils.c:1670
 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:1672
+#: ../libedataserver/e-time-utils.c:1674
 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:1677
+#: ../libedataserver/e-time-utils.c:1679
 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:1682
+#: ../libedataserver/e-time-utils.c:1684
 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:1687
+#: ../libedataserver/e-time-utils.c:1689
 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:1692
+#: ../libedataserver/e-time-utils.c:1694
 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:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1768
 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:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1946
 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:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1830 ../libedataserver/e-time-utils.c:1938
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4966,24 +4558,24 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1943
 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:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1839 ../libedataserver/e-time-utils.c:1935
 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:1838
+#: ../libedataserver/e-time-utils.c:1842
 msgid "%H%M"
 msgstr "%H%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1846
 msgid "%I %p"
 msgstr "%I %p"
 
@@ -4995,26 +4587,26 @@ msgstr "Accedendo anonimamente ao servidor LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "Produciuse un fallo ao autenticarse.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:143
+#: ../libedataserverui/e-categories-dialog.c:145
 msgid "Category Icon"
 msgstr "Icona de categoría"
 
-#: ../libedataserverui/e-categories-dialog.c:149
+#: ../libedataserverui/e-categories-dialog.c:151
 msgid "_No Image"
 msgstr "_Sen imaxe"
 
-#: ../libedataserverui/e-categories-dialog.c:370
+#: ../libedataserverui/e-categories-dialog.c:372
 #, 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"
 
-#: ../libedataserverui/e-categories-dialog.c:678
+#: ../libedataserverui/e-categories-dialog.c:680
 msgid "Icon"
 msgstr "Icona"
 
-#: ../libedataserverui/e-categories-dialog.c:683
+#: ../libedataserverui/e-categories-dialog.c:685
 msgid "Category"
 msgstr "Categoría"
 
@@ -5031,8 +4623,8 @@ msgid "Category _Name"
 msgstr "_Nome de categoría"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:4
-msgid "Item(s) _belong to these categories:"
-msgstr "Elemento(s) que _pertencen a estas _categorías:"
+msgid "Currently _used categories:"
+msgstr "Categorías en _uso actualmente:"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
@@ -5046,19 +4638,11 @@ msgstr "_Editar"
 msgid "categories"
 msgstr "categorías"
 
-#: ../libedataserverui/e-category-completion.c:290
+#: ../libedataserverui/e-category-completion.c:292
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Crear categoría \"%s\""
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Información de cor"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "A cor para renderizar"
-
 #: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "Seleccionar contactos da axenda de enderezos"
@@ -5113,58 +4697,58 @@ msgid "_Search:"
 msgstr "_Buscar:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2511
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpandir %s en liña"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2526
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_iar %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2536
 #, c-format
 msgid "C_ut %s"
 msgstr "Co_rtar %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2553
 #, c-format
 msgid "_Edit %s"
 msgstr "_Editar %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:479
 #, c-format
 msgid "_Delete %s"
 msgstr "E_liminar %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:257
 #, c-format
 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"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:1116
 msgid "You have the Caps Lock key on."
 msgstr "A tecla Bloq Maiús está activada."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:1238
 msgid "_Remember this passphrase"
 msgstr "_Lembrar esta frase de paso"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:1239
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Lembrar esta frase de paso durante a sesión"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:1244
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:1245
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar este contrasinal durante a sesión"
 
@@ -5173,26 +4757,324 @@ msgstr "_Lembrar este contrasinal durante a sesión"
 msgid "Select destination"
 msgstr "Escolla un destino"
 
-#: ../libedataserverui/e-source-selector-dialog.c:156
+#: ../libedataserverui/e-source-selector-dialog.c:172
 msgid "_Destination"
 msgstr "_Destino"
 
-#: ../servers/groupwise/e-gw-connection.c:225
+#: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid connection"
 msgstr "A conexión non é correcta"
 
-#: ../servers/groupwise/e-gw-connection.c:229
+#: ../servers/groupwise/e-gw-connection.c:231
 msgid "Invalid response from server"
 msgstr "A resposta do servidor non é correcta"
 
-#: ../servers/groupwise/e-gw-connection.c:231
+#: ../servers/groupwise/e-gw-connection.c:233
 msgid "No response from the server"
 msgstr "Non houbo resposta do servidor"
 
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../servers/groupwise/e-gw-connection.c:239
 msgid "Bad parameter"
 msgstr "O parámetro non é correcto"
 
+#~ msgid "Unsupported operation: append message: for %s"
+#~ msgstr "Operación non compatíbel: anexar unha mensaxe: para %s"
+
+#~ msgid "Unsupported operation: search by expression: for %s"
+#~ msgstr "Operación non compatíbel: busca por expresión: para %s"
+
+#~ msgid "Unsupported operation: count by expression: for %s"
+#~ msgstr "Operación non compatíbel: conta por expresión: para %s"
+
+#~ msgid "Unsupported operation: search by UIDs: for %s"
+#~ msgstr "Operación non compatíbel: busca polos UID: para %s"
+
+#~ msgid "Cannot create folder: Invalid operation on this store"
+#~ msgstr ""
+#~ "Non é posíbel crear o cartafol: a operación non é válida neste "
+#~ "almacenamento"
+
+#~ msgid "Learning junk"
+#~ msgstr "Aprendendo de correo lixo"
+
+#~ msgid "Learning non-junk"
+#~ msgstr "Aprendendo de correo que non é lixo"
+
+#~ msgid "Camel session doesn't support forwarding of a message."
+#~ msgstr "A sesión Camel non é compatíbel co reenvío dunha mensaxe."
+
+#~ msgid "import keys: unimplemented"
+#~ msgstr "importar chaves: non implementado"
+
+#~ msgid "export keys: unimplemented"
+#~ msgstr "exportar chaves: non implementado"
+
+#~ msgid "Namespace"
+#~ msgstr "Espazo de nomes"
+
+#~ msgid "Hula"
+#~ msgstr "Hula"
+
+#~ msgid "For accessing Hula servers"
+#~ msgstr "Para acceder a servidores Hula"
+
+#~ msgid ""
+#~ "This option will connect to the Hula server using a plaintext password."
+#~ msgstr ""
+#~ "Esta opción conectarase co servidor Hula usando un contrasinal de texto "
+#~ "simple."
+
+#~ msgid "Failed sending command to IMAP server %s: %s"
+#~ msgstr "Non foi posíbel enviarlle a orde ao servidor IMAP %s: %s"
+
+#~ msgid "Unexpected response from IMAP4 server %s: %s"
+#~ msgstr "Resposta do servidor IMAP4 inesperada %s: %s"
+
+#~ msgid "Unexpected greeting from IMAP server %s."
+#~ msgstr "Saúdo inesperado do servidor IMAP %s."
+
+#~ msgid "Cannot select folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel seleccionar o cartafol '%s': o nome da caixa de correo non "
+#~ "é correcto"
+
+#~ msgid "Cannot select folder '%s': Bad command"
+#~ msgstr "Non é posíbel seleccionar o cartafol '%s': a orde non é correcta"
+
+#~ msgid "Failed to send command to IMAP server %s: %s"
+#~ msgstr "Produciuse un fallo no envío da orde para o servidor IMAP %s: %s"
+
+#~ msgid "service unavailable"
+#~ msgstr "servizo non dispoñíbel"
+
+#~ msgid "IMAP4 server %s unexpectedly disconnected: %s"
+#~ msgstr "O servidor IMAP4 %s desconectouse inesperadamente: %s"
+
+#~ msgid ""
+#~ "Enable extended Mailing-List detection required for some filter and "
+#~ "vFolder rules"
+#~ msgstr ""
+#~ "Activar a detección de lista de mensaxes necesaria para algunhas regras "
+#~ "de filtros e cartafoles virtuais"
+
+#~ msgid "Expire cached messages that haven't been read in X seconds"
+#~ msgstr "Expirar as mensaxes na caché que non foran lidas en X segundos"
+
+#~ msgid "Expire cached messages older than X seconds"
+#~ msgstr "Expirar as mensaxes na caché máis antigas que X segundos"
+
+#~ msgid "Cannot access folder '%s': %s"
+#~ msgstr "Non é posíbel acceder ao cartafol '%s': %s"
+
+#~ msgid "Cannot sync flags to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Non é posíbel sincronizar os parámetros para o cartafol '%s': erro "
+#~ "descoñecido"
+
+#~ msgid "Cannot sync flags to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel sincronizar os parámetros para o cartafol '%s': orde "
+#~ "incorrecta"
+
+#~ msgid "Cannot expunge folder '%s': Unknown error"
+#~ msgstr "Non é posíbel expurgar o cartafol '%s': erro descoñecido"
+
+#~ msgid "Cannot expunge folder '%s': Bad command"
+#~ msgstr "Non é posíbel expurgar o cartafol '%s': a orde é incorrecta"
+
+#~ msgid "Cannot get message %s from folder '%s': No such message"
+#~ msgstr ""
+#~ "Non é posíbel obter a mensaxe %s do cartafol '%s': a mensaxe non existe"
+
+#~ msgid "Cannot get message %s from folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel obter a mensaxe %s do cartafol '%s': a orde non é correcta"
+
+#~ msgid "Cannot append message to folder '%s': Folder is read-only"
+#~ msgstr ""
+#~ "Non é posíbel engadir a mensaxe ao cartafol '%s': o cartafol é só de "
+#~ "lectura"
+
+#~ msgid "Cannot append message to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Non é posíbel engadir a mensaxe ao cartafol '%s': o erro é descoñecido"
+
+#~ msgid "Cannot append message to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel engadir a mensaxe ao cartafol '%s': a orde non é correcta"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Non é posíbel mover mensaxes do cartafol '%s' ao cartafol '%s': o erro é "
+#~ "descoñecido"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
+#~ msgstr ""
+#~ "Non é posíbel copiar mensaxes do cartafol '%s' ao cartafol '%s': o erro é "
+#~ "descoñecido"
+
+#~ msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel mover mensaxes do cartafol '%s' ao cartafol '%s': a orde "
+#~ "non é válida"
+
+#~ msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel copiar mensaxes do cartafol '%s' ao cartafol '%s': a orde "
+#~ "non é válida"
+
+#~ msgid "Check new messages for _Junk contents"
+#~ msgstr "Verificar nas novas mensaxes os contidos _non desexados"
+
+# (pofilter) accelerators: accelerator _ is missing from translation
+#~ msgid "Only check for Junk messa_ges in the INBOX folder"
+#~ msgstr ""
+#~ "Verificar as mensa_xes non desexadas no cartafol da caixa de entrada"
+
+#~ msgid "IMAP4rev1"
+#~ msgstr "IMAP4rev1"
+
+#~ msgid "For reading and storing mail on IMAPv4rev1 servers."
+#~ msgstr "Para ler e almacenar correo en servidores IMAPv4rev1."
+
+#~ msgid ""
+#~ "This option will connect to the IMAPv4rev1 server using a plaintext "
+#~ "password."
+#~ msgstr ""
+#~ "Esta opción conectarase ao servidor IMAPv4rev1 usando un contrasinal de "
+#~ "texto simple."
+
+#~ msgid ""
+#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
+#~ "support STARTTLS"
+#~ msgstr ""
+#~ "Produciuse un fallo ao conectar co servidor IMAP %s en modo seguro: o "
+#~ "servidor non permite STARTTLS"
+
+#~ msgid ""
+#~ "Cannot authenticate to IMAP server %s using the %s authentication "
+#~ "mechanism"
+#~ msgstr ""
+#~ "Non é posíbel autenticar no servidor IMAP %s utilizando o mecanismo de "
+#~ "autenticación %s"
+
+#~ msgid "Cannot authenticate to IMAP server %s using %s"
+#~ msgstr "Non é posíbel autenticar no servidor IMAP %s empregando %s"
+
+#~ msgid "Cannot create IMAP folders in offline mode."
+#~ msgstr "Non é posíbel crear cartafol IMAP en modo sen conexión."
+
+#~ msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
+#~ msgstr ""
+#~ "Non é posíbel obter o cartafol '%s' do servidor IMAP %s: erro descoñecido"
+
+#~ msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
+#~ msgstr "Non é posíbel obter a información LIST '%s' do servidor IMAP %s: %s"
+
+#~ msgid "Bad command"
+#~ msgstr "A orde é mala"
+
+#~ msgid "Cannot create folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel crear o cartafol '%s': o nome da caixa de correo non é "
+#~ "correcto"
+
+#~ msgid "Cannot create folder '%s': Bad command"
+#~ msgstr "Non é posíbel crear o cartafol '%s': a orde non é correcta"
+
+#~ msgid "Cannot delete folder '%s': Special folder"
+#~ msgstr "Non é posíbel eliminar o cartafol '%s': cartafol especial"
+
+#~ msgid "Cannot delete IMAP folders in offline mode."
+#~ msgstr "Non é posíbel eliminar os cartafoles IMAP no modo sen conexión."
+
+#~ msgid "Cannot delete folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel eliminar o cartafol '%s': o nome da caixa de correo non é "
+#~ "correcto"
+
+#~ msgid "Cannot delete folder '%s': Bad command"
+#~ msgstr "Non é posíbel eliminar o cartafol '%s': a orde non é correcta"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Special folder"
+#~ msgstr "Non é posíbel renomear o cartafol '%s' a '%s': cartafol especial"
+
+#~ msgid "Cannot rename IMAP folders in offline mode."
+#~ msgstr "Non é posíbel renomear os cartafoles IMAP no modo sen conexión."
+
+#~ msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel renomear o cartafol '%s' a '%s': o nome da caixa de correo "
+#~ "non é correcto"
+
+#~ msgid "Cannot rename folder '%s' to '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel renomear o cartafol '%s' a '%s': a orde non é correcta"
+
+#~ msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
+#~ msgstr ""
+#~ "Non é posíbel obter información de '%s' para o patrón '%s' no servidor "
+#~ "IMAP %s: %s"
+
+#~ msgid "Cannot subscribe to IMAP folders in offline mode."
+#~ msgstr "Non é posíbel subscribir aos cartafoles IMAP en modo sen conexión."
+
+#~ msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel subscribir ao cartafol '%s': o nome da caixa de correo non "
+#~ "é correcto"
+
+#~ msgid "Cannot subscribe to folder '%s': Bad command"
+#~ msgstr "Non é posíbel subscribir ao cartafol '%s': a orde non é correcta"
+
+#~ msgid "Cannot unsubscribe from IMAP folders in offline mode."
+#~ msgstr ""
+#~ "Non é posíbel eliminar a subscrición dos cartafoles IMAP en modo sen "
+#~ "conexión."
+
+#~ msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
+#~ msgstr ""
+#~ "Non é posíbel eliminar a subscrición do cartafol '%s': o nome da caixa de "
+#~ "correo non é correcto"
+
+#~ msgid "Cannot unsubscribe from folder '%s': Bad command"
+#~ msgstr ""
+#~ "Non é posíbel eliminar a subscrición do cartafol '%s': a orde non é "
+#~ "correcta"
+
+#~ msgid "Scanning for changed messages"
+#~ msgstr "Examinando mensaxes cambiadas"
+
+#~ msgid "IMAP server %s is in an inconsistent state."
+#~ msgstr "O servidor IMAP %s está nun estado inconsistente."
+
+#~ msgid "Fetching envelopes of new messages"
+#~ msgstr "Obtendo os envoltorios das novas mensaxes"
+
+#~ msgid "Unexpected token in response from IMAP server %s: "
+#~ msgstr "Token inesperado na resposta do servidor IMAP %s: "
+
+#~ msgid "No data"
+#~ msgstr "Non hai datos"
+
+#~ msgid "IMAP server %s unexpectedly disconnected: %s"
+#~ msgstr "O servidor IMAP %s desconectouse inesperadamente: %s"
+
+#~ msgid "%sPlease enter the IMAP password for %s %s"
+#~ msgstr "%sIntroduza o contrasinal de IMAP para %s %s"
+
+#~ msgid "Use cancel"
+#~ msgstr "Use cancelar"
+
+#~ msgid "Item(s) _belong to these categories:"
+#~ msgstr "Elemento(s) que _pertencen a estas _categorías:"
+
+#~ msgid "Color Info"
+#~ msgstr "Información de cor"
+
+#~ msgid "The color to render"
+#~ msgstr "A cor para renderizar"
+
 #~ msgid "Could not connect to POP server on %s"
 #~ msgstr "Non foi posíbel conectar ao servidor POP en %s"
 



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