summaryrefslogtreecommitdiffstats
path: root/l10n/es_MX/core.po
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/es_MX/core.po')
-rw-r--r--l10n/es_MX/core.po64
1 files changed, 36 insertions, 28 deletions
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 7486794d9d7..10a4321b52f 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-03-22 01:55-0400\n"
-"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"POT-Creation-Date: 2014-04-08 01:56-0400\n"
+"PO-Revision-Date: 2014-04-08 05:56+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ajax/share.php:88
+#: ajax/share.php:87
msgid "Expiration date is in the past."
msgstr ""
-#: ajax/share.php:120 ajax/share.php:162
+#: ajax/share.php:119 ajax/share.php:161
#, php-format
msgid "Couldn't send mail to following users: %s "
msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
-#: ajax/update.php:11
+#: ajax/update.php:10
msgid "Turned on maintenance mode"
msgstr "Modo mantenimiento activado"
-#: ajax/update.php:14
+#: ajax/update.php:13
msgid "Turned off maintenance mode"
msgstr "Modo mantenimiento desactivado"
-#: ajax/update.php:17
+#: ajax/update.php:16
msgid "Updated database"
msgstr "Base de datos actualizada"
@@ -134,63 +134,63 @@ msgstr "Noviembre"
msgid "December"
msgstr "Diciembre"
-#: js/js.js:458
+#: js/js.js:479
msgid "Settings"
msgstr "Ajustes"
-#: js/js.js:496
+#: js/js.js:564
msgid "Saving..."
msgstr "Guardando..."
-#: js/js.js:995
+#: js/js.js:1124
msgid "seconds ago"
msgstr "segundos antes"
-#: js/js.js:996
+#: js/js.js:1125
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "Hace %n minuto"
msgstr[1] "Hace %n minutos"
-#: js/js.js:997
+#: js/js.js:1126
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "Hace %n hora"
msgstr[1] "Hace %n horas"
-#: js/js.js:998
+#: js/js.js:1127
msgid "today"
msgstr "hoy"
-#: js/js.js:999
+#: js/js.js:1128
msgid "yesterday"
msgstr "ayer"
-#: js/js.js:1000
+#: js/js.js:1129
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "Hace %n día"
msgstr[1] "Hace %n días"
-#: js/js.js:1001
+#: js/js.js:1130
msgid "last month"
msgstr "el mes pasado"
-#: js/js.js:1002
+#: js/js.js:1131
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "Hace %n mes"
msgstr[1] "Hace %n meses"
-#: js/js.js:1003
+#: js/js.js:1132
msgid "months ago"
msgstr "meses antes"
-#: js/js.js:1004
+#: js/js.js:1133
msgid "last year"
msgstr "el año pasado"
-#: js/js.js:1005
+#: js/js.js:1134
msgid "years ago"
msgstr "años antes"
@@ -229,32 +229,40 @@ msgid "One file conflict"
msgstr "Un conflicto de archivo"
#: js/oc-dialogs.js:367
+msgid "New Files"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid "Already existing files"
+msgstr ""
+
+#: js/oc-dialogs.js:370
msgid "Which files do you want to keep?"
msgstr "¿Que archivos deseas mantener?"
-#: js/oc-dialogs.js:368
+#: js/oc-dialogs.js:371
msgid ""
"If you select both versions, the copied file will have a number added to its"
" name."
msgstr "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre."
-#: js/oc-dialogs.js:376
+#: js/oc-dialogs.js:379
msgid "Cancel"
msgstr "Cancelar"
-#: js/oc-dialogs.js:386
+#: js/oc-dialogs.js:389
msgid "Continue"
msgstr "Continuar"
-#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
msgid "(all selected)"
msgstr "(todos seleccionados)"
-#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+#: js/oc-dialogs.js:439 js/oc-dialogs.js:452
msgid "({count} selected)"
msgstr "({count} seleccionados)"
-#: js/oc-dialogs.js:457
+#: js/oc-dialogs.js:460
msgid "Error loading file exists template"
msgstr "Error cargando plantilla de archivo existente"
@@ -533,14 +541,14 @@ msgstr "Nueva contraseña"
msgid "Reset password"
msgstr "Restablecer contraseña"
-#: setup/controller.php:138
+#: setup/controller.php:140
#, php-format
msgid ""
"Mac OS X is not supported and %s will not work properly on this platform. "
"Use it at your own risk! "
msgstr ""
-#: setup/controller.php:142
+#: setup/controller.php:144
msgid ""
"For the best results, please consider using a GNU/Linux server instead."
msgstr ""