diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 12:14:51 +0100 |
| commit | 4dea6a6228390713c0296dd6a447b9f60a211767 (patch) | |
| tree | e5f7840770ab4ea67f0a58d6642b6b75cfa05fda /l10n/es_AR/core.po | |
| parent | 6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (diff) | |
| parent | 9ee5069f2a1d76c899eeef6cec0f06387764fabd (diff) | |
| download | nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.tar.gz nextcloud-server-4dea6a6228390713c0296dd6a447b9f60a211767.zip | |
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'l10n/es_AR/core.po')
| -rw-r--r-- | l10n/es_AR/core.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po index 0e2ac46282a..7a12fa0ee59 100644 --- a/l10n/es_AR/core.po +++ b/l10n/es_AR/core.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-02-13 00:03+0100\n" -"PO-Revision-Date: 2013-02-12 14:32+0000\n" +"POT-Creation-Date: 2013-02-22 00:06+0100\n" +"PO-Revision-Date: 2013-02-20 23:20+0000\n" "Last-Translator: cjtess <claudio.tessone@gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -389,7 +389,7 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve msgid "The update was successful. Redirecting you to ownCloud now." msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud." -#: lostpassword/controller.php:47 +#: lostpassword/controller.php:48 msgid "ownCloud password reset" msgstr "Restablecer contraseña de ownCloud" |