[evolution-data-server] Updated Galician Translation



commit 405a83bc6a26547e8df87c1e88f32804eb44a341
Author: Antón Méixome <meixome mancomun org>
Date:   Fri Nov 13 11:17:29 2009 +0100

    Updated Galician Translation

 po/gl.po | 1521 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 650 insertions(+), 871 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 9226a5a..a44c0a8 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,4 +1,4 @@
-# translation of evolution-data-server-master-po-gl.po to Galician
+# translation of evolution-data-server-master-po-gl-71644.po to Galician
 # Galician translation of Evolution.
 # Copyright (C) 2000 Jesús Bravo �lvarez.
 # Copyright (C) 2001 Manuel A. Fernández Montecelo.
@@ -14,17 +14,16 @@
 # 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.
-# Suso Baleato <suso baleato xunta es>, 2009.
 # Fran Diéguez <fran dieguez glug es>, 2009.
 # Antón Méixome <meixome mancomun org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution-data-server-master-po-gl\n"
+"Project-Id-Version: evolution-data-server-master-po-gl-71644\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-12 13:48+0200\n"
-"PO-Revision-Date: 2009-07-08 15:03+0200\n"
+"POT-Creation-Date: 2009-11-13 11:17+0100\n"
+"PO-Revision-Date: 2009-11-10 14:56+0100\n"
 "Last-Translator: Antón Méixome <meixome mancomun org>\n"
-"Language-Team: Galician <gnome mancomun org>\n"
+"Language-Team: Galician <gnome g11n net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,156 +32,71 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
 msgid "Loading..."
 msgstr "Cargando..."
 
 #: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../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:4508
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4672
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Descargando os contactos (%d)... "
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Actualizando a caché de contactos (%d)... "
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
 msgid "Using Distinguished Name (DN)"
-msgstr "Utilizando Nome Distintivo (DN)"
+msgstr "Utilizando o Nome distintivo (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
 msgid "Using Email Address"
-msgstr "Usando enderezo de correo electrónico"
+msgstr "Usando o enderezo de correo electrónico"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1065
 msgid "Reconnecting to LDAP server..."
 msgstr "Conectando novamente ao servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709
 msgid "Adding contact to LDAP server..."
 msgstr "Engadindo contacto ao servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
 msgstr "Eliminando contacto do servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2280
 msgid "Modifying contact from LDAP server..."
 msgstr "Modificando contacto do servidor LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4369
 msgid "Receiving LDAP search results..."
 msgstr "Recibindo os resultados da busca no LDAP..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4530
 msgid "Error performing search"
 msgstr "Erro ao realizar a busca"
 
-#. translators: the placeholders will be filled by
-#. * function names, e.g.
-#. * "e_book_add_contact" on book before
-#. * "e_book_open
-#: ../addressbook/libebook/e-book.c:287 ../addressbook/libebook/e-book.c:291
-#: ../addressbook/libebook/e-book.c:495 ../addressbook/libebook/e-book.c:499
-#: ../addressbook/libebook/e-book.c:637 ../addressbook/libebook/e-book.c:641
-#: ../addressbook/libebook/e-book.c:727 ../addressbook/libebook/e-book.c:731
-#: ../addressbook/libebook/e-book.c:1024 ../addressbook/libebook/e-book.c:1029
-#: ../addressbook/libebook/e-book.c:1206 ../addressbook/libebook/e-book.c:1210
-#: ../addressbook/libebook/e-book.c:1365 ../addressbook/libebook/e-book.c:1369
-#: ../addressbook/libebook/e-book.c:1570 ../addressbook/libebook/e-book.c:1574
-#: ../addressbook/libebook/e-book.c:1813 ../addressbook/libebook/e-book.c:1817
-#: ../addressbook/libebook/e-book.c:2050 ../addressbook/libebook/e-book.c:2054
-#: ../addressbook/libebook/e-book.c:2257 ../addressbook/libebook/e-book.c:2261
-#: ../addressbook/libebook/e-book.c:3445
-#, c-format
-msgid "\"%s\" on book before \"%s\""
-msgstr "\"%s\" en axenda antes de \"%s\""
-
-#: ../addressbook/libebook/e-book.c:300 ../addressbook/libebook/e-book.c:508
-#: ../addressbook/libebook/e-book.c:650 ../addressbook/libebook/e-book.c:740
-#: ../addressbook/libebook/e-book.c:1039 ../addressbook/libebook/e-book.c:1220
-#: ../addressbook/libebook/e-book.c:1379 ../addressbook/libebook/e-book.c:1583
-#: ../addressbook/libebook/e-book.c:1826 ../addressbook/libebook/e-book.c:2064
-#: ../addressbook/libebook/e-book.c:2270 ../addressbook/libebook/e-book.c:2679
-#: ../addressbook/libebook/e-book.c:2877
-#, c-format
-msgid "book busy"
-msgstr "axenda ocupada"
-
-#: ../addressbook/libebook/e-book.c:331 ../addressbook/libebook/e-book.c:335
-#: ../addressbook/libebook/e-book.c:539 ../addressbook/libebook/e-book.c:543
-#: ../addressbook/libebook/e-book.c:677 ../addressbook/libebook/e-book.c:681
-#: ../addressbook/libebook/e-book.c:767 ../addressbook/libebook/e-book.c:771
-#: ../addressbook/libebook/e-book.c:1066 ../addressbook/libebook/e-book.c:1069
-#: ../addressbook/libebook/e-book.c:1250 ../addressbook/libebook/e-book.c:1253
-#: ../addressbook/libebook/e-book.c:1406 ../addressbook/libebook/e-book.c:1410
-#: ../addressbook/libebook/e-book.c:1619 ../addressbook/libebook/e-book.c:1623
-#: ../addressbook/libebook/e-book.c:1873 ../addressbook/libebook/e-book.c:1877
-#: ../addressbook/libebook/e-book.c:2094 ../addressbook/libebook/e-book.c:2098
-#: ../addressbook/libebook/e-book.c:2296 ../addressbook/libebook/e-book.c:2300
-#: ../addressbook/libebook/e-book.c:2531 ../addressbook/libebook/e-book.c:2705
-#: ../addressbook/libebook/e-book.c:2709 ../addressbook/libebook/e-book.c:2903
-#: ../addressbook/libebook/e-book.c:2907 ../addressbook/libebook/e-book.c:3454
-#, c-format
-msgid "CORBA exception making \"%s\" call"
-msgstr "Excepción Corba ao efectuar a chamada \"%s\""
-
-#: ../addressbook/libebook/e-book.c:2520
-#, c-format
-msgid "%s: there is no current operation"
-msgstr "%s: non existe unha operación en curso"
-
-#: ../addressbook/libebook/e-book.c:2549 ../addressbook/libebook/e-book.c:2594
-#: ../addressbook/libebook/e-book.c:2633
-#, c-format
-msgid "%s: could not cancel"
-msgstr "%s: non se puido cancelar"
-
-#: ../addressbook/libebook/e-book.c:2665 ../addressbook/libebook/e-book.c:2669
-#, c-format
-msgid "\"%s\" on book after \"%s\""
-msgstr "\"%s\" en axenda despois de \"%s\""
-
-#: ../addressbook/libebook/e-book.c:2733
-#, c-format
-msgid "%s: canceled"
-msgstr "%s: cancelado"
-
-#: ../addressbook/libebook/e-book.c:3310
-#, c-format
-msgid "%s: Invalid source."
-msgstr "%s: a orixe non é válida."
-
-#: ../addressbook/libebook/e-book.c:3318 ../addressbook/libebook/e-book.c:3383
-#, c-format
-msgid "%s: no factories available for URI `%s'"
-msgstr "%s: non hai ningunha factoría dispoñíbel para o URI `%s'"
-
-#: ../addressbook/libebook/e-book.c:3329
-#, c-format
-msgid "%s: Could not create EBookListener"
-msgstr "%s: non se puido crear o EBookListener"
-
-#: ../addressbook/libebook/e-book.c:3595
+#: ../addressbook/libebook/e-book.c:1835
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: non existía UID de contacto propio almacenado no Gconf"
 
-#: ../addressbook/libebook/e-book.c:3727
+#: ../addressbook/libebook/e-book.c:1965
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: non existía unha orixe para uid `%s' almacenada no Gconf."
@@ -373,7 +287,7 @@ msgstr "URL do blog"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:176
-#: ../libedataserverui/e-categories-dialog.c:609
+#: ../libedataserverui/e-categories-dialog.c:669
 msgid "Categories"
 msgstr "Categorías"
 
@@ -623,7 +537,7 @@ msgstr "Lista de Id ICQ"
 
 #: ../addressbook/libebook/e-contact.c:254
 msgid "Wants HTML Mail"
-msgstr "Quere correo en HTML"
+msgstr "Quere o correo en HTML"
 
 #: ../addressbook/libebook/e-contact.c:256
 msgid "List"
@@ -638,7 +552,7 @@ msgid "Birth Date"
 msgstr "Data de nacemento"
 
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -722,45 +636,105 @@ msgstr "Enderezo SIP"
 msgid "Unnamed List"
 msgstr "Lista sen nome"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../addressbook/libedata-book/e-data-book-factory.c:292
+#, c-format
+msgid "Empty URI"
+msgstr "URI baleiro"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:307
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "Orixe incorrecta"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "Non é posíbel abrir o libro"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "Non é posíbel eliminar o libro"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "Non se pode obter o contacto"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "Consulta baleira"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "Non se pode autenticar o usuario"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "Non é posíbel engadir o contacto"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "Non é posíbel modificar o contacto"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+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
+msgid "Invalid query"
+msgstr "A consulta non é correcta"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "Non é posíbel obter os cambios"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "Non é posíbel completar a operación"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Aniversario"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
 #, c-format
 msgid "Birthday: %s"
 msgstr "Aniversario: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Datas especiais: %s"
 
 #: ../calendar/backends/file/e-cal-backend-file.c:234
 msgid "Cannot save calendar data: Malformed URI."
-msgstr ""
-"Non se poden gardar os datos do calendario: URI formado incorrectamente."
+msgstr "Non se poden gardar os datos do calendario: URI malformado."
 
 #: ../calendar/backends/file/e-cal-backend-file.c:241
 #: ../calendar/backends/file/e-cal-backend-file.c:247
 msgid "Cannot save calendar data"
 msgstr "Non se poden gardar os datos do calendario"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 msgid "Could not create thread for getting deltas"
 msgstr "Non se puido crear un fío de execución para obter deltas"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
 #: ../calendar/backends/google/e-cal-backend-google.c:1189
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
-#: ../calendar/backends/http/e-cal-backend-http.c:659
+#: ../calendar/backends/http/e-cal-backend-http.c:673
 #: ../calendar/backends/weather/e-cal-backend-weather.c:486
 msgid "Could not create cache file"
 msgstr "Non se puido crear o ficheiro da caché"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
 msgid "Could not create thread for populating cache"
 msgstr "Non se puido crear o fío de execución para encher a caché"
@@ -781,18 +755,17 @@ msgid "Loading %s items"
 msgstr "Cargando %s os elementos"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "Calendario"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:976
 msgid "Invalid server URI"
-msgstr "O URI do servidor non é válido"
+msgstr "O URI do servidor non é correcto"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/libecal/e-cal.c:3750
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
@@ -804,15 +777,15 @@ msgstr "O URI do servidor non é válido"
 msgid "Authentication failed"
 msgstr "A autenticación fallou"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:316
+#: ../calendar/backends/http/e-cal-backend-http.c:330
 msgid "Redirected to Invalid URI"
-msgstr "Redireccionado a un URI que non é válido"
+msgstr "Redireccionado a un URI que non é correcto"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:339
+#: ../calendar/backends/http/e-cal-backend-http.c:353
 msgid "Bad file format."
-msgstr "O formato de ficheiro non é válido."
+msgstr "O formato de ficheiro non é correcto."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:346
+#: ../calendar/backends/http/e-cal-backend-http.c:360
 msgid "Not a calendar."
 msgstr "Non é un calendario."
 
@@ -860,131 +833,131 @@ msgstr "Tempo: treboada"
 msgid "Forecast"
 msgstr "Prognóstico"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1316
 msgid "Untitled appointment"
 msgstr "Cita sen título"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31"
 
@@ -1005,7 +978,7 @@ msgstr "Baixa"
 msgid "Undefined"
 msgstr "Indefinida"
 
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1065 ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduza o contrasinal para %s (usuario %s)"
@@ -1014,94 +987,93 @@ 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:1707
+#: ../calendar/libecal/e-cal.c:1079
 #, 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:5089
+#: ../calendar/libecal/e-cal.c:3722
 msgid "Invalid argument"
-msgstr "O argumento non é válido"
+msgstr "O argumento non é correcto"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3724
 msgid "Backend is busy"
-msgstr "O backend está ocupado"
+msgstr "O motor da infraestrutura está ocupado"
 
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:3726
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "O repositorio está desconectado"
 
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:3728
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
-msgstr "Calendario inexistente"
+msgstr "Tal calendario non existe"
 
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:3730
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "O obxecto non se encontrou"
 
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:3732
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
-msgstr "O obxecto non é válido"
+msgstr "O obxecto non é correcto"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:3734
 msgid "URI not loaded"
 msgstr "O URI non se cargou"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:3736
 msgid "URI already loaded"
 msgstr "O URI xa se cargou"
 
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:3738
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:3740
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "Usuario descoñecido"
 
-#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libecal/e-cal.c:3742
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "O ID do obxecto xa existe"
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:3744
 msgid "Protocol not supported"
 msgstr "O protocolo non é compatíbel"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:3746
 msgid "Operation has been canceled"
 msgstr "A operación cancelouse"
 
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:3748
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "Non se puido cancelar a operación"
 
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:3752
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
 #: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Autenticación requirida"
 
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:3754
 msgid "A CORBA exception has occurred"
 msgstr "Produciuse unha excepción CORBA"
 
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:3756
 #: ../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:743
+#: ../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
@@ -1112,14 +1084,12 @@ msgstr "Produciuse unha excepción CORBA"
 #: ../camel/providers/pop3/camel-pop3-store.c:552
 #: ../camel/providers/pop3/camel-pop3-store.c:559
 #: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:3758
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "Sen erros"
 
@@ -1217,28 +1187,28 @@ msgid ""
 "\"%s\" expects all arguments to be strings or one and only one argument to "
 "be a boolean false (#f)"
 msgstr ""
-"\"%s\" espera que todos os argumentos sexan cadeas ou un e só un argumento "
-"sexa un falso booleano (#f)"
+"\"%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
 msgid "Invalid range"
-msgstr "O intervalo non é válido"
+msgstr "O intervalo non é correcto"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:121
 msgid "Unsupported field"
-msgstr "Campo non compatíbel"
+msgstr "O campo non é compatíbel"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:123
 msgid "Unsupported method"
-msgstr "Método non compatíbel"
+msgstr "O método non é compatíbel"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:125
 msgid "Unsupported authentication method"
-msgstr "Método de autenticación non compatíbel"
+msgstr "O método de autenticación non é compatíbel"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:127
 msgid "TLS not available"
-msgstr "TLS non dispoñíbel"
+msgstr "O TLS non está dispoñíbel"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:133
 msgid "Offline mode unavailable"
@@ -1252,17 +1222,139 @@ msgstr "Excedeuse o límite do tamaño de busca"
 msgid "Search time limit exceeded"
 msgstr "Excedeuse o tempo límite de busca"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "A consulta non é válida"
-
 #: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Query refused"
 msgstr "Rexeitouse a consulta"
 
 #: ../calendar/libedata-cal/e-cal-backend-util.c:148
 msgid "Invalid server version"
-msgstr "Versión do servidor non válida"
+msgstr "A versión do servidor non é correcta"
+
+#: ../calendar/libedata-cal/e-data-cal.c:483
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "Non é posíbel obter o enderezo do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, 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:519
+#, 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:537
+#, 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:554
+#, c-format
+msgid "Cannot open calendar"
+msgstr "Non é posíbel abrir o calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:571
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "Non é posíbel eliminar o calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:590
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "Non é posíbel crear o obxecto de calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:612
+#, c-format
+msgid "Cannot modify calender object"
+msgstr "Non é posíbel modificar o obxecto do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:636
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "Non é posíbel eliminar o obxecto do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:655
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "Non é posíbel obter os obxectos do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:672
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "Non é posíbel rexeitar a alarma do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:691
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "Non é posíbel enviar os obxectos do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:726
+#, 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:744
+#, 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:762
+#, 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:800
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "Non é posíbel obter a lista de anexos"
+
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "Non é posíbel completar a consulta de calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:840
+#, 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:858
+#, 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:875
+#, 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:896
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "Non é posíbel obter os cambios do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal.c:946
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Non é posíbel obter a lista de días libres/ocupados do calendario"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "O URI non é correcto"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Non hai ningún motor de infraestrutura de fábrica para '%s' de '%s'"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Non é posíbel instanciar o motor de infraestrutura"
 
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
@@ -1313,7 +1405,7 @@ msgstr "Non é posíbel crear o camiño á caché"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Non se puido eliminar a entrada da caché: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:411
 msgid "Insufficient memory"
 msgstr "Memoria insuficiente"
 
@@ -1361,10 +1453,10 @@ 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:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../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:3051
 msgid "You must be working online to complete this operation"
 msgstr "Debe estar traballando con conexión para completar esta operación"
 
@@ -1380,11 +1472,11 @@ msgstr "Non se puido crear o proceso fillo '%s': %s"
 #: ../camel/camel-filter-driver.c:836
 #, c-format
 msgid "Invalid message stream received from %s: %s"
-msgstr "Fluxo de mensaxe non válido recibido de %s: %s"
+msgstr "Recibiuse un fluxo de mensaxe incorrecto de %s: %s"
 
 #: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
 msgid "Syncing folders"
-msgstr "Sincronizando cartafoles"
+msgstr "Sincronizando os cartafoles"
 
 #: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
 #, c-format
@@ -1420,7 +1512,7 @@ msgstr "Fallo na mensaxe %d"
 
 #: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
 msgid "Syncing folder"
-msgstr "Sincronizando cartafol"
+msgstr "Sincronizando o cartafol"
 
 #: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
 msgid "Complete"
@@ -1442,11 +1534,11 @@ msgstr "Non se puido obter a mensaxe"
 
 #: ../camel/camel-filter-search.c:399
 msgid "Invalid arguments to (system-flag)"
-msgstr "Os argumentos non son válidos para (system-flag)"
+msgstr "Os argumentos non son correctos para (system-flag)"
 
 #: ../camel/camel-filter-search.c:414
 msgid "Invalid arguments to (user-tag)"
-msgstr "Os argumentos non son válidos para (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
@@ -1499,43 +1591,44 @@ msgstr "(%s) require como resultado unha matriz"
 msgid "(%s) requires the folder set"
 msgstr "(%s) require un conxunto de cartafoles"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:669
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operación non compatíbel: anexar unha mensaxe: para %s"
 
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1374
 #, 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:1429
+#: ../camel/camel-folder.c:1415
 #, 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:1468
+#: ../camel/camel-folder.c:1454
 #, 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:1581
+#: ../camel/camel-folder.c:1567
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "Movendo as mensaxes"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1908
 msgid "Learning junk"
-msgstr "Aprendendo correo non desexado"
+msgstr "Aprendendo de correo lixo"
 
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1925
 msgid "Learning non-junk"
-msgstr "Aprendendo correo que non é non desexado"
+msgstr "Aprendendo de correo que non é lixo"
 
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1944
 msgid "Filtering new message(s)"
 msgstr "Filtrando as mensaxes novas"
 
@@ -1599,76 +1692,75 @@ msgstr "Resposta inesperada do GnuPG: %s"
 
 #: ../camel/camel-gpg-context.c:944
 msgid "Failed to encrypt: No valid recipients specified."
-msgstr "Fallou ao cifrar: non se especificou ningún destinatario válido."
+msgstr "Fallou ao cifrar: non se especificou ningún destinatario correcto."
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1206 ../camel/camel-gpg-context.c:1331
-#: ../camel/camel-gpg-context.c:1853 ../camel/camel-gpg-context.c:1898
+#: ../camel/camel-gpg-context.c:1214 ../camel/camel-gpg-context.c:1339
+#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1919
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Fallou ao executar gpg: %s"
 
-#: ../camel/camel-gpg-context.c:1299 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1307 ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Non se puido xerar os datos da sinatura: %s"
 
-#: ../camel/camel-gpg-context.c:1346 ../camel/camel-gpg-context.c:1547
-#: ../camel/camel-gpg-context.c:1563 ../camel/camel-gpg-context.c:1643
-#: ../camel/camel-gpg-context.c:1658 ../camel/camel-gpg-context.c:1774
-#: ../camel/camel-gpg-context.c:1789 ../camel/camel-gpg-context.c:1869
-#: ../camel/camel-gpg-context.c:1914
+#: ../camel/camel-gpg-context.c:1354 ../camel/camel-gpg-context.c:1555
+#: ../camel/camel-gpg-context.c:1571 ../camel/camel-gpg-context.c:1651
+#: ../camel/camel-gpg-context.c:1666 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1797 ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1935
 msgid "Failed to execute gpg."
 msgstr "Fallou ao executar gpg."
 
-#: ../camel/camel-gpg-context.c:1365
+#: ../camel/camel-gpg-context.c:1373
 msgid "This is a digitally signed message part"
 msgstr "Esta é unha parte de mensaxe asinada dixitalmente"
 
-#: ../camel/camel-gpg-context.c:1451 ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463 ../camel/camel-gpg-context.c:1478
-#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1459 ../camel/camel-gpg-context.c:1465
+#: ../camel/camel-gpg-context.c:1471 ../camel/camel-gpg-context.c:1486
+#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Non se pode verificar a sinatura da mensaxe: o formato da mensaxe é "
 "incorrecto"
 
-#: ../camel/camel-gpg-context.c:1517
+#: ../camel/camel-gpg-context.c:1525
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Non se pode verificar a sinatura da mensaxe: non se puido crear un ficheiro "
 "temporal: %s"
 
-#: ../camel/camel-gpg-context.c:1626
+#: ../camel/camel-gpg-context.c:1634
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non se puido xerar os datos de cifrado: %s"
 
-#: ../camel/camel-gpg-context.c:1676
+#: ../camel/camel-gpg-context.c:1684
 msgid "This is a digitally encrypted message part"
 msgstr "Isto é unha parte da mensaxe cifrada dixitalmente"
 
-#: ../camel/camel-gpg-context.c:1729 ../camel/camel-gpg-context.c:1737
-#: ../camel/camel-gpg-context.c:1756
+#: ../camel/camel-gpg-context.c:1737 ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1764
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Non se pode descifrar a mensaxe: o formato da mensaxe non é correcto"
 
-#: ../camel/camel-gpg-context.c:1746
+#: ../camel/camel-gpg-context.c:1754
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Fallou ao descifrar a parte MIME: erro de protocolo"
 
-#: ../camel/camel-gpg-context.c:1811 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1832 ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "Contido cifrado"
 
-#: ../camel/camel-gpg-context.c:1830
+#: ../camel/camel-gpg-context.c:1851
 msgid "Unable to parse message content"
 msgstr "Non se pode analizar o contido da mensaxe"
 
-#: ../camel/camel-gpg-context.c:1854 ../camel/camel-gpg-context.c:1899
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1875 ../camel/camel-gpg-context.c:1920
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
 #: ../camel/providers/smtp/camel-smtp-transport.c:165
 #: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -1683,7 +1775,7 @@ msgstr "Non se pode crear unha canalización do asistente de bloqueo: %s"
 #: ../camel/camel-lock-client.c:126
 #, c-format
 msgid "Cannot fork locking helper: %s"
-msgstr "Non se pode facer fork do asistente de bloqueo: %s"
+msgstr "Non se pode facer un fork do asistente de bloqueo: %s"
 
 #: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
 #, c-format
@@ -1793,12 +1885,12 @@ msgstr "Resolvendo: %s"
 
 #: ../camel/camel-net-utils.c:700
 msgid "Host lookup failed"
-msgstr "Fallo na busca do host"
+msgstr "Fallo na busca do servidor"
 
 #: ../camel/camel-net-utils.c:702
 #, c-format
 msgid "Host lookup failed: %s: %s"
-msgstr "Fallo na busca do host: %s: %s"
+msgstr "Fallo na busca do servidor: %s: %s"
 
 #: ../camel/camel-net-utils.c:810
 msgid "Resolving address"
@@ -1863,7 +1955,7 @@ msgstr ""
 
 #: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
 msgid "Authentication failed."
-msgstr "A autenticación fallou."
+msgstr "Fallou a autenticación."
 
 #: ../camel/camel-sasl-anonymous.c:130
 #, c-format
@@ -1880,7 +1972,7 @@ msgid ""
 "Invalid opaque trace information:\n"
 "%s"
 msgstr ""
-"A información de rastro opaco non é válido:\n"
+"A información de rastro opaco non é válida:\n"
 "%s"
 
 #: ../camel/camel-sasl-anonymous.c:154
@@ -1922,12 +2014,12 @@ msgstr "O desafío do servidor é demasiado longo (>2048 octetos)"
 
 #: ../camel/camel-sasl-digest-md5.c:853
 msgid "Server challenge invalid\n"
-msgstr "O desafío do servidor non é válido\n"
+msgstr "O desafío do servidor non é correcto\n"
 
 #: ../camel/camel-sasl-digest-md5.c:859
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr ""
-"O desafío do servidor contiña un token \"Quality of Protection\" non é válido"
+"O desafío do servidor contiña un token \"Quality of Protection\" incorrecto"
 
 #: ../camel/camel-sasl-digest-md5.c:889
 msgid "Server response did not contain authorization data"
@@ -1966,7 +2058,7 @@ msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
 msgstr ""
-"O parámetro do target_name indicado contiña un tipo de nome non válido ou "
+"O parámetro do target_name indicado contiña un tipo de nome incorrecto ou "
 "non compatíbel."
 
 # (pofilter) accelerators: accelerator _ occurs 3 time(s) in original and 2 time(s) in translation
@@ -1984,7 +2076,7 @@ msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr ""
-"O input_token contén unha sinatura non válida ou unha sinatura que non pode "
+"O input_token contén unha sinatura incorrecta ou unha sinatura que non pode "
 "ser verificada."
 
 #: ../camel/camel-sasl-gssapi.c:180
@@ -1992,12 +2084,12 @@ msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
 msgstr ""
-"As credenciais dispoñíbeis non son válidas para a inicialización do contexto "
-"ou o manipulador de credenciais non indicou ningunha credencial."
+"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:185
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "O manipulador de contexto dispoñíbel non refire a un contexto válido."
+msgstr "O manipulador de contexto dispoñíbel non refire un contexto correcto."
 
 #: ../camel/camel-sasl-gssapi.c:188
 msgid "The consistency checks performed on the input_token failed."
@@ -2013,8 +2105,7 @@ msgstr "As credenciais indicadas caducaron."
 
 #: ../camel/camel-sasl-gssapi.c:200 ../camel/camel-sasl-gssapi.c:248
 #: ../camel/camel-sasl-gssapi.c:284 ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "A resposta de autenticación desde o servidor non é válida."
 
@@ -2022,23 +2113,6 @@ msgstr "A resposta de autenticación desde o servidor non é válida."
 msgid "Unsupported security layer."
 msgstr "A capa de seguranza non é compatíbel."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Esta opción conectarase ao servidor usando a autenticación Kerberos 4."
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Non se puido obter unha etiqueta de Kerberos:\n"
-"%s"
-
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -2077,7 +2151,7 @@ msgstr "Esta opción autorizará unha conexión POP antes de tentar SMTP"
 
 #: ../camel/camel-sasl-popb4smtp.c:106
 msgid "POP Source URI"
-msgstr "URI da Fonte POP"
+msgstr "URI da fonte POP"
 
 #: ../camel/camel-sasl-popb4smtp.c:109
 msgid "POP Before SMTP auth using an unknown transport"
@@ -2100,7 +2174,7 @@ msgstr "O URL '%s' necesita un compoñente do nome do usuario"
 #: ../camel/camel-service.c:269
 #, c-format
 msgid "URL '%s' needs a host component"
-msgstr "O URL '%s' necesita un compoñente de host"
+msgstr "O URL '%s' necesita un compoñente de servidor"
 
 #: ../camel/camel-service.c:273
 #, c-format
@@ -2113,212 +2187,212 @@ msgid ""
 "Could not create directory %s:\n"
 "%s"
 msgstr ""
-"Non se puido crear o directorio %s:\n"
+"Non se puido crear o cartafol %s:\n"
 "%s"
 
 #: ../camel/camel-session.c:479
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Introduza o contrasinal %s para %s no host %s."
+msgstr "Introduza o contrasinal %s para %s no servidor %s."
 
 #: ../camel/camel-session.c:817
 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:444 ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Non se pode encontrar o certificado para '%s'"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "Non se pode crear a mensaxe CMS"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "Non se pode crear os datos asinados CMS"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "Non se pode anexar os datos asinados CMS"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "Non se pode anexar os datos CMS"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "Non se pode crear información do asinante CMS"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "Non se pode encontrar a cadea do certificado"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "Non se pode engadir a data de sinatura CMS"
 
-#: ../camel/camel-smime-context.c:508 ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "O certificado de cifrado de '%s' non existe"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Non se pode engadir o atributo SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Non se pode engadir o atributo MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "Non se pode engadir o certificado de cifrado"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "Non se pode engadir información do asinante CMS"
 
-#: ../camel/camel-smime-context.c:613 ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "Non se pode crear un contexto de codificación"
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "Non se puido engadir datos ao codificador CMS"
 
-#: ../camel/camel-smime-context.c:624 ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "Fallo ao codificar os datos"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "Non verificada"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
-msgstr "Sinatura correcta"
+msgstr "Sinatura boa"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
-msgstr "A sinatura non é válida"
+msgstr "A sinatura non é boa"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "Contido alterado ou adulterado durante o transporte"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "Non se encontrou o certificado de sinatura"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "O certificado de sinatura non é fiábel"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
-msgstr "Algoritmo de sinatura descoñecido"
+msgstr "O algoritmo de sinatura é descoñecido"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "O algoritmo de sinatura non é compatíbel"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
-msgstr "Sinatura formada incorrectamente"
+msgstr "A sinatura está formada incorrectamente"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
 msgstr "Procesando erro"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "Non hai datos asinados na sinatura"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "Falta o resumo dos datos empaquetados"
 
-#: ../camel/camel-smime-context.c:771 ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "Non se poden calcular os resumos"
 
-#: ../camel/camel-smime-context.c:788 ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "Non se pode definir os resumos de mensaxe"
 
-#: ../camel/camel-smime-context.c:802 ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
-msgstr "A importación de certificado fallou"
+msgstr "A importación do certificado fallou"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "O certificado é a única mensaxe, non se pode verificar os certificados"
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, 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:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "Non se pode encontrar o resumo da sinatura"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Asinante: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941 ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "O descodificador fallou"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Non se pode encontrar un algoritmo de codificación en bloque común"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Non se pode asignar un espazo para a chave de cifrado en bloque"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "Non se pode crear a mensaxe CMS"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "Non se pode crear os datos empaquetados CMS"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Non se pode anexar os datos empaquetados CMS"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "Non se pode anexar o obxecto de datos CMS"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "Non se pode crear información do destinatario CMS"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "Non se pode engadir información do destinatario CMS"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "Fallo ao engadir os datos ao codificador"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Descodificado: non se encontrou contido cifrado"
 
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "importar chaves: non implementado"
 
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "exportar chaves: non implementado"
 
@@ -2347,13 +2421,13 @@ msgstr "Non se pode crear o cartafol: %s: o ficheiro xa existe"
 #: ../camel/providers/local/camel-maildir-store.c:219
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
-msgstr "Non se pode eliminar o cartafol: %s: a operación non é válida"
+msgstr "Non se pode 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
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Non se pode renomear o cartafol: %s: a operación non é válida"
+msgstr "Non se pode 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
@@ -2363,126 +2437,9 @@ msgstr "Lixo"
 #. the name of the Junk folder, used for spam messages
 #: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
 msgid "Junk"
-msgstr "Correo non desexado"
-
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "Non se pode obter o certificado do emisor"
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "Non se pode obter a lista de revogación de certificados"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "Non se pode descodificar a sinatura do certificado"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr ""
-"Non se pode descodificar a sinatura da lista de revogación de certificados"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "Non se pode descodificar a chave pública do emisor"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "Fallo de sinatura de certificado"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "Fallo na sinatura da lista de revogación de certificados"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "O certificado aínda non é válido"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "O certificado caducou"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "A lista de revogación de certificados (CRL) non é valida todavía"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "A lista de revogación de certificados (CRL) expirou"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Ocorreu un erro na lista de revogación de certificados (CRL)"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "Sen memoria"
+msgstr "Correo lixo"
 
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Certificado autoasinado de profundidade cero"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "Certificado autoasinado en cadea"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "Non se pode obter o certificado do emisor localmente"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "Non se pode verificar a sinatura da folla"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "Cadea de certificados demasiado longa"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "Certificado revogado"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Autoridade Certificadora (CA) non válida"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "Excedeuse a lonxitude do camiño"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "O obxectivo non é válido"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "Certificado non fiábel"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "Certificado rexeitado"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "Asunto ou emisor non coincidentes"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "AKID/SKID non coincidentes"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "A serie AKID/Emisor non coinciden"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "A utilización de chave non permite a sinatura de certificados"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "Erro na verificación do aplicativo"
-
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2495,35 +2452,16 @@ msgstr ""
 "Impresión dixital:       %s\n"
 "Sinatura:         %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
-msgstr "VÃ?LIDO"
+msgstr "BO"
 
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
-msgstr "NON VÃ?LIDO"
-
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Certificado non válido de %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-" Quéreo aceptar de todas maneiras?"
+msgstr "MALO"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2538,7 +2476,7 @@ msgstr ""
 "\n"
 " Quere aceptalo?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2547,31 +2485,31 @@ msgstr ""
 "Problema do certificado: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
-"Dominio do certificado incorrecto: %s\n"
+"O dominio do certificado está mal: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Certificado caducado: %s\n"
+"O certificado expirou: %s\n"
 "Emisor: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
-"Lista de revogación de certificados caducada: %s\n"
+"A lista de revogación de certificados expirou: %s\n"
 "Emisor: %s"
 
 #: ../camel/camel-url.c:313
@@ -2579,17 +2517,17 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Non se puido analizar o URL '%s'"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:576
 #, c-format
 msgid "Error storing '%s': %s"
 msgstr "Erro ao almacenar '%s': %s"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:653
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: ../camel/camel-vee-folder.c:816 ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:812 ../camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Non se pode copiar ou mover as mensaxes a un cartafol virtual"
 
@@ -2614,7 +2552,7 @@ msgstr "Non se poden copiar mensaxes ao cartafol do lixo"
 
 #: ../camel/camel-vtrash-folder.c:57
 msgid "Cannot copy messages to the Junk folder"
-msgstr "Non poden copiar mensaxes ao cartafol de correo non desexado"
+msgstr "Non poden copiar mensaxes ao cartafol de correo lixo"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
 #, c-format
@@ -2626,11 +2564,12 @@ msgstr ""
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:265
-#: ../camel/providers/local/camel-maildir-folder.c:298
+#: ../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:233
+#: ../camel/providers/local/camel-mh-folder.c:226
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
@@ -2693,8 +2632,8 @@ msgstr "O cartafol do lixo está cheo. Baléireo."
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
 #: ../camel/providers/groupwise/camel-groupwise-store.c:633
 #: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-folder.c:3423
+#: ../camel/providers/imap/camel-imap-folder.c:3499
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Recollendo a información de resumo para as mensaxes novas en %s"
@@ -2761,8 +2700,7 @@ msgstr "Comprobar nas mensaxes novas contidos _non desexados"
 #: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr ""
-"Comprobar só o correo non desexado nas mensaxes do cartafol da caixa de "
-"en_trada"
+"Comprobar só o correo lixo nas mensaxes do cartafol da CAIXA_DE_ENTRADA"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
@@ -2788,7 +2726,7 @@ msgstr "Para acceder a servidores Novell GroupWise"
 #: ../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/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -2799,14 +2737,14 @@ 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 "
-"plano."
+"simple."
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:102
 msgid "Host or user not available in url"
-msgstr "Host ou usuario non dispoñíbel no 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:1358
+#: ../camel/providers/imap/camel-imap-store.c:1356
 msgid "You did not enter a password."
 msgstr "Non introduciu un contrasinal."
 
@@ -2817,8 +2755,9 @@ msgstr ""
 "actual do seu servidor"
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:243
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
@@ -2828,8 +2767,8 @@ msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Non se pode crear cartafoles GroupWise en modo sen conexión."
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
@@ -2866,8 +2805,8 @@ msgid ""
 "of your mail.\n"
 msgstr ""
 "Excedeu o límite de almacenamento desta conta. As súas mensaxes están na "
-"fila da caixa de saída. Tente envialos premendo en Enviar e recibir despois "
-"de eliminar ou arquivar algúns dos seus correos.\n"
+"fila 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
@@ -2888,12 +2827,12 @@ msgstr "Conexión ao servidor"
 #: ../camel/providers/hula/camel-hula-provider.c:55
 #: ../camel/providers/imap/camel-imap-provider.c:54
 msgid "_Use custom command to connect to server"
-msgstr "_Usar un comando personalizado para conectar ao servidor"
+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
 msgid "Command:"
-msgstr "Comando:"
+msgstr "Orde:"
 
 #: ../camel/providers/hula/camel-hula-provider.c:60
 #: ../camel/providers/imap/camel-imap-provider.c:60
@@ -2930,7 +2869,7 @@ 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 "
-"plano."
+"simple."
 
 #: ../camel/providers/imap/camel-imap-command.c:181
 #: ../camel/providers/imap/camel-imap-command.c:265
@@ -2945,12 +2884,12 @@ 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:3051
+#: ../camel/providers/imap/camel-imap-store.c:3088
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3093
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectouse inesperadamente: %s"
@@ -2974,7 +2913,7 @@ msgstr "Resposta inesperada do servidor IMAP: %s"
 #: ../camel/providers/imap/camel-imap-command.c:431
 #, c-format
 msgid "IMAP command failed: %s"
-msgstr "O comando IMAP fallou: %s"
+msgstr "A orde IMAP fallou: %s"
 
 #: ../camel/providers/imap/camel-imap-command.c:506
 msgid "Server response ended too soon."
@@ -3008,15 +2947,15 @@ msgstr "Examinando mensaxes cambiadas en %s"
 #: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
 msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Estado de resposta inesperado '%s' despois do comando APPEND"
+msgstr "Estado de resposta inesperado '%s' despois da orde APPEND"
 
 #: ../camel/providers/imap/camel-imap-folder.c:2002
 msgid "No response on continuation after APPEND command"
-msgstr "Non houbo resposta de continuación despois do comando APPEND"
+msgstr "Non houbo resposta de continuación despois da orde APPEND"
 
 #: ../camel/providers/imap/camel-imap-folder.c:2047
 msgid "Unknown error occurred during APPEND command!"
-msgstr "Produciuse un erro descoñecido durante o comando APPEND!"
+msgstr "Produciuse un erro descoñecido durante a orde APPEND!"
 
 #: ../camel/providers/imap/camel-imap-folder.c:2878
 #, c-format
@@ -3033,24 +2972,24 @@ msgid "No such message available."
 msgstr "A mensaxe non está dispoñíbel."
 
 #: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/imap/camel-imap-folder.c:3810
 #: ../camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñíbel actualmente"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3626
 #, 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:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3634
 #, 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:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3848
 msgid "Could not find message body in FETCH response."
 msgstr "Non se puido encontrar o corpo da mensaxe na resposta FETCH."
 
@@ -3085,7 +3024,8 @@ msgstr "Espazo de nome:"
 #: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imap4/camel-imap4-provider.c:53
 msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "_Aplicar filtros ás mensaxes novas da caixa de entrada neste servidor"
+msgstr ""
+"_Aplicarlles os filtros ás mensaxes novas da caixa de entrada neste servidor"
 
 #: ../camel/providers/imap/camel-imap-provider.c:72
 msgid "Check new messages for Jun_k contents"
@@ -3105,26 +3045,26 @@ 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/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 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 "
-"plano."
+"simple."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servizo IMAP para %s en %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../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
@@ -3137,7 +3077,7 @@ msgstr "Servizo IMAP para %s en %s"
 msgid "Could not connect to %s: %s"
 msgstr "Non se puido realizar a conexión con %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../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:171
@@ -3145,15 +3085,16 @@ msgstr "Non se puido realizar a conexión con %s: %s"
 msgid "SSL unavailable"
 msgstr "SSL non dispoñíbel"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:1523
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../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
@@ -3162,53 +3103,53 @@ msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Non se puido realizar a conexión ao servidor IMAP %s en modo seguro: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "O STARTTLS non é compatíbel"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
 msgid "SSL negotiations failed"
 msgstr "As negociacións SSL fallaron"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
 #: ../camel/providers/imap4/camel-imap4-store.c:335
 #: ../camel/providers/smtp/camel-smtp-transport.c:371
 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:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
-msgstr "Non se puido conectar co comando \"%s\": %s"
+msgstr "Non se puido 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:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../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/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:444
+#: ../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:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, 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 %s solicitado"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
 #: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, 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:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3219,15 +3160,16 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome do cartafol \"%s\" non é válido porque contén o carácter \"%c\""
+msgstr ""
+"O nome do cartafol \"%s\" non é correcto porque contén o carácter \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
 #: ../camel/providers/local/camel-mbox-store.c:204
 #: ../camel/providers/local/camel-mh-store.c:249
@@ -3235,12 +3177,12 @@ msgstr "O nome do cartafol \"%s\" non é válido porque contén o carácter \"%c
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Non se pode crear o cartafol '%s': o cartafol existe."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartafol pai descoñecido: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3090
 msgid "Server unexpectedly disconnected"
 msgstr "O servidor desconectouse inesperadamente"
 
@@ -3248,7 +3190,7 @@ msgstr "O servidor desconectouse inesperadamente"
 #: ../camel/providers/imap4/camel-imap4-command.c:579
 #, c-format
 msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Non se puido enviar o comando ao servidor IMAP %s: %s"
+msgstr "Non se lle puido enviar a orde ao servidor IMAP %s: %s"
 
 #: ../camel/providers/imap4/camel-imap4-command.c:681
 #, c-format
@@ -3265,17 +3207,17 @@ msgstr "Saúdo inesperado do servidor IMAP %s."
 msgid "Cannot select folder '%s': Invalid mailbox name"
 msgstr ""
 "Non se pode seleccionar o cartafol '%s': o nome da caixa de correo non é "
-"válido"
+"correcto"
 
 #: ../camel/providers/imap4/camel-imap4-engine.c:446
 #, c-format
 msgid "Cannot select folder '%s': Bad command"
-msgstr "Non se pode seleccionar o cartafol '%s': comando incorrecto"
+msgstr "Non se pode 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 do comando para o servidor IMAP %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"
@@ -3331,7 +3273,7 @@ msgstr "Non se pode 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 se pode expurgar o cartafol '%s': comando non válido"
+msgstr "Non se pode expurgar o cartafol '%s': a orde é incorrecta"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:891
 #, c-format
@@ -3341,7 +3283,7 @@ msgstr "Non se pode 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 se pode obter a mensaxe %s do cartafol '%s': comando non válido"
+msgstr "Non se pode obter a mensaxe %s do cartafol '%s': a orde non é correcta"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
@@ -3352,40 +3294,40 @@ msgstr ""
 #: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, c-format
 msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Non se pode engadir a mensaxe ao cartafol '%s': erro descoñecido"
+msgstr "Non se pode 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 se pode engadir a mensaxe ao cartafol '%s': comando non válido"
+msgstr "Non se pode 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 se poden mover mensaxes do cartafol '%s' ao cartafol '%s': erro "
+"Non se poden 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 se poden copiar mensaxes do cartafol '%s' ao cartafol '%s': erro "
+"Non se poden 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 se poden mover mensaxes do cartafol '%s' ao cartafol '%s': comando non "
-"válido"
+"Non se poden 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 se poden copiar mensaxes do cartafol '%s' ao cartafol '%s': comando non "
-"válido"
+"Non se poden 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"
@@ -3409,10 +3351,9 @@ 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 plano."
+"texto simple."
 
 #: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
 #: ../camel/providers/pop3/camel-pop3-store.c:181
@@ -3466,18 +3407,18 @@ msgstr "Non se pode 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 "O comando non é válido"
+msgstr "A orde é mala"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:897
 #, c-format
 msgid "Cannot create folder '%s': Invalid mailbox name"
 msgstr ""
-"Non se pode crear o cartafol '%s': o nome da caixa de correo non é válido"
+"Non se pode 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 se pode crear o cartafol '%s': o comando non é válido"
+msgstr "Non se pode crear o cartafol '%s': a orde non é correcta"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:1008
 #, c-format
@@ -3492,12 +3433,13 @@ msgstr "Non se poden eliminar os cartafoles IMAP no modo sen conexión."
 #, c-format
 msgid "Cannot delete folder '%s': Invalid mailbox name"
 msgstr ""
-"Non se pode eliminar o cartafol '%s': o nome da caixa de correo non é válido"
+"Non se pode 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 se pode eliminar o cartafol '%s': o comando non é válido"
+msgstr "Non se pode eliminar o cartafol '%s': a orde non é correcta"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:1099
 #, c-format
@@ -3513,12 +3455,12 @@ msgstr "Non se poden renomear os cartafoles IMAP no modo sen conexión."
 msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
 msgstr ""
 "Non se pode renomear o cartafol '%s' a '%s': o nome da caixa de correo non é "
-"válido"
+"correcto"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:1142
 #, c-format
 msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Non se pode renomear o cartafol '%s' a '%s': o comando non é válido"
+msgstr "Non se pode 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.
@@ -3538,12 +3480,12 @@ msgstr "Non se pode subscribir aos cartafoles IMAP en modo sen conexión."
 msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
 msgstr ""
 "Non se pode subscribir ao cartafol '%s': o nome da caixa de correo non é "
-"válido"
+"correcto"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:1683
 #, c-format
 msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Non se pode subscribir ao cartafol '%s': o comando non é válido"
+msgstr "Non se pode 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."
@@ -3555,13 +3497,13 @@ msgstr ""
 msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
 msgstr ""
 "Non se pode eliminar a subscrición do cartafol '%s': o nome da caixa de "
-"correo non é válido"
+"correo non é correcto"
 
 #: ../camel/providers/imap4/camel-imap4-store.c:1755
 #, c-format
 msgid "Cannot unsubscribe from folder '%s': Bad command"
 msgstr ""
-"Non se pode eliminar a subscrición do cartafol '%s': o comando non é válido"
+"Non se pode eliminar a subscrición do cartafol '%s': a orde non é correcta"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
@@ -3574,7 +3516,7 @@ 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 sobres das novas mensaxes"
+msgstr "Obtendo os envoltorios das novas mensaxes"
 
 #: ../camel/providers/imap4/camel-imap4-utils.c:429
 #, c-format
@@ -3590,16 +3532,16 @@ msgstr "Non hai datos"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "O servidor IMAP %s desconectouse inesperadamente: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "Almacenamento da mensaxe"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -3612,12 +3554,18 @@ msgstr ""
 "\n"
 " NON UTILICE ESTA OPCIÃ?N PARA CORREO DE PRODUCIÃ?N!!!\n"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:1526
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Non se puido conectar a %s (porto %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-server.c:1560
+#: ../camel/providers/imapx/camel-imapx-store.c:143
+#, c-format
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sIntroduza o contrasinal de IMAP para %s %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:126
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Non se puido conectar ao servidor POP en %s"
@@ -3676,11 +3624,11 @@ msgstr "_Aplicar filtros ás mensaxes novas da caixa de entrada"
 
 #: ../camel/providers/local/camel-local-provider.c:95
 msgid "Maildir-format mail directories"
-msgstr "Directorios de correo en formato maildir"
+msgstr "Cartafoles de correo en formato maildir"
 
 #: ../camel/providers/local/camel-local-provider.c:96
 msgid "For storing local mail in maildir directories."
-msgstr "Para almacenar correo local en directorios maildir."
+msgstr "Para almacenar correo local en cartafoles maildir."
 
 #: ../camel/providers/local/camel-local-provider.c:108
 msgid "_Store status headers in Elm/Pine/Mutt format"
@@ -3703,7 +3651,7 @@ msgstr ""
 
 #: ../camel/providers/local/camel-local-provider.c:126
 msgid "Standard Unix mbox spool directory"
-msgstr "Directorio spool mbox estándar de Unix"
+msgstr "Cartafol estándar spool mbox de Unix"
 
 #: ../camel/providers/local/camel-local-store.c:165
 #: ../camel/providers/local/camel-local-store.c:276
@@ -3716,7 +3664,7 @@ msgstr "A raíz de almacenamento %s non é un camiño absoluto"
 #: ../camel/providers/local/camel-local-store.c:172
 #, c-format
 msgid "Store root %s is not a regular directory"
-msgstr "A raíz de almacenamento %s non é un directorio normal"
+msgstr "A raíz de almacenamento %s non é un cartafol normal"
 
 #: ../camel/providers/local/camel-local-store.c:181
 #: ../camel/providers/local/camel-local-store.c:189
@@ -3760,27 +3708,28 @@ msgstr "Non se puido eliminar o metaficheiro do cartafol '%s': %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Non se puido engadir a mensaxe ao resumo: motivo descoñecido"
 
-#: ../camel/providers/local/camel-maildir-folder.c:231
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Cancelouse a adición da mensaxe maildir"
 
-#: ../camel/providers/local/camel-maildir-folder.c:234
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:297
-#: ../camel/providers/local/camel-maildir-folder.c:311
-#: ../camel/providers/local/camel-maildir-folder.c:319
+#: ../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:232
-#: ../camel/providers/local/camel-mh-folder.c:243
-#: ../camel/providers/local/camel-mh-folder.c:251
+#: ../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"
@@ -3789,9 +3738,13 @@ msgstr ""
 "Non se pode obter a mensaxe: %s do cartafol %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:320
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
-msgstr "O contido da mensaxe non é válido"
+msgstr "O contido da mensaxe non é correcto"
+
+#: ../camel/providers/local/camel-maildir-folder.c:419
+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
@@ -3818,7 +3771,7 @@ msgstr "Non se pode obter o cartafol '%s': o cartafol non existe."
 #: ../camel/providers/local/camel-maildir-store.c:189
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
-msgstr "Non se pode obter o cartafol '%s': non é un directorio maildir."
+msgstr "Non se pode obter o cartafol '%s': non é un cartafol maildir."
 
 #: ../camel/providers/local/camel-maildir-store.c:234
 #: ../camel/providers/local/camel-maildir-store.c:272
@@ -3829,7 +3782,7 @@ msgstr "Non se puido eliminar o cartafol '%s': %s"
 
 #: ../camel/providers/local/camel-maildir-store.c:236
 msgid "not a maildir directory"
-msgstr "non é un directorio maildir"
+msgstr "non é un cartafol maildir"
 
 #: ../camel/providers/local/camel-maildir-store.c:440
 #: ../camel/providers/local/camel-spool-store.c:330
@@ -3838,21 +3791,21 @@ msgstr "non é un directorio maildir"
 msgid "Could not scan folder '%s': %s"
 msgstr "Non se puido examinar o cartafol '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
-msgstr "Non se pode abrir o camiño do directorio maildir: %s: %s"
+msgstr "Non se pode abrir o camiño do cartafol maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Comprobando a coherencia do cartafol"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "Comprobando mensaxes novas"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../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
@@ -3873,7 +3826,7 @@ msgstr "Non se pode abrir a caixa de correo: %s: %s\n"
 
 #: ../camel/providers/local/camel-mbox-folder.c:297
 msgid "Mail append canceled"
-msgstr "Adición do correo cancelada"
+msgstr "A adición de correo cancelouse"
 
 #: ../camel/providers/local/camel-mbox-folder.c:300
 #, c-format
@@ -3885,7 +3838,7 @@ msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar danado sen recuperación posíbel."
 
 #: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:252
+#: ../camel/providers/local/camel-mh-folder.c:245
 msgid "Message construction failed."
 msgstr "Fallou a construción da mensaxe."
 
@@ -3942,7 +3895,7 @@ msgstr "O cartafol xa existe"
 
 #: ../camel/providers/local/camel-mbox-store.c:485
 msgid "The new folder name is illegal."
-msgstr "O novo nome do cartafol non é válido."
+msgstr "O novo nome do cartafol non é correcto."
 
 #: ../camel/providers/local/camel-mbox-store.c:498
 #, c-format
@@ -4029,14 +3982,14 @@ msgstr "Erro ao escribir na caixa de correo temporal: %s"
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Erro ao escribir na caixa de correo temporal: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:180
 msgid "MH append message canceled"
 msgstr "Cancelouse o proceso de engadir mensaxe MH"
 
-#: ../camel/providers/local/camel-mh-folder.c:186
+#: ../camel/providers/local/camel-mh-folder.c:183
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Non se pode engadir a mensaxe ao cartafol mh: %s: %s"
+msgstr "Non se lle pode engadir a mensaxe ao cartafol mh: %s: %s"
 
 #: ../camel/providers/local/camel-mh-store.c:232
 #, c-format
@@ -4046,12 +3999,12 @@ msgstr "Non se puido crear o cartafol '%s': %s"
 #: ../camel/providers/local/camel-mh-store.c:244
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
-msgstr "Non se pode obter o cartafol '%s': non é un directorio."
+msgstr "Non se pode obter o cartafol '%s': non é un cartafol."
 
 #: ../camel/providers/local/camel-mh-summary.c:240
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
-msgstr "Non se pode abrir o camiño do directorio MH: %s: %s"
+msgstr "Non se pode abrir o camiño do cartafol MH: %s: %s"
 
 #: ../camel/providers/local/camel-spool-store.c:134
 #, c-format
@@ -4061,7 +4014,7 @@ msgstr "Non é posíbel abrir o spool '%s': %s"
 #: ../camel/providers/local/camel-spool-store.c:146
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
-msgstr "O spool '%s' non é un ficheiro ou directorio estándar"
+msgstr "O spool '%s' non é un ficheiro ou cartafol estándar"
 
 #: ../camel/providers/local/camel-spool-store.c:165
 #, c-format
@@ -4146,7 +4099,7 @@ msgstr ""
 #: ../camel/providers/nntp/camel-nntp-folder.c:226
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
-msgstr "Erro interno: UID nun formato non válido: %s"
+msgstr "Erro interno: UID nun formato incorrecto: %s"
 
 #: ../camel/providers/nntp/camel-nntp-folder.c:367
 #: ../camel/providers/nntp/camel-nntp-folder.c:370
@@ -4190,7 +4143,7 @@ msgid ""
 "password."
 msgstr ""
 "Esta opción autenticarase co servidor NNTP usando un contrasinal de texto "
-"plano."
+"simple."
 
 #: ../camel/providers/nntp/camel-nntp-store.c:216
 #, c-format
@@ -4266,7 +4219,7 @@ msgstr "Non se pode autenticar co servidor: %s"
 #: ../camel/providers/nntp/camel-nntp-store.c:1315
 #, c-format
 msgid "NNTP Command failed: %s"
-msgstr "O comando NNTP fallou: %s"
+msgstr "A orde NNTP fallou: %s"
 
 #: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
@@ -4281,7 +4234,7 @@ msgstr "Non existe o cartafol: %s"
 #: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: Examinando mensaxes novas"
+msgstr "%s: Examinando as mensaxes novas"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
@@ -4363,7 +4316,7 @@ msgid ""
 "is the only option supported by many POP servers."
 msgstr ""
 "Esta opción conectarase co servidor POP usando un contrasinal de texto "
-"plano. Esta é a única opción que permiten moitos servidores POP."
+"simple. Esta é a única opción que permiten moitos servidores POP."
 
 #: ../camel/providers/pop3/camel-pop3-provider.c:86
 msgid ""
@@ -4378,7 +4331,7 @@ msgstr ""
 #: ../camel/providers/pop3/camel-pop3-store.c:207
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
-msgstr "Non se puido obter un saúdo válido do servidor POP: %s"
+msgstr "Non se puido obter un saúdo correcto do servidor POP: %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:224
 #: ../camel/providers/pop3/camel-pop3-store.c:238
@@ -4433,8 +4386,9 @@ msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
 "attack suspected. Please contact your admin."
 msgstr ""
-"Non puido realizar a conexión co servidor POP %s:\tRecibiuse un APOP ID non "
-"válido. Sospéitase dun ataque de suplantación. Contacte co seu administrador."
+"Non puido realizar a conexión co servidor POP %s:\tRecibiuse un APOP ID "
+"incorrecto. Sospéitase dun ataque de suplantación. Contacte co seu "
+"administrador."
 
 #: ../camel/providers/pop3/camel-pop3-store.c:549
 #: ../camel/providers/pop3/camel-pop3-store.c:562
@@ -4489,17 +4443,17 @@ msgstr "Non se puido facer fork para o sendmail: %s: correo non enviado"
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:235
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
-msgstr "sendmail saíu co sinal %s: correo non enviado."
+msgstr "sendmail saíu co sinal %s: o correo non se enviou."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:242
 #, c-format
 msgid "Could not execute %s: mail not sent."
-msgstr "Non se puido executar %s: correo non enviado."
+msgstr "Non se puido executar %s: o correo non se enviou."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:247
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
-msgstr "sendmail saíu con estado %d: correo non enviado."
+msgstr "sendmail saíu con estado %d: o correo non se enviou."
 
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "sendmail"
@@ -4521,7 +4475,7 @@ msgstr ""
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:167
 msgid "Syntax error, command unrecognized"
-msgstr "Erro de sintaxe; comando non recoñecido"
+msgstr "Erro de sintaxe; a orde no se recoñeceu"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:169
 msgid "Syntax error in parameters or arguments"
@@ -4529,11 +4483,11 @@ msgstr "Erro de sintaxe nos parámetros ou argumentos"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:171
 msgid "Command not implemented"
-msgstr "O comando non está implementado"
+msgstr "A orde non está implementada"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:173
 msgid "Command parameter not implemented"
-msgstr "O parámetro do comando non está implementado"
+msgstr "O parámetro da orde non está implementada"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:175
 msgid "System status, or system help reply"
@@ -4633,11 +4587,11 @@ msgstr "Non se puido conectar co servidor SMTP %s en modo seguro: %s"
 #: ../camel/providers/smtp/camel-smtp-transport.c:340
 #, c-format
 msgid "STARTTLS command failed: %s"
-msgstr "O comando STARTTLS fallou: %s"
+msgstr "Fallou a orde STARTTLS: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:355
 msgid "STARTTLS command failed"
-msgstr "O comando STARTTLS fallou"
+msgstr "Fallou a orde STARTTLS"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:496
 #, c-format
@@ -4672,7 +4626,7 @@ msgstr "Non se pode enviar a mensaxe: o servizo non está conectado."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:726
 msgid "Cannot send message: sender address not valid."
-msgstr "Non se pode enviar a mensaxe: o enderezo do remitente non é válido."
+msgstr "Non se pode enviar a mensaxe: o enderezo do remitente non é correcto."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:730
 msgid "Sending message"
@@ -4680,11 +4634,11 @@ msgstr "Enviando a mensaxe"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:745
 msgid "Cannot send message: no recipients defined."
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+msgstr "Non se pode enviar a mensaxe: non se definiron os destinatarios."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:756
 msgid "Cannot send message: one or more invalid recipients"
-msgstr "Non se pode enviar a mensaxe: hai un ou máis destinatarios non válidos"
+msgstr "Non se pode enviar a mensaxe: hai un ou máis destinatarios incorrectos"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:985
 msgid "SMTP Greeting"
@@ -4693,11 +4647,11 @@ msgstr "Saúdo SMTP"
 #: ../camel/providers/smtp/camel-smtp-transport.c:1010
 #, c-format
 msgid "HELO command failed: %s"
-msgstr "O comando HELO fallou: %s"
+msgstr "Fallou a orde HELO: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1027
 msgid "HELO command failed"
-msgstr "O comando HELO fallou"
+msgstr "Fallou a orde HELO"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1093
 msgid "SMTP Authentication"
@@ -4711,29 +4665,29 @@ msgstr "Erro ao crear o obxecto de autenticación SASL."
 #: ../camel/providers/smtp/camel-smtp-transport.c:1127
 #, c-format
 msgid "AUTH command failed: %s"
-msgstr "O comando AUTH fallou: %s"
+msgstr "Fallou a orde AUTH: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1133
 msgid "AUTH command failed"
-msgstr "O comando AUTH fallou"
+msgstr "Fallou a orde AUTH"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1203
 msgid "Bad authentication response from server.\n"
-msgstr "A resposta de autenticación do servidor non é válida.\n"
+msgstr "A resposta de autenticación do servidor non é correcta.\n"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1230
 #, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "O comando MAIL FROM fallou: %s: non se enviou o correo"
+msgstr "Fallou a orde MAIL FROM : %s:  o correo non se enviou"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1247
 msgid "MAIL FROM command failed"
-msgstr "O comando MAIL FROM fallou"
+msgstr "Fallou a orde MAIL FROM"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1271
 #, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "Erro no comando RCPT TO: %s: non se enviou o correo"
+msgstr "Produciuse un erro na orde RCPT TO: %s: o correo non se enviou"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1290
 #, c-format
@@ -4745,7 +4699,7 @@ msgstr "RCPT TO <%s> fallou"
 #: ../camel/providers/smtp/camel-smtp-transport.c:1418
 #, c-format
 msgid "DATA command failed: %s: mail not sent"
-msgstr "Erro no comando DATA: %s: non se enviou o correo"
+msgstr "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
@@ -4753,25 +4707,25 @@ msgstr "Erro no comando DATA: %s: non se enviou o correo"
 #: ../camel/providers/smtp/camel-smtp-transport.c:1347
 #: ../camel/providers/smtp/camel-smtp-transport.c:1434
 msgid "DATA command failed"
-msgstr "O comando DATA fallou"
+msgstr "Fallou a orde DATA"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1457
 #, c-format
 msgid "RSET command failed: %s"
-msgstr "O comando RSET fallou: %s"
+msgstr "Fallou a orde RSET: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1473
 msgid "RSET command failed"
-msgstr "O comando RSET fallou"
+msgstr "Fallou a orde RSET"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1496
 #, c-format
 msgid "QUIT command failed: %s"
-msgstr "O comando QUIT fallou: %s"
+msgstr "Fallou a orde QUIT: %s"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1510
 msgid "QUIT command failed"
-msgstr "O comando QUIT fallou"
+msgstr "Fallou a orde QUIT"
 
 #: ../libedataserver/e-categories.c:47
 msgid "Business"
@@ -4992,50 +4946,54 @@ msgstr "Accedendo anonimamente ao servidor LDAP"
 msgid "Failed to authenticate.\n"
 msgstr "Fallou ao autenticarse.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:327
+#: ../libedataserverui/e-categories-dialog.c:143
+msgid "Category Icon"
+msgstr "Icona de categoría"
+
+#: ../libedataserverui/e-categories-dialog.c:149
+msgid "_No Image"
+msgstr ""
+
+#: ../libedataserverui/e-categories-dialog.c:370
 #, 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:618
+#: ../libedataserverui/e-categories-dialog.c:678
 msgid "Icon"
 msgstr "Icona"
 
-#: ../libedataserverui/e-categories-dialog.c:623
+#: ../libedataserverui/e-categories-dialog.c:683
 msgid "Category"
 msgstr "Categoría"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:1
-msgid "Category Icon"
-msgstr "Icona de categoría"
-
-#: ../libedataserverui/e-categories-dialog.glade.h:2
+#: ../libedataserverui/e-categories-dialog.ui.h:1
 msgid "Category Properties"
 msgstr "Propiedades de categoría"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:3
+#: ../libedataserverui/e-categories-dialog.ui.h:2
 msgid "Category _Icon"
 msgstr "_Icona de categoría"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:4
+#: ../libedataserverui/e-categories-dialog.ui.h:3
 msgid "Category _Name"
 msgstr "_Nome de categoría"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Estes elementos pertencen a estas _categorías:"
+#: ../libedataserverui/e-categories-dialog.ui.h:4
+msgid "Item(s) _belong to these categories:"
+msgstr "Elemento(s) que _pertencen a estas _categorías:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:6
+#: ../libedataserverui/e-categories-dialog.ui.h:5
 msgid "_Available Categories:"
 msgstr "_Categorías dispoñíbeis:"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:7
+#: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../libedataserverui/e-categories-dialog.glade.h:8
+#: ../libedataserverui/e-categories-dialog.ui.h:7
 msgid "categories"
 msgstr "categorías"
 
@@ -5052,80 +5010,79 @@ msgstr "Información de cor"
 msgid "The color to render"
 msgstr "A cor para renderizar"
 
-#: ../libedataserverui/e-name-selector-dialog.c:276
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
 msgstr "Seleccionar contactos da axenda de enderezos"
 
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:579
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:604
 msgid "_Remove"
 msgstr "E_liminar"
 
-#: ../libedataserverui/e-name-selector-dialog.c:765
-#: ../libedataserverui/e-name-selector-dialog.glade.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:781
+#: ../libedataserverui/e-name-selector-dialog.ui.h:6
 msgid "Any Category"
 msgstr "Calquera categoría"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:1
+#: ../libedataserverui/e-name-selector-dialog.ui.h:1
 msgid "*"
 msgstr "*"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:2
+#: ../libedataserverui/e-name-selector-dialog.ui.h:2
 msgid "<b>Co_ntacts</b>"
 msgstr "<b>Co_ntactos</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:3
+#: ../libedataserverui/e-name-selector-dialog.ui.h:3
 msgid "<b>Show Contacts</b>"
-msgstr "<b>Mostrar contactos</b>"
+msgstr "<b>Mostrar os contactos</b>"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:4
+#: ../libedataserverui/e-name-selector-dialog.ui.h:4
 msgid "Address B_ook:"
 msgstr "Axenda de _enderezos:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:5
+#: ../libedataserverui/e-name-selector-dialog.ui.h:5
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:7
+#: ../libedataserverui/e-name-selector-dialog.ui.h:7
 msgid "Cate_gory:"
 msgstr "Ca_tegoría:"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
+#: ../libedataserverui/e-name-selector-dialog.ui.h:8
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:9
+#: ../libedataserverui/e-name-selector-dialog.ui.h:9
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libedataserverui/e-name-selector-dialog.glade.h:10
+#: ../libedataserverui/e-name-selector-dialog.ui.h:10
 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:2455
+#: ../libedataserverui/e-name-selector-entry.c:2508
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "E_xpandir %s en liña"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2470
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "Cop_y %s"
 msgstr "Cop_iar %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2480
+#: ../libedataserverui/e-name-selector-entry.c:2533
 #, c-format
 msgid "C_ut %s"
 msgstr "Co_rtar %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2497
+#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
 msgid "_Edit %s"
 msgstr "_Editar %s"
@@ -5171,175 +5128,13 @@ msgstr "Escolla un destino"
 msgid "_Destination"
 msgstr "_Destino"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
-#, c-format
-msgid "Enter password for %s"
-msgstr "Introducir o contrasinal para %s"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
-msgid "Enter password"
-msgstr "Introducir o contrasinal"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "Propietario"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "Editor de publicación"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "Editor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "Autor de publicación"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "Autor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "Autor non editor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "Revisor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "Contribuidor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "Ningún"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "Erro xenérico"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "Xa existe un cartafol co mesmo nome"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "O tipo de cartafol especificado non é válido"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "Erro de E/S"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "Non hai espazo suficiente para crear o cartafol"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "O cartafol non está baleiro"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "Non se encontrou o cartafol especificado"
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "Función non implementada neste almacenamento"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "A operación non compatíbel"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "O tipo especificado non é compatíbel con este almacenamento"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "O cartafol especificado non se pode modificar ou eliminar"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Non se pode converter un cartafol nun fillo dun dos seus fillos"
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "Non se pode crear un cartafol con ese nome"
-
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Esta operación non pode ser realizada en modo sen conexión"
-
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:640
-#, c-format
-msgid "%s's Folders"
-msgstr "Cartafoles de %s"
-
-#: ../servers/exchange/storage/exchange-account.c:1260
-msgid "Personal Folders"
-msgstr "Cartafoles persoais"
-
-#: ../servers/exchange/storage/exchange-account.c:1275
-msgid "Favorite Public Folders"
-msgstr "Cartafoles públicos preferidos"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
-msgid "All Public Folders"
-msgstr "Todos os cartafoles públicos"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
-msgid "Global Address List"
-msgstr "Lista global de enderezos"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Elementos eliminados"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Borradores"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Diario"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Notas"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Caixa de saída"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Elementos enviados"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Tarefas"
-
 #: ../servers/groupwise/e-gw-connection.c:225
 msgid "Invalid connection"
-msgstr "A conexión non é válida"
+msgstr "A conexión non é correcta"
 
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid response from server"
-msgstr "A resposta do servidor non é válida"
+msgstr "A resposta do servidor non é correcta"
 
 #: ../servers/groupwise/e-gw-connection.c:231
 msgid "No response from the server"
@@ -5347,20 +5142,4 @@ msgstr "Non houbo resposta do servidor"
 
 #: ../servers/groupwise/e-gw-connection.c:237
 msgid "Bad parameter"
-msgstr "O parámetro non é válido"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Backend de ficheiro da axenda de enderezos do Evolution"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Backend de ficheiro de calendario e webcal Evolution"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Servizo de verificación de interface do Evolution data server"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Servizo de inicio de sesión do Evolution data server"
+msgstr "O parámetro non é correcto"



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