Merge branch 'master' into user

9 files changed, 46 insertions, 36 deletions

diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 7cc993d4b3a..90b1c4dce9d 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:16+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:15+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -565,12 +565,12 @@ msgstr "Rematar a configuración"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:36
+#: templates/layout.user.php:37
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
 
-#: templates/layout.user.php:61
+#: templates/layout.user.php:62
 msgid "Log out"
 msgstr "Desconectar"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index eb36de7de8e..bd6a2ea5452 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:16+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:15+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 583c4d33551..df19cbea75f 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.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-27 02:00+0200\n"
-"PO-Revision-Date: 2013-05-26 08:00+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 06:50+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,23 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/adminrecovery.php:40
-msgid "Recovery key successfully "
-msgstr "O contrasinal foi recuperado satisfactoriamente"
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr "Activada satisfactoriamente a chave de recuperación"
 
-#: ajax/adminrecovery.php:42
-msgid "Could not "
-msgstr "Non foi posíbel"
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr "Desactivada satisfactoriamente a chave de recuperación"
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index a93bbb23ed0..d714531c708 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:17+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 4fd9ed12e9a..c459cd8d91a 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:17+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index e44d3b572f9..4100fddce39 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:17+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:16+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 34dbfbdd712..d6d898969f9 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-28 00:02+0000\n"
+"POT-Creation-Date: 2013-05-31 01:59+0200\n"
+"PO-Revision-Date: 2013-05-30 23:16+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Volver aos ficheiros"
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
-#: helper.php:228
+#: helper.php:236
 msgid "couldn't be determined"
 msgstr "non foi posíbel determinalo"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 293b8002af5..0ea8ef554f0 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:17+0000\n"
+"POT-Creation-Date: 2013-05-31 01:59+0200\n"
+"PO-Revision-Date: 2013-05-30 23:15+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -325,11 +325,11 @@ msgstr "Máis"
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:235 templates/personal.php:105
+#: templates/admin.php:235 templates/personal.php:111
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:237 templates/personal.php:108
+#: templates/admin.php:237 templates/personal.php:114
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -428,31 +428,31 @@ msgstr "Cambiar o contrasinal"
 msgid "Display Name"
 msgstr "Amosar o nome"
 
-#: templates/personal.php:68
+#: templates/personal.php:71
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:70
+#: templates/personal.php:73
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:71
+#: templates/personal.php:74
 msgid "Fill in an email address to enable password recovery"
 msgstr "Escriba un enderezo de correo para activar a recuperación do contrasinal"
 
-#: templates/personal.php:77 templates/personal.php:78
+#: templates/personal.php:83 templates/personal.php:84
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:89
+#: templates/personal.php:95
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:94
+#: templates/personal.php:100
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:96
+#: templates/personal.php:102
 msgid "Use this address to connect to your ownCloud in your file manager"
 msgstr "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros"
 
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index f3921181963..f0b96737a72 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.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-28 02:01+0200\n"
-"PO-Revision-Date: 2013-05-27 23:17+0000\n"
+"POT-Creation-Date: 2013-05-31 01:58+0200\n"
+"PO-Revision-Date: 2013-05-30 23:16+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"