[gnome-online-accounts] Updated Spanish Translation
- From: Daniel Mustieles García <dmustieles src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] Updated Spanish Translation
- Date: Tue, 27 Aug 2013 17:47:24 +0000 (UTC)
commit 883f6368a3d6ca6591f0aae58db02316e041854c
Author: Daniel Mustieles <daniel mustieles gmail com>
Date: Tue Aug 27 19:47:10 2013 +0200
Updated Spanish Translation
po/es.po | 338 +++++++-------------------------------------------------------
1 files changed, 37 insertions(+), 301 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index 944fd74..cfebedf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,42 +9,26 @@ msgstr ""
"Project-Id-Version: gnome-online-accounts master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
"online-accounts&keywords=I18N+L10N&component=general\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-08-22 14:17+0000\n"
-"PO-Revision-Date: 2013-08-27 18:24+0200\n"
-=======
-"POT-Creation-Date: 2013-04-22 14:30+0000\n"
-"PO-Revision-Date: 2013-04-22 17:34+0200\n"
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
"Last-Translator: Daniel Mustieles <daniel mustieles gmail com>\n"
"Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"PO-Revision-Date: 2013-08-27 19:45+0200\n"
"X-Generator: Gtranslator 2.91.6\n"
#. TODO: more specific
-#: ../src/daemon/goadaemon.c:788 ../src/daemon/goadaemon.c:1034
-=======
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
-
#. TODO: more specific
+#: ../src/daemon/goadaemon.c:788 ../src/daemon/goadaemon.c:1034
#: ../src/daemon/goadaemon.c:773 ../src/daemon/goadaemon.c:983
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Failed to find a provider for: %s"
msgstr "Falló al buscar un proveedor para: %s"
#. TODO: more specific
-<<<<<<< HEAD
-#: ../src/daemon/goadaemon.c:1022
-=======
-#: ../src/daemon/goadaemon.c:971
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
+#: ../src/daemon/goadaemon.c:1022 ../src/daemon/goadaemon.c:971
msgid "ProviderType property is not set for account"
msgstr "Propiedad «ProviderType» no establecida para la cuenta"
@@ -91,15 +75,12 @@ msgstr "Microsoft Exchange"
#. TODO: more specific
#: ../src/goabackend/goaexchangeprovider.c:317
#: ../src/goabackend/goaexchangeprovider.c:1047
-<<<<<<< HEAD
#: ../src/goabackend/goaowncloudprovider.c:403
#: ../src/goabackend/goaowncloudprovider.c:1201
-=======
#: ../src/goabackend/goagoogleprovider.c:620
#: ../src/goabackend/goagoogleprovider.c:808
#: ../src/goabackend/goaowncloudprovider.c:376
#: ../src/goabackend/goaowncloudprovider.c:1168
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Did not find password with identity `%s' in credentials"
msgstr "No se encontró la contraseña con la identidad «%s» en las credenciales"
@@ -109,35 +90,26 @@ msgstr "No se encontró la contraseña con la identidad «%s» en las credencial
#. * (%s, %d) is the error domain and code.
#.
#: ../src/goabackend/goaexchangeprovider.c:345
-<<<<<<< HEAD
#: ../src/goabackend/goaowncloudprovider.c:426
-=======
#: ../src/goabackend/goagoogleprovider.c:643
#: ../src/goabackend/goaowncloudprovider.c:399
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Invalid password with username `%s' (%s, %d): "
msgstr "Contraseña incorrecta para el nombre de usuario «%s» (%s, %d): "
#: ../src/goabackend/goaexchangeprovider.c:510
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:697
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:696
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_E-mail"
msgstr "Corr_eo-e"
#: ../src/goabackend/goaexchangeprovider.c:511
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:717
#: ../src/goabackend/goaimapsmtpprovider.c:737
#: ../src/goabackend/goaowncloudprovider.c:666
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:716
#: ../src/goabackend/goaimapsmtpprovider.c:736
#: ../src/goabackend/goaowncloudprovider.c:639
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Password"
msgstr "_Contraseña"
@@ -146,45 +118,33 @@ msgid "_Custom"
msgstr "_Personalizado"
#: ../src/goabackend/goaexchangeprovider.c:533
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:716
#: ../src/goabackend/goaimapsmtpprovider.c:736
#: ../src/goabackend/goakerberosprovider.c:1134
#: ../src/goabackend/goaowncloudprovider.c:665
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:715
#: ../src/goabackend/goaimapsmtpprovider.c:735
-#: ../src/goabackend/goakerberosprovider.c:1134
#: ../src/goabackend/goaowncloudprovider.c:638
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "User_name"
msgstr "Nombre de _usuario"
#: ../src/goabackend/goaexchangeprovider.c:534
-<<<<<<< HEAD
#: ../src/goabackend/goaowncloudprovider.c:664
-=======
#: ../src/goabackend/goaowncloudprovider.c:637
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Server"
msgstr "_Servidor"
#: ../src/goabackend/goaexchangeprovider.c:564
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:769
#: ../src/goabackend/goakerberosprovider.c:1159
#: ../src/goabackend/goaowncloudprovider.c:695
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:768
-#: ../src/goabackend/goakerberosprovider.c:1159
#: ../src/goabackend/goaowncloudprovider.c:668
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "Connecting…"
msgstr "Conectando…"
#: ../src/goabackend/goaexchangeprovider.c:669
#: ../src/goabackend/goaexchangeprovider.c:864
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:929
#: ../src/goabackend/goaimapsmtpprovider.c:964
#: ../src/goabackend/goaimapsmtpprovider.c:1052
@@ -198,59 +158,48 @@ msgstr "Conectando…"
#: ../src/goabackend/goatelepathyprovider.c:466
#: ../src/goabackend/goatelepathyprovider.c:515
#: ../src/goabackend/goatelepathyprovider.c:689
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:928
#: ../src/goabackend/goaimapsmtpprovider.c:963
#: ../src/goabackend/goaimapsmtpprovider.c:1051
#: ../src/goabackend/goaimapsmtpprovider.c:1307
#: ../src/goabackend/goaimapsmtpprovider.c:1380
-#: ../src/goabackend/goakerberosprovider.c:1550
#: ../src/goabackend/goaoauth2provider.c:1131
-#: ../src/goabackend/goaoauthprovider.c:1041
#: ../src/goabackend/goaowncloudprovider.c:779
#: ../src/goabackend/goaowncloudprovider.c:991
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Dialog was dismissed"
msgstr "Se descartó el diálogo"
#: ../src/goabackend/goaexchangeprovider.c:707
#: ../src/goabackend/goaexchangeprovider.c:892
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:994
#: ../src/goabackend/goaimapsmtpprovider.c:1085
#: ../src/goabackend/goaimapsmtpprovider.c:1332
#: ../src/goabackend/goaimapsmtpprovider.c:1406
#: ../src/goabackend/goaowncloudprovider.c:848
#: ../src/goabackend/goaowncloudprovider.c:1040
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:993
#: ../src/goabackend/goaimapsmtpprovider.c:1084
#: ../src/goabackend/goaimapsmtpprovider.c:1331
#: ../src/goabackend/goaimapsmtpprovider.c:1405
#: ../src/goabackend/goaowncloudprovider.c:821
#: ../src/goabackend/goaowncloudprovider.c:1012
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Dialog was dismissed (%s, %d): "
msgstr "Se descartó el diálogo (%s, %d): "
#: ../src/goabackend/goaexchangeprovider.c:720
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:1007
#: ../src/goabackend/goaimapsmtpprovider.c:1098
#: ../src/goabackend/goaowncloudprovider.c:861
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:1006
#: ../src/goabackend/goaimapsmtpprovider.c:1097
#: ../src/goabackend/goaowncloudprovider.c:834
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Ignore"
msgstr "_Ignorar"
#: ../src/goabackend/goaexchangeprovider.c:725
#: ../src/goabackend/goaexchangeprovider.c:911
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:1012
#: ../src/goabackend/goaimapsmtpprovider.c:1103
#: ../src/goabackend/goaimapsmtpprovider.c:1351
@@ -258,15 +207,12 @@ msgstr "_Ignorar"
#: ../src/goabackend/goakerberosprovider.c:1660
#: ../src/goabackend/goaowncloudprovider.c:866
#: ../src/goabackend/goaowncloudprovider.c:1059
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:1011
#: ../src/goabackend/goaimapsmtpprovider.c:1102
#: ../src/goabackend/goaimapsmtpprovider.c:1350
#: ../src/goabackend/goaimapsmtpprovider.c:1424
-#: ../src/goabackend/goakerberosprovider.c:1660
#: ../src/goabackend/goaowncloudprovider.c:839
#: ../src/goabackend/goaowncloudprovider.c:1031
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Try Again"
msgstr "In_tentarlo de nuevo"
@@ -276,50 +222,37 @@ msgid "Error connecting to Microsoft Exchange server"
msgstr "Error al conectar al servidor de Microsoft Exchange"
#: ../src/goabackend/goaexchangeprovider.c:966
-<<<<<<< HEAD
#: ../src/goabackend/goafacebookprovider.c:455
#: ../src/goabackend/goagoogleprovider.c:546
#: ../src/goabackend/goakerberosprovider.c:1731
#: ../src/goabackend/goaowncloudprovider.c:1115
#: ../src/goabackend/goatelepathyprovider.c:897
-=======
#: ../src/goabackend/goafacebookprovider.c:417
#: ../src/goabackend/goagoogleprovider.c:688
-#: ../src/goabackend/goakerberosprovider.c:1731
#: ../src/goabackend/goaowncloudprovider.c:1087
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goawindowsliveprovider.c:432
msgid "Use for"
msgstr "Usar para"
#: ../src/goabackend/goaexchangeprovider.c:968
-<<<<<<< HEAD
#: ../src/goabackend/goagoogleprovider.c:548
-=======
#: ../src/goabackend/goagoogleprovider.c:690
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Mail"
msgstr "Co_rreo"
#: ../src/goabackend/goaexchangeprovider.c:973
-<<<<<<< HEAD
#: ../src/goabackend/goagoogleprovider.c:553
#: ../src/goabackend/goaowncloudprovider.c:1117
-=======
#: ../src/goabackend/goagoogleprovider.c:695
#: ../src/goabackend/goaowncloudprovider.c:1089
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "Cale_ndar"
msgstr "Cale_ndario"
#: ../src/goabackend/goaexchangeprovider.c:978
-<<<<<<< HEAD
#: ../src/goabackend/goagoogleprovider.c:558
#: ../src/goabackend/goaowncloudprovider.c:1122
-=======
#: ../src/goabackend/goagoogleprovider.c:700
#: ../src/goabackend/goaowncloudprovider.c:1094
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "_Contacts"
msgstr "_Contactos"
@@ -328,52 +261,38 @@ msgid "Facebook"
msgstr "Facebook"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-<<<<<<< HEAD
#: ../src/goabackend/goafacebookprovider.c:218
#: ../src/goabackend/goagoogleprovider.c:207
-=======
#: ../src/goabackend/goafacebookprovider.c:211
#: ../src/goabackend/goagoogleprovider.c:211
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goatwitterprovider.c:166
#: ../src/goabackend/goawindowsliveprovider.c:195
#: ../src/goabackend/goayahooprovider.c:187
#, c-format
msgid "Expected status 200 when requesting guid, instead got status %d (%s)"
msgstr ""
-<<<<<<< HEAD
-"Se esperaba un estado 200 cuando se solicitó el «guid», en su lugar se "
-"obtuvo el estado %d (%s)"
#: ../src/goabackend/goafacebookprovider.c:237
#: ../src/goabackend/goafacebookprovider.c:249
#: ../src/goabackend/goafacebookprovider.c:259
-=======
-"Se esperaba un estado 200 cuando se solicitó el «guid», en su lugar se obtuvo "
-"el estado %d (%s)"
-
#: ../src/goabackend/goafacebookprovider.c:230
#: ../src/goabackend/goafacebookprovider.c:242
#: ../src/goabackend/goafacebookprovider.c:252
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaflickrprovider.c:208
#: ../src/goabackend/goaflickrprovider.c:220
#: ../src/goabackend/goaflickrprovider.c:230
#: ../src/goabackend/goaflickrprovider.c:240
#: ../src/goabackend/goaflickrprovider.c:250
-<<<<<<< HEAD
#: ../src/goabackend/goagoogleprovider.c:226
#: ../src/goabackend/goagoogleprovider.c:238
#: ../src/goabackend/goaoauth2provider.c:682
#: ../src/goabackend/goaoauth2provider.c:712
#: ../src/goabackend/goaoauth2provider.c:724
-=======
#: ../src/goabackend/goagoogleprovider.c:230
#: ../src/goabackend/goagoogleprovider.c:242
#: ../src/goabackend/goaoauth2provider.c:660
#: ../src/goabackend/goaoauth2provider.c:690
#: ../src/goabackend/goaoauth2provider.c:702
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goatwitterprovider.c:185
#: ../src/goabackend/goatwitterprovider.c:197
#: ../src/goabackend/goatwitterprovider.c:207
@@ -386,34 +305,23 @@ msgstr ""
#: ../src/goabackend/goayahooprovider.c:275
#: ../src/goabackend/goayahooprovider.c:287
#: ../src/goabackend/goayahooprovider.c:298
-#, c-format
-<<<<<<< HEAD
-msgid "Could not parse response"
-msgstr "No se pudo analizar la respuesta"
-
#: ../src/goabackend/goafacebookprovider.c:457
#: ../src/goabackend/goagoogleprovider.c:563
#: ../src/goabackend/goatelepathyprovider.c:899
-=======
-#| msgid "Could not erase identity: %k"
msgid "Could not parse response"
msgstr "No se pudo analizar la respuesta"
#: ../src/goabackend/goafacebookprovider.c:419
#: ../src/goabackend/goagoogleprovider.c:705
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goawindowsliveprovider.c:434
msgid "C_hat"
msgstr "C_hat"
-<<<<<<< HEAD
#: ../src/goabackend/goafacebookprovider.c:462
#: ../src/goabackend/goaflickrprovider.c:430
msgid "_Photos"
msgstr "_Fotos"
-=======
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaflickrprovider.c:83
msgid "Flickr"
msgstr "Flickr"
@@ -427,23 +335,20 @@ msgstr ""
#: ../src/goabackend/goaflickrprovider.c:328
#: ../src/goabackend/goayahooprovider.c:350
-msgid "Your system time is invalid. Check your date and time settings."
-<<<<<<< HEAD
-msgstr ""
-"La hora de su sistema no es válida. Compruebe su configuración de fecha y "
-"hora."
-
#: ../src/goabackend/goagoogleprovider.c:82
+#: ../src/goabackend/goagoogleprovider.c:86
msgid "Google"
msgstr "Google"
#: ../src/goabackend/goagoogleprovider.c:568
#: ../src/goabackend/goaowncloudprovider.c:1127
#: ../src/goabackend/goawindowsliveprovider.c:439
+#: ../src/goabackend/goagoogleprovider.c:710
msgid "_Documents"
msgstr "_Documentos"
#. TODO: more specific
+#. TODO: more specific
#: ../src/goabackend/goaimapauthlogin.c:99
#: ../src/goabackend/goasmtpauthplain.c:146
#, c-format
@@ -451,6 +356,7 @@ msgid "Service not available"
msgstr "Servicio no disponible"
#. TODO: more specific
+#. TODO: more specific
#: ../src/goabackend/goaimapauthlogin.c:120
#: ../src/goabackend/goasmtpauthplain.c:115
#, c-format
@@ -459,12 +365,14 @@ msgstr "Falló la autenticación"
#: ../src/goabackend/goaimapauthlogin.c:145
#: ../src/goabackend/goasmtpauthplain.c:646
+#: ../src/goabackend/goasmtpauthplain.c:619
#, c-format
msgid "Server does not support PLAIN"
msgstr "El servidor no soporta PLAIN"
#: ../src/goabackend/goaimapauthlogin.c:199
#: ../src/goabackend/goasmtpauthplain.c:751
+#: ../src/goabackend/goasmtpauthplain.c:731
#, c-format
msgid "Server does not support STARTTLS"
msgstr "El servidor no soporta STARTTLS"
@@ -473,20 +381,15 @@ msgstr "El servidor no soporta STARTTLS"
msgid "IMAP and SMTP"
msgstr "IMAP y SMTP"
-#: ../src/goabackend/goaimapsmtpprovider.c:362
-#, c-format
-msgid "Did not find imap-password with identity `%s' in credentials"
-=======
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
-msgstr ""
-"No se encontró la contraseña de IMAP con la identidad «%s» en las "
-"credenciales"
-
-<<<<<<< HEAD
#. Translators: the first %s is the IMAP
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
+#. Translators: the first %s is the IMAP
+#. * username (eg., rishi), and the (%s, %d)
+#. * is the error domain and code.
+#.
+#: ../src/goabackend/goaimapsmtpprovider.c:362
#: ../src/goabackend/goaimapsmtpprovider.c:391
#, c-format
msgid "Invalid imap-password with username `%s' (%s, %d): "
@@ -504,88 +407,23 @@ msgstr ""
#. * username (eg., rishi), and the (%s, %d)
#. * is the error domain and code.
#.
+#. Translators: the first %s is the SMTP
+#. * username (eg., rishi), and the (%s, %d)
+#. * is the error domain and code.
+#.
#: ../src/goabackend/goaimapsmtpprovider.c:446
#, c-format
msgid "Invalid smtp-password with username `%s' (%s, %d): "
msgstr ""
"Contraseña de SMTP incorrecta para el nombre de usuario «%s» (%s, %d): "
-=======
-#: ../src/goabackend/goaflickrprovider.c:430
-msgid "_Photos"
-msgstr "_Fotos"
-
-#: ../src/goabackend/goagoogleprovider.c:86
-msgid "Google"
-msgstr "Google"
-
-#: ../src/goabackend/goagoogleprovider.c:710
-#: ../src/goabackend/goawindowsliveprovider.c:439
-msgid "_Documents"
-msgstr "_Documentos"
-
-#. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:99
-#: ../src/goabackend/goasmtpauthplain.c:146
-#, c-format
-msgid "Service not available"
-msgstr "Servicio no disponible"
-
-#. TODO: more specific
-#: ../src/goabackend/goaimapauthlogin.c:120
-#: ../src/goabackend/goasmtpauthplain.c:115
-#, c-format
-msgid "Authentication failed"
-msgstr "Falló la autenticación"
-
-#: ../src/goabackend/goaimapauthlogin.c:145
-#: ../src/goabackend/goasmtpauthplain.c:619
-#, c-format
-msgid "Server does not support PLAIN"
-msgstr "El servidor no soporta PLAIN"
-
-#: ../src/goabackend/goaimapauthlogin.c:199
-#: ../src/goabackend/goasmtpauthplain.c:731
-#, c-format
-#| msgid "Server does not support PLAIN"
-msgid "Server does not support STARTTLS"
-msgstr "El servidor no soporta STARTTLS"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:82
-msgid "IMAP and SMTP"
-msgstr "IMAP y SMTP"
-
#: ../src/goabackend/goaimapsmtpprovider.c:362
#, c-format
msgid "Did not find imap-password with identity `%s' in credentials"
msgstr ""
-"No se encontró la contraseña de IMAP con la identidad «%s» en las credenciales"
-
-#. Translators: the first %s is the IMAP
-#. * username (eg., rishi), and the (%s, %d)
-#. * is the error domain and code.
-#.
-#: ../src/goabackend/goaimapsmtpprovider.c:391
-#, c-format
-msgid "Invalid imap-password with username `%s' (%s, %d): "
-msgstr "Contraseña de IMAP incorrecta para el nombre de usuario «%s» (%s, %d): "
-
-#: ../src/goabackend/goaimapsmtpprovider.c:415
-#, c-format
-msgid "Did not find smtp-password with identity `%s' in credentials"
-msgstr ""
-"No se encontró la contraseña de SMTP con la identidad «%s» en las credenciales"
-
-#. Translators: the first %s is the SMTP
-#. * username (eg., rishi), and the (%s, %d)
-#. * is the error domain and code.
-#.
-#: ../src/goabackend/goaimapsmtpprovider.c:446
-#, c-format
-msgid "Invalid smtp-password with username `%s' (%s, %d): "
-msgstr "Contraseña de SMTP incorrecta para el nombre de usuario «%s» (%s, %d): "
+"No se encontró la contraseña de IMAP con la identidad «%s» en las "
+"credenciales"
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#. Translators: the following four strings are used to show a
#. * combo box similar to the one in the evolution module.
#. * Encryption: None
@@ -608,75 +446,49 @@ msgstr "STARTTLS después de conectar"
msgid "SSL on a dedicated port"
msgstr "SSL en un puerto dedicado"
-<<<<<<< HEAD
#: ../src/goabackend/goaimapsmtpprovider.c:698
-msgid "_Name"
-msgstr "_Nombre"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:715
-msgid "IMAP _Server"
-msgstr "_Servidor IMAP"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:735
-msgid "SMTP _Server"
-msgstr "_Servidor SMTP"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:1017
-#: ../src/goabackend/goaimapsmtpprovider.c:1344
-msgid "Error connecting to IMAP server"
-msgstr "Error al conectar al servidor IMAP"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:1108
-#: ../src/goabackend/goaimapsmtpprovider.c:1418
-msgid "Error connecting to SMTP server"
-msgstr "Error al conectar al servidor SMTP"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:1526
-msgid "E-mail"
-msgstr "Correo-e"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:1530
-msgid "Name"
-msgstr "Nombre"
-
-#: ../src/goabackend/goaimapsmtpprovider.c:1540
-#: ../src/goabackend/goaimapsmtpprovider.c:1543
-msgid "IMAP"
-msgstr "IMAP"
-
#: ../src/goabackend/goaimapsmtpprovider.c:1554
#: ../src/goabackend/goaimapsmtpprovider.c:1557
-=======
#: ../src/goabackend/goaimapsmtpprovider.c:697
msgid "_Name"
msgstr "_Nombre"
+#: ../src/goabackend/goaimapsmtpprovider.c:715
#: ../src/goabackend/goaimapsmtpprovider.c:714
msgid "IMAP _Server"
msgstr "_Servidor IMAP"
+#: ../src/goabackend/goaimapsmtpprovider.c:735
#: ../src/goabackend/goaimapsmtpprovider.c:734
msgid "SMTP _Server"
msgstr "_Servidor SMTP"
+#: ../src/goabackend/goaimapsmtpprovider.c:1017
+#: ../src/goabackend/goaimapsmtpprovider.c:1344
#: ../src/goabackend/goaimapsmtpprovider.c:1016
#: ../src/goabackend/goaimapsmtpprovider.c:1343
msgid "Error connecting to IMAP server"
msgstr "Error al conectar al servidor IMAP"
+#: ../src/goabackend/goaimapsmtpprovider.c:1108
+#: ../src/goabackend/goaimapsmtpprovider.c:1418
#: ../src/goabackend/goaimapsmtpprovider.c:1107
#: ../src/goabackend/goaimapsmtpprovider.c:1417
msgid "Error connecting to SMTP server"
msgstr "Error al conectar al servidor SMTP"
+#: ../src/goabackend/goaimapsmtpprovider.c:1526
#: ../src/goabackend/goaimapsmtpprovider.c:1525
msgid "E-mail"
msgstr "Correo-e"
+#: ../src/goabackend/goaimapsmtpprovider.c:1530
#: ../src/goabackend/goaimapsmtpprovider.c:1529
msgid "Name"
msgstr "Nombre"
+#: ../src/goabackend/goaimapsmtpprovider.c:1540
+#: ../src/goabackend/goaimapsmtpprovider.c:1543
#: ../src/goabackend/goaimapsmtpprovider.c:1539
#: ../src/goabackend/goaimapsmtpprovider.c:1542
msgid "IMAP"
@@ -684,7 +496,6 @@ msgstr "IMAP"
#: ../src/goabackend/goaimapsmtpprovider.c:1553
#: ../src/goabackend/goaimapsmtpprovider.c:1556
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "SMTP"
msgstr "SMTP"
@@ -717,11 +528,8 @@ msgid "Enterprise domain or realm name"
msgstr "Dominio empresarial o nombre del dominio"
#: ../src/goabackend/goakerberosprovider.c:1359
-<<<<<<< HEAD
#: ../src/goaidentity/goaidentityservice.c:1085
-=======
#: ../src/goaidentity/goaidentityservice.c:1084
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "Log In to Realm"
msgstr "Iniciar sesión en el dominio"
@@ -747,11 +555,8 @@ msgid "Network _Resources"
msgstr "_Recursos de red"
#. Translators: the %d is a HTTP status code and the %s is a textual description of it
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:658
-=======
#: ../src/goabackend/goaoauth2provider.c:636
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaoauthprovider.c:586
#, c-format
msgid ""
@@ -760,23 +565,17 @@ msgstr ""
"Se esperaba un estado 200 cuando se solicitó acceso al «token», en su lugar "
"se obtuvo el estado %d (%s)"
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:916
#: ../src/goabackend/goaoauth2provider.c:956
-=======
#: ../src/goabackend/goaoauth2provider.c:911
#: ../src/goabackend/goaoauth2provider.c:951
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Authorization response was \"%s\""
msgstr "«%s» fue la respuesta a la autorización"
#. Translators: The verb "Paste" is used when asking the user to paste a string from a web browser window
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1059
-=======
#: ../src/goabackend/goaoauth2provider.c:1057
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid ""
"Paste authorization code obtained from the <a href=\"%s\">authorization "
@@ -785,48 +584,33 @@ msgstr ""
"Pegue el código de autorización obtenido en la <a href=\"%s\">página de "
"autorización</a>:"
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1159
-=======
#: ../src/goabackend/goaoauth2provider.c:1157
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaoauthprovider.c:1072
msgid "Error getting an Access Token: "
msgstr "Error al obtener el «token» de acceso: "
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1174
-=======
#: ../src/goabackend/goaoauth2provider.c:1172
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaoauthprovider.c:1085
msgid "Error getting identity: "
msgstr "Error al obtener la identidad: "
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1386
-=======
#: ../src/goabackend/goaoauth2provider.c:1462
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaoauthprovider.c:1391
#, c-format
msgid "Was asked to login as %s, but logged in as %s"
msgstr "Se solicitó iniciar sesión como %s, pero se inició sesión como %s"
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1542
-=======
#: ../src/goabackend/goaoauth2provider.c:1633
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Credentials do not contain access_token"
msgstr "Las credenciales no contienen el «access_token»"
-<<<<<<< HEAD
#: ../src/goabackend/goaoauth2provider.c:1581
-=======
#: ../src/goabackend/goaoauth2provider.c:1672
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goaoauthprovider.c:1619
#, c-format
msgid "Failed to refresh access token (%s, %d): "
@@ -874,29 +658,20 @@ msgstr "Las credenciales no contienen «access_token» o «access_token_secret»
msgid "ownCloud"
msgstr "ownCloud"
-<<<<<<< HEAD
#: ../src/goabackend/goaowncloudprovider.c:871
#: ../src/goabackend/goaowncloudprovider.c:1052
-msgid "Error connecting to ownCloud server"
-msgstr "Error al conectar al servidor de ownCloud"
-
-#: ../src/goabackend/goaowncloudprovider.c:1132
-msgid "_Files"
-msgstr "_Archivos"
-
#: ../src/goabackend/goaprovider.c:714
-=======
#: ../src/goabackend/goaowncloudprovider.c:844
#: ../src/goabackend/goaowncloudprovider.c:1024
msgid "Error connecting to ownCloud server"
msgstr "Error al conectar al servidor de ownCloud"
+#: ../src/goabackend/goaowncloudprovider.c:1132
#: ../src/goabackend/goaowncloudprovider.c:1099
msgid "_Files"
msgstr "_Archivos"
#: ../src/goabackend/goaprovider.c:712
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "ensure_credentials_sync is not implemented on type %s"
msgstr "«ensure_credentials_sync» no está implementado en el tipo %s"
@@ -904,48 +679,29 @@ msgstr "«ensure_credentials_sync» no está implementado en el tipo %s"
#. TODO: more specific
#: ../src/goabackend/goasmtpauthplain.c:161
#, c-format
-<<<<<<< HEAD
-=======
-#| msgid "Service not available"
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "TLS not available"
msgstr "TLS no disponible"
#. TODO: more specific
-<<<<<<< HEAD
-#: ../src/goabackend/goasmtpauthplain.c:227
-#, c-format
-msgid "org.gnome.OnlineAccounts.Mail is not available"
-msgstr "org.gnome.OnlineAccounts.Mail no está disponible"
-
-#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:237
-#, c-format
-msgid "Failed to parse email address"
-msgstr "Falló al analizar la dirección de correo-e"
-
-#. TODO: more specific
-#: ../src/goabackend/goasmtpauthplain.c:249
-#, c-format
-msgid "Cannot do SMTP PLAIN without a domain"
-msgstr "No se puede hacer SMTP PLAIN sin un dominio"
-
#. TODO: more specific
+#: ../src/goabackend/goasmtpauthplain.c:227
#: ../src/goabackend/goasmtpauthplain.c:287
-#, c-format
-=======
#: ../src/goabackend/goasmtpauthplain.c:193
#, c-format
msgid "org.gnome.OnlineAccounts.Mail is not available"
msgstr "org.gnome.OnlineAccounts.Mail no está disponible"
#. TODO: more specific
+#. TODO: more specific
+#: ../src/goabackend/goasmtpauthplain.c:237
#: ../src/goabackend/goasmtpauthplain.c:203
#, c-format
msgid "Failed to parse email address"
msgstr "Falló al analizar la dirección de correo-e"
#. TODO: more specific
+#. TODO: more specific
+#: ../src/goabackend/goasmtpauthplain.c:249
#: ../src/goabackend/goasmtpauthplain.c:215
#, c-format
msgid "Cannot do SMTP PLAIN without a domain"
@@ -954,21 +710,16 @@ msgstr "No se puede hacer SMTP PLAIN sin un dominio"
#. TODO: more specific
#: ../src/goabackend/goasmtpauthplain.c:253
#, c-format
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
msgid "Did not find smtp-password in credentials"
msgstr "No se encontró la contraseña de SMTP en las credenciales"
#. TODO: more specific
-<<<<<<< HEAD
#: ../src/goabackend/goasmtpauthplain.c:298
-=======
#: ../src/goabackend/goasmtpauthplain.c:264
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "Cannot do SMTP PLAIN without a password"
msgstr "No se puede hacer SMTP PLAIN sin una contraseña"
-<<<<<<< HEAD
#: ../src/goabackend/goatelepathyprovider.c:183
#, c-format
msgid "Telepathy chat account not found"
@@ -1018,12 +769,6 @@ msgstr "_Detalles personales"
msgid "Twitter"
msgstr "Twitter"
-=======
-#: ../src/goabackend/goatwitterprovider.c:81
-msgid "Twitter"
-msgstr "Twitter"
-
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#: ../src/goabackend/goautils.c:86
#, c-format
msgid "A %s account already exists for %s"
@@ -1126,27 +871,18 @@ msgstr "Tiempo"
msgid "Time to fire"
msgstr "Tiempo para la ejecución"
-<<<<<<< HEAD
#: ../src/goaidentity/goaidentityservice.c:378
-msgid "initial secret passed before secret key exchange"
-msgstr "secreto inicial pasado antes del intercambio de la clave secreta"
-
-#: ../src/goaidentity/goaidentityservice.c:570
-msgid "Initial secret key is invalid"
-msgstr "La clave secreta inicial no es válida"
-
#: ../src/goaidentity/goaidentityservice.c:1090
-=======
#: ../src/goaidentity/goaidentityservice.c:377
msgid "initial secret passed before secret key exchange"
msgstr "secreto inicial pasado antes del intercambio de la clave secreta"
+#: ../src/goaidentity/goaidentityservice.c:570
#: ../src/goaidentity/goaidentityservice.c:569
msgid "Initial secret key is invalid"
msgstr "La clave secreta inicial no es válida"
#: ../src/goaidentity/goaidentityservice.c:1089
->>>>>>> 23ec25dbc0d2cbaf585c027fcaafdbb32d15986d
#, c-format
msgid "The network realm %s needs some information to sign you in."
msgstr "El dominio de red %s necesita cierta información para verificarle."
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
