[evolution-kolab] Updated Spanish translation

[Daniel Mustieles GarcÃa <dmustieles src gnome org>]

commit 08738d94c70a09c863981acf05ab2ef092abcd5a
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Mon Oct 22 12:35:17 2012 +0200

    Updated Spanish translation

 po/es.po |   76 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 42 insertions(+), 34 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 07a7e9e..36b6193 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: evolution-kolab\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution-kolab&keywords=I18N+L10N&component=build\n"
-"POT-Creation-Date: 2012-10-16 13:58+0000\n"
-"PO-Revision-Date: 2012-10-16 18:10+0200\n"
+"POT-Creation-Date: 2012-10-19 18:27+0000\n"
+"PO-Revision-Date: 2012-10-22 10:23+0200\n"
 "Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
 "Language-Team: EspaÃol <gnome-es-list gnome org>\n"
 "Language: es\n"
@@ -256,42 +256,51 @@ msgctxt "Sync Conflict Resolution"
 msgid "Remember my choice and do not ask me again for this folder"
 msgstr "Recordar mi elecciÃn y no volver a preguntarme sobre esta carpeta"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:176
+#: ../src/eplugin/e-kolab-folder-metadata.c:298
 msgctxt "Kolab Folder Metadata"
 msgid "Folder Type (Annotation)"
 msgstr "Tipo de carpeta (AnotaciÃn)"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:189
+#: ../src/eplugin/e-kolab-folder-metadata.c:311
 msgctxt "Kolab Folder Type"
 msgid "Mail"
 msgstr "Correo-e"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:197
+#: ../src/eplugin/e-kolab-folder-metadata.c:319
 msgctxt "Kolab Folder Type"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:204
+#: ../src/eplugin/e-kolab-folder-metadata.c:326
 msgctxt "Kolab Folder Type"
 msgid "Memos"
 msgstr "Notas"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:211
+#: ../src/eplugin/e-kolab-folder-metadata.c:333
 msgctxt "Kolab Folder Type"
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:218
+#: ../src/eplugin/e-kolab-folder-metadata.c:340
 msgctxt "Kolab Folder Type"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:227
+#: ../src/eplugin/e-kolab-folder-metadata.c:349
 msgctxt "Kolab Folder Metadata"
 msgid "Kolab Folder Options"
 msgstr "Opciones de carpeta de Kolab"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:238
+#: ../src/eplugin/e-kolab-folder-metadata.c:361
+msgctxt "Sync Conflict Resolution"
+msgid ""
+"Strategy for resolving PIM conflicts when synchronizing\n"
+"with the Kolab server"
+msgstr ""
+"Estrategia para resolver conflictos PIM al sincronizar\n"
+"con el servidor Kolab"
+
+#: ../src/eplugin/e-kolab-folder-metadata.c:378
 msgctxt "Kolab Folder Options"
 msgid "Show all PIM folders in this Kolab account"
 msgstr "Mostrar todas las carpetas PIM en esta cuenta de Kolab"
@@ -347,13 +356,13 @@ msgid "Current Folder Permissions"
 msgstr "Permisos de la carpeta actual"
 
 #: ../src/eplugin/e-kolab-folder-permissions.c:636
-#: ../src/eplugin/e-kolab-folder-permissions.c:911
+#: ../src/eplugin/e-kolab-folder-permissions.c:912
 msgctxt "Kolab Folder Permissions"
 msgid "(No access rights retrieved from server)"
 msgstr "(No se han obtenido derechos de acceso del servidor)"
 
 #: ../src/eplugin/e-kolab-folder-permissions.c:646
-#: ../src/eplugin/e-kolab-folder-permissions.c:890
+#: ../src/eplugin/e-kolab-folder-permissions.c:891
 msgctxt "Kolab Folder Permissions"
 msgid "IMAP Folder Permissions"
 msgstr "Permisos de carpetas IMAP"
@@ -368,62 +377,62 @@ msgctxt "Kolab Folder Permissions"
 msgid "Permissions"
 msgstr "Permisos"
 
-#: ../src/eplugin/e-kolab-folder-permissions.c:906
+#: ../src/eplugin/e-kolab-folder-permissions.c:907
 msgctxt "Kolab Folder Permissions"
 msgid "My Folder Permissions"
 msgstr "Permisos de mi carpeta"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:60 ../src/eplugin/e-kolab-plugin-ui.c:69
-#: ../src/eplugin/e-kolab-plugin-ui.c:78 ../src/eplugin/e-kolab-plugin-ui.c:87
-#: ../src/eplugin/e-kolab-plugin-ui.c:96
+#: ../src/eplugin/e-kolab-plugin-ui.c:62 ../src/eplugin/e-kolab-plugin-ui.c:71
+#: ../src/eplugin/e-kolab-plugin-ui.c:80 ../src/eplugin/e-kolab-plugin-ui.c:89
+#: ../src/eplugin/e-kolab-plugin-ui.c:98
 msgid "Kolab Folder Properties..."
 msgstr "Propiedades de carpeta en Kolabâ"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:62
+#: ../src/eplugin/e-kolab-plugin-ui.c:64
 msgid "Edit Kolab mail folder properties"
 msgstr "Editar propiedades de la carpeta ÂCorreo en Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:71
+#: ../src/eplugin/e-kolab-plugin-ui.c:73
 msgid "Edit Kolab calendar folder properties"
 msgstr "Editar propiedades de la carpeta ÂCalendario en Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:80
+#: ../src/eplugin/e-kolab-plugin-ui.c:82
 msgid "Edit Kolab memos folder properties"
 msgstr "Editar propiedades de la carpeta ÂNotas en Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:89
+#: ../src/eplugin/e-kolab-plugin-ui.c:91
 msgid "Edit Kolab Tasks folder properties"
 msgstr "Editar propiedades de la carpeta ÂTareas en Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:98
+#: ../src/eplugin/e-kolab-plugin-ui.c:100
 msgid "Edit Kolab contacts folder properties"
 msgstr "Editar propiedades de la carpeta ÂContactos en Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:322
+#: ../src/eplugin/e-kolab-plugin-ui.c:325
 msgid "Edit Kolab Folder Properties..."
 msgstr "Editar propiedades de carpeta en Kolabâ"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:381
+#: ../src/eplugin/e-kolab-plugin-ui.c:429
 msgctxt "Kolab Folder Properties"
 msgid "IMAP Metadata"
 msgstr "Metadatos IMAP"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:390
+#: ../src/eplugin/e-kolab-plugin-ui.c:438
 msgctxt "Kolab Folder Properties"
 msgid "IMAP Access Control"
 msgstr "Control de acceso IMAP"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:178
+#: ../src/eplugin/e-kolab-plugin-util.c:202
 msgctxt "Kolab Folder Properties"
 msgid "Selected Resource:"
 msgstr "Recurso seleccionado:"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:192
+#: ../src/eplugin/e-kolab-plugin-util.c:216
 msgctxt "Kolab Folder Properties"
 msgid "Selected Folder:"
 msgstr "Carpeta seleccionada:"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:372
+#: ../src/eplugin/e-kolab-plugin-util.c:437
 #, c-format
 msgid "Could not get the Kolab store from shell view!"
 msgstr "No se pudo obtener el almacÃn Kolab desde la vista de shell."
@@ -435,7 +444,6 @@ msgstr "AccessID de IMAP ACL no vÃlido"
 
 #: ../src/libekolab/camel-imapx-acl.c:140
 #, c-format
-#| msgid "Invalid internal IMAP ACL datastructure"
 msgid "Invalid IMAP ACL Rights"
 msgstr "Derechos IMAP ACL no vÃlidos"
 
@@ -547,29 +555,29 @@ msgstr ""
 msgid "SQLite Error: could not open/create SQLite database '%s'"
 msgstr "Error de SQLite: no se pudo abrir/crear la base de datos de SQLite Â%sÂ"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:381
-#: ../src/libekolab/camel-kolab-imapx-store.c:478
+#: ../src/libekolab/camel-kolab-imapx-store.c:375
+#: ../src/libekolab/camel-kolab-imapx-store.c:472
 #, c-format
 msgid "Must be online to complete this operation"
 msgstr "Para completar esta operacioÌn debe estar conectado"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:390
+#: ../src/libekolab/camel-kolab-imapx-store.c:384
 #, c-format
 msgid "Could not determine server metadata protocol type"
 msgstr ""
 "No se pudo determinar el tipo de protocolo de los metadatos del servidor"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:846
+#: ../src/libekolab/camel-kolab-imapx-store.c:868
 #, c-format
 msgid "Kolab server %s"
 msgstr "Servidor Kolab %s"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:848
+#: ../src/libekolab/camel-kolab-imapx-store.c:870
 #, c-format
 msgid "Kolab service for %s on %s"
 msgstr "Servicio Kolab para %s en %s"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:1454
+#: ../src/libekolab/camel-kolab-imapx-store.c:1472
 #, c-format
 msgid "Could not get user cache directory from Camel service"
 msgstr "No se pudo obtener la carpeta de cachà del usuario del servicio Camel"