Merge branch 'master' into file_encryption_util_is_error

Conflicts:
	apps/files_encryption/lib/util.php

9 files changed, 19 insertions, 19 deletions

diff --git a/l10n/es/core.po b/l10n/es/core.po
index 61828126fd4..df92a51f20a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-05-27 02:01+0200\n"
+"PO-Revision-Date: 2013-05-26 23:15+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b959c11dfa1..46cecf3a244 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 23:25+0000\n"
+"POT-Creation-Date: 2013-05-27 02:00+0200\n"
+"PO-Revision-Date: 2013-05-26 23:15+0000\n"
 "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index d6c76e9dba3..dbacc267fa5 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-05-26 01:58+0200\n"
+"PO-Revision-Date: 2013-05-25 00:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
 
 #: js/settings-admin.js:11
 msgid "Saving..."
-msgstr ""
+msgstr "Guardando..."
 
 #: templates/settings-admin.php:5 templates/settings-personal.php:4
 msgid "Encryption"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 61bc450c87a..7feeba112ed 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 23:25+0000\n"
+"POT-Creation-Date: 2013-05-27 02:00+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index a371882b629..7f671d97f67 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 23:25+0000\n"
+"POT-Creation-Date: 2013-05-27 02:00+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 6d0aaf76962..99095c72bdf 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 23:26+0000\n"
+"POT-Creation-Date: 2013-05-27 02:00+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 3dcdad61296..eda28e1a8ec 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-05-27 02:01+0200\n"
+"PO-Revision-Date: 2013-05-27 00:02+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 34b0d4d380e..fe5cfc92863 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:02+0200\n"
-"PO-Revision-Date: 2013-05-25 00:02+0000\n"
+"POT-Creation-Date: 2013-05-27 02:01+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 9f85de4c0d1..eb95d5852ff 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.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-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 23:26+0000\n"
+"POT-Creation-Date: 2013-05-27 02:01+0200\n"
+"PO-Revision-Date: 2013-05-26 23:16+0000\n"
 "Last-Translator: xhiena <xhiena@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"