[tx-robot] updated from transifex

146 files changed, 328 insertions, 724 deletions

diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index bb9b876ae73..8250b9c9d7f 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -38,7 +38,6 @@ OC.L10N.register(
     "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
     "I know what I'm doing" : "Ek weet wat ek doen",
-    "Reset password" : "Herstel wagwoord",
     "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -90,10 +89,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-    "Username" : "Gebruikersnaam",
-    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
     "New password" : "Nuwe wagwoord",
+    "Reset password" : "Herstel wagwoord",
     "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
@@ -107,6 +104,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
     "Data folder" : "Data omslag",
     "Configure the database" : "Stel databasis op",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index 373d3dff8b4..f95495870e8 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -36,7 +36,6 @@
     "Couldn't send reset email. Please contact your administrator." : "Die herstel epos kon nie gestuur word nie. Kontak asseblief die stelsel administrateur.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Die \"link\" vir die herstel van jou wagwoord is na jou epos gestuur. As jy dit nie binne 'n redelike tyd ontvang nie, soek deur jou \"spam/junk\" omslagte.<br>As dit nie daar is nie vra jou administrateur vir hulp.",
     "I know what I'm doing" : "Ek weet wat ek doen",
-    "Reset password" : "Herstel wagwoord",
     "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -88,10 +87,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-    "Username" : "Gebruikersnaam",
-    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
     "New password" : "Nuwe wagwoord",
+    "Reset password" : "Herstel wagwoord",
     "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
@@ -105,6 +102,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
     "Data folder" : "Data omslag",
     "Configure the database" : "Stel databasis op",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 2d7bcda9398..c48414bfdfe 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
-    "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
     "Yes" : "نعم",
     "Choose" : "اختيار",
@@ -76,10 +75,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-    "Username" : "إسم المستخدم",
-    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
     "New password" : "كلمات سر جديدة",
+    "Reset password" : "تعديل كلمة السر",
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
@@ -92,6 +89,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة المرور",
     "Data folder" : "مجلد المعلومات",
     "Configure the database" : "أسس قاعدة البيانات",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index fd5c1275e41..439a60aec2a 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -23,7 +23,6 @@
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
-    "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
     "Yes" : "نعم",
     "Choose" : "اختيار",
@@ -74,10 +73,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-    "Username" : "إسم المستخدم",
-    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
     "New password" : "كلمات سر جديدة",
+    "Reset password" : "تعديل كلمة السر",
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
@@ -90,6 +87,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة المرور",
     "Data folder" : "مجلد المعلومات",
     "Configure the database" : "أسس قاعدة البيانات",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index be95fb45e5c..9bf258b0f60 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
     "I know what I'm doing" : "Sé lo que toi faciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
     "No" : "Non",
     "Yes" : "Sí",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-    "Username" : "Nome d'usuariu",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
-    "Reset" : "Reaniciar",
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
     "Personal" : "Personal",
@@ -149,6 +144,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamientu y Base de datos",
     "Data folder" : "Carpeta de datos",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 42558bd76ef..8422c2948ee 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Unviósete al corréu l'enllaz pa reaniciar la to contraseña. Si nun lu recibes nuna cantidá razonable de tiempu, comprueba les tos carpetes de corréu puxarra. <br>Si nun ta ehí, entruga al to alministrador llocal",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Los tos ficheros tán crifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que se reanicie la to contraseña.<br />Si nun tas seguru de qué facer, por favor contauta col to alministrador enantes que sigas. <br />¿De xuru quies siguir?",
     "I know what I'm doing" : "Sé lo que toi faciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
     "No" : "Non",
     "Yes" : "Sí",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-    "Username" : "Nome d'usuariu",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
-    "Reset" : "Reaniciar",
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
     "Personal" : "Personal",
@@ -147,6 +142,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamientu y Base de datos",
     "Data folder" : "Carpeta de datos",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index f3a5b138641..10316b67f2a 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -35,13 +35,12 @@ OC.L10N.register(
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "İstifadəçi adı",
-    "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 7f4f7d8bb95..7a0c92543f3 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -33,13 +33,12 @@
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "İstifadəçi adı",
-    "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index b69319c2911..cf7369129ba 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
     "I know what I'm doing" : "Знам какво правя!",
-    "Reset password" : "Възстановяване на парола",
     "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
     "No" : "Не",
     "Yes" : "Да",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
     "%s password reset" : "Паролата на %s е променена.",
     "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
-    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
-    "Username" : "Потребител",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
-    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
-    "Reset" : "Възстанови",
     "New password" : "Нова парола",
     "New Password" : "Нова Парола",
+    "Reset password" : "Възстановяване на парола",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
     "Personal" : "Лични",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Username" : "Потребител",
     "Password" : "Парола",
     "Storage & database" : "Дисково пространство и база данни",
     "Data folder" : "Директория за данни",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 51b2ba5fc76..8b6b7e057d2 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
     "I know what I'm doing" : "Знам какво правя!",
-    "Reset password" : "Възстановяване на парола",
     "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
     "No" : "Не",
     "Yes" : "Да",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
     "%s password reset" : "Паролата на %s е променена.",
     "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
-    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
-    "Username" : "Потребител",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
-    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
-    "Reset" : "Възстанови",
     "New password" : "Нова парола",
     "New Password" : "Нова Парола",
+    "Reset password" : "Възстановяване на парола",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
     "Personal" : "Лични",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Username" : "Потребител",
     "Password" : "Парола",
     "Storage & database" : "Дисково пространство и база данни",
     "Data folder" : "Директория за данни",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index ac4ba299468..422175f9e81 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
-    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
@@ -80,11 +79,9 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-    "Username" : "ব্যবহারকারী",
-    "Reset" : "পূণঃনির্ধানণ",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
@@ -99,6 +96,7 @@ OC.L10N.register(
     "Cheers!" : "শুভেচ্ছা!",
     "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Data folder" : "ডাটা ফোল্ডার ",
     "Configure the database" : "ডাটাবেচ কনফিগার করুন",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 9eee32ba3c2..811c1087002 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -27,7 +27,6 @@
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
-    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
@@ -78,11 +77,9 @@
     "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-    "Username" : "ব্যবহারকারী",
-    "Reset" : "পূণঃনির্ধানণ",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
@@ -97,6 +94,7 @@
     "Cheers!" : "শুভেচ্ছা!",
     "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Data folder" : "ডাটা ফোল্ডার ",
     "Configure the database" : "ডাটাবেচ কনফিগার করুন",
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
index a72a91078ae..0cd405630cb 100644
--- a/core/l10n/bn_IN.js
+++ b/core/l10n/bn_IN.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ইউজারনেম",
-    "Reset" : "রিসেট করুন"
+    "Username" : "ইউজারনেম"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
index 4e29d0774f6..5c7ce4ef0d7 100644
--- a/core/l10n/bn_IN.json
+++ b/core/l10n/bn_IN.json
@@ -9,7 +9,6 @@
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ইউজারনেম",
-    "Reset" : "রিসেট করুন"
+    "Username" : "ইউজারনেম"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index afa434d3570..ee837ea7b7f 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
     "I know what I'm doing" : "Sé el que faig",
-    "Reset password" : "Reinicialitza la contrasenya",
     "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
     "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
-    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-    "Username" : "Nom d'usuari",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
-    "Reset" : "Estableix de nou",
     "New password" : "Contrasenya nova",
     "New Password" : "Contrasenya nova",
+    "Reset password" : "Reinicialitza la contrasenya",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -161,6 +156,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
     "Storage & database" : "Emmagatzematge i base de dades",
     "Data folder" : "Carpeta de dades",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index c1ea86b4223..374e9a51440 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu. Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. <br />Si sabeu què fer, contacteu amb l'administrador abans de continuar.<br />Voleu continuar?",
     "I know what I'm doing" : "Sé el que faig",
-    "Reset password" : "Reinicialitza la contrasenya",
     "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
     "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
-    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-    "Username" : "Nom d'usuari",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Els vostres fitxers estan encriptats. Si no heu habilitat la clau de recuperació no hi haurà manera de recuperar les dades després que reestabliu la contrasenya. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
-    "Reset" : "Estableix de nou",
     "New password" : "Contrasenya nova",
     "New Password" : "Contrasenya nova",
+    "Reset password" : "Reinicialitza la contrasenya",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -159,6 +154,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
     "Storage & database" : "Emmagatzematge i base de dades",
     "Data folder" : "Carpeta de dades",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index e858dede737..787b0b10e4a 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
     "I know what I'm doing" : "Vím co dělám",
-    "Reset password" : "Obnovit heslo",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
-    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-    "Username" : "Uživatelské jméno",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
-    "Reset" : "Restartovat složku",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovit heslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
     "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
     "Personal" : "Osobní",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "Storage & database" : "Úložiště & databáze",
     "Data folder" : "Složka s daty",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 7d0b3ada708..8de2fd338c1 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte složku nevyžádané pošty a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
     "I know what I'm doing" : "Vím co dělám",
-    "Reset password" : "Obnovit heslo",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
-    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-    "Username" : "Uživatelské jméno",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
-    "Reset" : "Restartovat složku",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovit heslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
     "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
     "Personal" : "Osobní",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "Storage & database" : "Úložiště & databáze",
     "Data folder" : "Složka s daty",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index b5fbab1efb6..06d8b6a1817 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
-    "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
@@ -64,9 +63,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-    "Username" : "Enw defnyddiwr",
     "New password" : "Cyfrinair newydd",
+    "Reset password" : "Ailosod cyfrinair",
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
@@ -77,6 +75,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "Data folder" : "Plygell data",
     "Configure the database" : "Cyflunio'r gronfa ddata",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index c3749e52468..a2df02a5e75 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -20,7 +20,6 @@
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
-    "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
@@ -62,9 +61,8 @@
     "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-    "Username" : "Enw defnyddiwr",
     "New password" : "Cyfrinair newydd",
+    "Reset password" : "Ailosod cyfrinair",
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
@@ -75,6 +73,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "Data folder" : "Plygell data",
     "Configure the database" : "Cyflunio'r gronfa ddata",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 64bd64582a7..a1222792fc5 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
-    "Reset password" : "Nulstil kodeord",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
     "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-    "Username" : "Brugernavn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-    "Reset" : "Nulstil",
     "New password" : "Nyt kodeord",
     "New Password" : "Ny adgangskode",
+    "Reset password" : "Nulstil kodeord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
     "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
     "Personal" : "Personligt",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Username" : "Brugernavn",
     "Password" : "Adgangskode",
     "Storage & database" : "Lager & database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index ed40172a698..5111e5d3e05 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
-    "Reset password" : "Nulstil kodeord",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
     "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-    "Username" : "Brugernavn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-    "Reset" : "Nulstil",
     "New password" : "Nyt kodeord",
     "New Password" : "Ny adgangskode",
+    "Reset password" : "Nulstil kodeord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
     "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
     "Personal" : "Personligt",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Username" : "Brugernavn",
     "Password" : "Adgangskode",
     "Storage & database" : "Lager & database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 1258cf40251..6b603f3b68a 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 09a77d2ee9a..c1260e70618 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 017ecd1c4fa..aaf21aaf95e 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index d6d0c73a777..39e3fd53719 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Der Link, zum Zurücksetzen Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index a73750695a3..c41928116ba 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
-    "Reset password" : "Επαναφορά συνθηματικού",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
     "Yes" : "Ναι",
@@ -121,13 +120,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
     "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-    "Username" : "Όνομα χρήστη",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
-    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-    "Reset" : "Επαναφορά",
     "New password" : "Νέο συνθηματικό",
     "New Password" : "Νέος Κωδικός",
+    "Reset password" : "Επαναφορά συνθηματικού",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
     "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
     "Personal" : "Προσωπικά",
@@ -167,6 +162,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Συνθηματικό",
     "Storage & database" : "Αποθήκευση & βάση δεδομένων",
     "Data folder" : "Φάκελος δεδομένων",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 010d43cc2c8..6b08b8262c8 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
-    "Reset password" : "Επαναφορά συνθηματικού",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
     "Yes" : "Ναι",
@@ -119,13 +118,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
     "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-    "Username" : "Όνομα χρήστη",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
-    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-    "Reset" : "Επαναφορά",
     "New password" : "Νέο συνθηματικό",
     "New Password" : "Νέος Κωδικός",
+    "Reset password" : "Επαναφορά συνθηματικού",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
     "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
     "Personal" : "Προσωπικά",
@@ -165,6 +160,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Συνθηματικό",
     "Storage & database" : "Αποθήκευση & βάση δεδομένων",
     "Data folder" : "Φάκελος δεδομένων",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 0c80072e67d..27f28c84908 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
     "I know what I'm doing" : "I know what I'm doing",
-    "Reset password" : "Reset password",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
     "Yes" : "Yes",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
     "%s password reset" : "%s password reset",
     "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
-    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
-    "Username" : "Username",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?",
-    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
-    "Reset" : "Reset",
     "New password" : "New password",
     "New Password" : "New Password",
+    "Reset password" : "Reset password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
     "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
     "Personal" : "Personal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
     "Password" : "Password",
     "Storage & database" : "Storage & database",
     "Data folder" : "Data folder",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 4a20f00dd6a..c4daf4bbb97 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
     "I know what I'm doing" : "I know what I'm doing",
-    "Reset password" : "Reset password",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
     "Yes" : "Yes",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
     "%s password reset" : "%s password reset",
     "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
-    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
-    "Username" : "Username",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?",
-    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
-    "Reset" : "Reset",
     "New password" : "New password",
     "New Password" : "New Password",
+    "Reset password" : "Reset password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
     "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
     "Personal" : "Personal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
     "Password" : "Password",
     "Storage & database" : "Storage & database",
     "Data folder" : "Data folder",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index cc814c41e35..813d872a640 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "December" : "Decembro",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
-    "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
@@ -86,10 +85,8 @@ OC.L10N.register(
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-    "Username" : "Uzantonomo",
-    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
     "New password" : "Nova pasvorto",
+    "Reset password" : "Rekomenci la pasvorton",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
@@ -105,6 +102,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
     "Data folder" : "Datuma dosierujo",
     "Configure the database" : "Agordi la datumbazon",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index dc4d9d6eefc..64e2da42ecb 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -23,7 +23,6 @@
     "December" : "Decembro",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
-    "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
@@ -84,10 +83,8 @@
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-    "Username" : "Uzantonomo",
-    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
     "New password" : "Nova pasvorto",
+    "Reset password" : "Rekomenci la pasvorton",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
@@ -103,6 +100,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
     "Data folder" : "Datuma dosierujo",
     "Configure the database" : "Agordi la datumbazon",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index b963b9d3f01..be1bb9ffe72 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "I know what I'm doing" : "Yo se lo que estoy haciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
     "New Password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamiento y base de datos",
     "Data folder" : "Directorio de datos",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 008891d5c98..742703e87c9 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sus archivos están cifrados. Si no has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "I know what I'm doing" : "Yo se lo que estoy haciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
     "New Password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamiento y base de datos",
     "Data folder" : "Directorio de datos",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index f37377f465c..fae6284acf7 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "diciembre",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
@@ -100,12 +99,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
-    "Reset" : "Resetear",
     "New password" : "Nueva contraseña:",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
@@ -128,6 +123,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de almacenamiento",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 219139245a3..c5649a1630a 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -29,7 +29,6 @@
     "December" : "diciembre",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
@@ -98,12 +97,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
-    "Reset" : "Resetear",
     "New password" : "Nueva contraseña:",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
@@ -126,6 +121,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de almacenamiento",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index 3808c2cb7c4..98115643cd7 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -37,11 +37,11 @@ OC.L10N.register(
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
     "Help" : "Ayuda",
+    "Username" : "Usuario",
     "Password" : "Clave",
     "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index 1760e39c6c6..e54689d44b2 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -35,11 +35,11 @@
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
     "Help" : "Ayuda",
+    "Username" : "Usuario",
     "Password" : "Clave",
     "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index d830538bed3..66fc3efb9a6 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Diciembre",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
@@ -94,12 +93,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
@@ -122,6 +117,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de datos",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 99da53b91fe..df3f3aa655a 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -29,7 +29,6 @@
     "December" : "Diciembre",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
@@ -92,12 +91,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
@@ -120,6 +115,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de datos",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 7325c6478d8..25681f3486b 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
     "I know what I'm doing" : "Ma tean mida teen",
-    "Reset password" : "Nulli parool",
     "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
     "No" : "Ei",
     "Yes" : "Jah",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
     "%s password reset" : "%s parooli lähtestus",
     "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
-    "Username" : "Kasutajanimi",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
-    "Reset" : "Algseaded",
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
+    "Reset password" : "Nulli parool",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
     "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
     "Personal" : "Isiklik",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Storage & database" : "Andmehoidla ja andmebaas",
     "Data folder" : "Andmete kaust",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 56ede97196a..eeb51ed5f85 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link parooli vahetuseks on saadetud Sinu e-posti aadressil.<br>Kui kiri pole saabunud mõistliku aja jooksul, siis kontrolli oma spam-/rämpskirjade katalooge<br>.Kui kirja pole ka seal, siis küsi abi süsteemihaldurilt.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. <br />Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. <br />Oled sa kindel, et sa soovid jätkata?",
     "I know what I'm doing" : "Ma tean mida teen",
-    "Reset password" : "Nulli parool",
     "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
     "No" : "Ei",
     "Yes" : "Jah",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
     "%s password reset" : "%s parooli lähtestus",
     "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
-    "Username" : "Kasutajanimi",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Sinu failid on krüpteeritud. Kui sa pole taastamise võtit veel määranud, siis pole präast parooli taastamist mingit võimalust sinu andmeid tagasi saada. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
-    "Reset" : "Algseaded",
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
+    "Reset password" : "Nulli parool",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
     "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
     "Personal" : "Isiklik",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Storage & database" : "Andmehoidla ja andmebaas",
     "Data folder" : "Andmete kaust",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index e90e458a193..7186216bf15 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
     "I know what I'm doing" : "Badakit zer ari naizen egiten",
-    "Reset password" : "Berrezarri pasahitza",
     "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
     "No" : "Ez",
     "Yes" : "Bai",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
     "%s password reset" : "%s pasahitza berrezarri",
     "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
-    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-    "Username" : "Erabiltzaile izena",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
-    "Reset" : "Berrezarri",
     "New password" : "Pasahitz berria",
     "New Password" : "Pasahitz Berria",
+    "Reset password" : "Berrezarri pasahitza",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
     "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
     "Personal" : "Pertsonala",
@@ -166,6 +161,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
     "Storage & database" : "Biltegia & datubasea",
     "Data folder" : "Datuen karpeta",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index d851c6e942d..0579dd2dbad 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora epe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan jarri.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. <br />Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik.<br /> Ziur zaude aurrera jarraitu nahi duzula?",
     "I know what I'm doing" : "Badakit zer ari naizen egiten",
-    "Reset password" : "Berrezarri pasahitza",
     "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
     "No" : "Ez",
     "Yes" : "Bai",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
     "%s password reset" : "%s pasahitza berrezarri",
     "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
-    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-    "Username" : "Erabiltzaile izena",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
-    "Reset" : "Berrezarri",
     "New password" : "Pasahitz berria",
     "New Password" : "Pasahitz Berria",
+    "Reset password" : "Berrezarri pasahitza",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
     "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
     "Personal" : "Pertsonala",
@@ -164,6 +159,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
     "Storage & database" : "Biltegia & datubasea",
     "Data folder" : "Datuen karpeta",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index e280bae0f58..9b93ede5f05 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
     "I know what I'm doing" : "اطلاع از انجام این کار دارم",
-    "Reset password" : "تنظیم مجدد رمز عبور",
     "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
     "No" : "نه",
     "Yes" : "بله",
@@ -102,12 +101,8 @@ OC.L10N.register(
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-    "Username" : "نام کاربری",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-    "Reset" : "تنظیم مجدد",
     "New password" : "گذرواژه جدید",
+    "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
@@ -126,6 +121,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
     "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "Storage & database" : "انبارش و پایگاه داده",
     "Data folder" : "پوشه اطلاعاتی",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index e7687a02b4c..7914b15ce20 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -33,7 +33,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "لینک تنظیم مجدد رمز عبور به ایمیل شما ارسال شده است.<br>اگر آن رادر یک زمان مشخصی دریافت نکرده اید، لطفا هرزنامه/ پوشه های ناخواسته را بررسی کنید.<br>در صورت نبودن از مدیر خود بپرسید.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
     "I know what I'm doing" : "اطلاع از انجام این کار دارم",
-    "Reset password" : "تنظیم مجدد رمز عبور",
     "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
     "No" : "نه",
     "Yes" : "بله",
@@ -100,12 +99,8 @@
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-    "Username" : "نام کاربری",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-    "Reset" : "تنظیم مجدد",
     "New password" : "گذرواژه جدید",
+    "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
@@ -124,6 +119,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
     "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Username" : "نام کاربری",
     "Password" : "گذرواژه",
     "Storage & database" : "انبارش و پایگاه داده",
     "Data folder" : "پوشه اطلاعاتی",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index cc9fad66f8b..3d635a8b866 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -38,7 +38,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
-    "Reset password" : "Palauta salasana",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
     "Yes" : "Kyllä",
@@ -123,13 +122,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
     "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-    "Username" : "Käyttäjätunnus",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
-    "Reset" : "Palauta salasana",
     "New password" : "Uusi salasana",
     "New Password" : "Uusi salasana",
+    "Reset password" : "Palauta salasana",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
     "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
     "Personal" : "Henkilökohtainen",
@@ -169,6 +164,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "Storage & database" : "Tallennus ja tietokanta",
     "Data folder" : "Datakansio",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 32ad46587e2..d1554c2a356 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -36,7 +36,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
-    "Reset password" : "Palauta salasana",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
     "Yes" : "Kyllä",
@@ -121,13 +120,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
     "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-    "Username" : "Käyttäjätunnus",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
-    "Reset" : "Palauta salasana",
     "New password" : "Uusi salasana",
     "New Password" : "Uusi salasana",
+    "Reset password" : "Palauta salasana",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
     "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
     "Personal" : "Henkilökohtainen",
@@ -167,6 +162,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "Storage & database" : "Tallennus ja tietokanta",
     "Data folder" : "Datakansio",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 0ff630f70ba..87e8b017832 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
-    "Reset password" : "Réinitialiser le mot de passe",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
     "Yes" : "Oui",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
     "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
-    "Username" : "Nom d'utilisateur",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-    "Reset" : "Réinitialiser",
     "New password" : "Nouveau mot de passe",
     "New Password" : "Nouveau mot de passe",
+    "Reset password" : "Réinitialiser le mot de passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
     "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
     "Personal" : "Personnel",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 0fed5b79ab7..5b57d86f532 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
-    "Reset password" : "Réinitialiser le mot de passe",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
     "Yes" : "Oui",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
     "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
-    "Username" : "Nom d'utilisateur",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clef de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-    "Reset" : "Réinitialiser",
     "New password" : "Nouveau mot de passe",
     "New Password" : "Nouveau mot de passe",
+    "Reset password" : "Réinitialiser le mot de passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
     "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
     "Personal" : "Personnel",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 724775644dc..b7a43addec9 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?",
     "I know what I'm doing" : "Sei o estou a facer",
-    "Reset password" : "Restabelecer o contrasinal",
     "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
     "No" : "Non",
     "Yes" : "Si",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
     "%s password reset" : "Restabelecer o contrasinal %s",
     "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-    "Username" : "Nome de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
-    "Reset" : "Restabelecer",
     "New password" : "Novo contrasinal",
     "New Password" : "Novo contrasinal",
+    "Reset password" : "Restabelecer o contrasinal",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
     "Personal" : "Persoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
     "Storage & database" : "Almacenamento e base de datos",
     "Data folder" : "Cartafol de datos",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 7715f3bebbf..82157285cd3 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A ligazón para restabelecer o seu contrasinal foi enviada ao seu correo. Se non a recibe nun prazo razoábel de tempo, vexa o seu cartafol de correo lixo. <br> Se non está ali pregúntelle ao administrador local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros están cifrados. Se non activou a chave de recuperación, non haberá maneira de recuperar os datos após o restabelecemento do contrasinal. <br />Se non está seguro de que facer, póñase en contacto co administrador antes de continuar. <br /> Confirma que quere?",
     "I know what I'm doing" : "Sei o estou a facer",
-    "Reset password" : "Restabelecer o contrasinal",
     "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
     "No" : "Non",
     "Yes" : "Si",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
     "%s password reset" : "Restabelecer o contrasinal %s",
     "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-    "Username" : "Nome de usuario",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
-    "Reset" : "Restabelecer",
     "New password" : "Novo contrasinal",
     "New Password" : "Novo contrasinal",
+    "Reset password" : "Restabelecer o contrasinal",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
     "Personal" : "Persoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
     "Storage & database" : "Almacenamento e base de datos",
     "Data folder" : "Cartafol de datos",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 206e0c0de01..015f5843ac9 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "דצמבר",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
-    "Reset password" : "איפוס ססמה",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
@@ -67,10 +66,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-    "Username" : "שם משתמש",
-    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
     "New password" : "ססמה חדשה",
+    "Reset password" : "איפוס ססמה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
@@ -82,6 +79,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Data folder" : "תיקיית נתונים",
     "Configure the database" : "הגדרת מסד הנתונים",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 437098c104f..47d5d82ad99 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -20,7 +20,6 @@
     "December" : "דצמבר",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
-    "Reset password" : "איפוס ססמה",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
@@ -65,10 +64,8 @@
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-    "Username" : "שם משתמש",
-    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
     "New password" : "ססמה חדשה",
+    "Reset password" : "איפוס ססמה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
@@ -80,6 +77,7 @@
     "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Data folder" : "תיקיית נתונים",
     "Configure the database" : "הגדרת מסד הנתונים",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index bd74076a739..787b2031f4e 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -32,8 +32,6 @@ OC.L10N.register(
     "Add" : "डाले",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-    "Username" : "प्रयोक्ता का नाम",
     "New password" : "नया पासवर्ड",
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
@@ -41,6 +39,7 @@ OC.L10N.register(
     "Help" : "सहयोग",
     "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
     "Data folder" : "डाटा फोल्डर",
     "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index 82f27644e93..d2b5fefbf4e 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -30,8 +30,6 @@
     "Add" : "डाले",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-    "Username" : "प्रयोक्ता का नाम",
     "New password" : "नया पासवर्ड",
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
@@ -39,6 +37,7 @@
     "Help" : "सहयोग",
     "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
     "Data folder" : "डाटा फोल्डर",
     "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 38de4e13cd3..449c9b248a8 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
     "I know what I'm doing" : "Znam što radim",
-    "Reset password" : "Resetirajte lozinku",
     "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
     "%s password reset" : "%s lozinka resetirana",
     "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-    "Username" : "Korisničko ime",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
-    "Reset" : "Resetirajte",
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
+    "Reset password" : "Resetirajte lozinku",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
     "Personal" : "Osobno",
@@ -149,6 +144,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Storage & database" : "Pohrana & baza podataka",
     "Data folder" : "Mapa za podatke",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index fbcc57054e3..21141abc30e 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Veza za resetiranje vaše lozinke poslana je na vašu adresu e-pošte. Ako je ne primite unekom razumnom vremenskom roku, provjerite svoje spam/junk mape. <br> Ako nije tamo, kontaktirajtesvoga lokalnog administratora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka,svoje podatke nećete moći dohvatitinakon što vaša lozinka bude resetirana.<br />Ako ne znate što učiniti, prije nego linastavite, molimo kontaktirajte svog administratora. <br />Želite li doista nastaviti?",
     "I know what I'm doing" : "Znam što radim",
-    "Reset password" : "Resetirajte lozinku",
     "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
     "%s password reset" : "%s lozinka resetirana",
     "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-    "Username" : "Korisničko ime",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
-    "Reset" : "Resetirajte",
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
+    "Reset password" : "Resetirajte lozinku",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nije podržan i %s na ovoj platformi neće raditi kako treba.",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
     "Personal" : "Osobno",
@@ -147,6 +142,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Storage & database" : "Pohrana & baza podataka",
     "Data folder" : "Mapa za podatke",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 867d47cda68..c19ecc457df 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
     "I know what I'm doing" : "Tudom mit csinálok.",
-    "Reset password" : "Jelszó-visszaállítás",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
     "Yes" : "Igen",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
     "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-    "Username" : "Felhasználónév",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
-    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
-    "Reset" : "Visszaállítás",
     "New password" : "Az új jelszó",
     "New Password" : "Új jelszó",
+    "Reset password" : "Jelszó-visszaállítás",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
     "Personal" : "Személyes",
@@ -162,6 +157,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
     "Storage & database" : "Tárolás és adatbázis",
     "Data folder" : "Adatkönyvtár",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 3ab7d5d2e97..fd4a2e66680 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A jelszó felülírásához a linket e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
     "I know what I'm doing" : "Tudom mit csinálok.",
-    "Reset password" : "Jelszó-visszaállítás",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
     "Yes" : "Igen",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
     "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-    "Username" : "Felhasználónév",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Az Ön állományai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne. Biztos, hogy folytatni kívánja?",
-    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
-    "Reset" : "Visszaállítás",
     "New password" : "Az új jelszó",
     "New Password" : "Új jelszó",
+    "Reset password" : "Jelszó-visszaállítás",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
     "Personal" : "Személyes",
@@ -160,6 +155,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
     "Storage & database" : "Tárolás és adatbázis",
     "Data folder" : "Adatkönyvtár",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 8bac55ebfab..791e6910b37 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -36,7 +36,6 @@ OC.L10N.register(
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
-    "Reset password" : "Reinitialisar contrasigno",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
     "No" : "No",
     "Yes" : "Si",
@@ -103,12 +102,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
     "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-    "Username" : "Nomine de usator",
-    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
-    "Reset" : "Re-fixar",
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
+    "Reset password" : "Reinitialisar contrasigno",
     "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
     "Personal" : "Personal",
     "Users" : "Usatores",
@@ -133,6 +129,7 @@ OC.L10N.register(
     "Security Warning" : "Aviso de securitate",
     "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Storage & database" : "Immagazinage & base de datos",
     "Data folder" : "Dossier de datos",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 60ece2f9425..80a9b47c0ea 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -34,7 +34,6 @@
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
-    "Reset password" : "Reinitialisar contrasigno",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
     "No" : "No",
     "Yes" : "Si",
@@ -101,12 +100,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
     "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-    "Username" : "Nomine de usator",
-    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
-    "Reset" : "Re-fixar",
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
+    "Reset password" : "Reinitialisar contrasigno",
     "For the best results, please consider using a GNU/Linux server instead." : "Pro le exitos melior, pro favor tu considera usar in loco un servitor GNU/Linux.",
     "Personal" : "Personal",
     "Users" : "Usatores",
@@ -131,6 +127,7 @@
     "Security Warning" : "Aviso de securitate",
     "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Storage & database" : "Immagazinage & base de datos",
     "Data folder" : "Dossier de datos",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 7182162297e..47566bb627b 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
-    "Reset password" : "Setel ulang sandi",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
     "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-    "Username" : "Nama pengguna",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
-    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
-    "Reset" : "Atur Ulang",
     "New password" : "Sandi baru",
     "New Password" : "Sandi Baru",
+    "Reset password" : "Setel ulang sandi",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
     "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
     "Personal" : "Pribadi",
@@ -166,6 +161,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Sandi",
     "Storage & database" : "Penyimpanan & Basis data",
     "Data folder" : "Folder data",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 79e90900d0f..d3327460f31 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
-    "Reset password" : "Setel ulang sandi",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
     "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-    "Username" : "Nama pengguna",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
-    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
-    "Reset" : "Atur Ulang",
     "New password" : "Sandi baru",
     "New Password" : "Sandi Baru",
+    "Reset password" : "Setel ulang sandi",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
     "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
     "Personal" : "Pribadi",
@@ -164,6 +159,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Sandi",
     "Storage & database" : "Penyimpanan & Basis data",
     "Data folder" : "Folder data",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 8f1f7d09eec..0ac56e51181 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Desember",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
-    "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
@@ -62,9 +61,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-    "Username" : "Notendanafn",
     "New password" : "Nýtt lykilorð",
+    "Reset password" : "Endursetja lykilorð",
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
@@ -73,6 +71,7 @@ OC.L10N.register(
     "Access forbidden" : "Aðgangur bannaður",
     "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index ff69c133fa6..d56e4bbd3d7 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -20,7 +20,6 @@
     "December" : "Desember",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
-    "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
@@ -60,9 +59,8 @@
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-    "Username" : "Notendanafn",
     "New password" : "Nýtt lykilorð",
+    "Reset password" : "Endursetja lykilorð",
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
@@ -71,6 +69,7 @@
     "Access forbidden" : "Aðgangur bannaður",
     "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index dcc221bf885..ed23ad7df28 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
-    "Reset password" : "Ripristina la password",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
     "Yes" : "Sì",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
     "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
-    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
-    "Username" : "Nome utente",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
-    "Reset" : "Ripristina",
     "New password" : "Nuova password",
     "New Password" : "Nuova password",
+    "Reset password" : "Ripristina la password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
     "Personal" : "Personale",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Username" : "Nome utente",
     "Password" : "Password",
     "Storage & database" : "Archiviazione e database",
     "Data folder" : "Cartella dati",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 599c613828b..59073aafaf2 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, per favore contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
-    "Reset password" : "Ripristina la password",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
     "Yes" : "Sì",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
     "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
-    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
-    "Username" : "Nome utente",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "I file sono cifrati. Se non hai precedentemente abilitato la chiave di recupero, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
-    "Reset" : "Ripristina",
     "New password" : "Nuova password",
     "New Password" : "Nuova password",
+    "Reset password" : "Ripristina la password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
     "Personal" : "Personale",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Username" : "Nome utente",
     "Password" : "Password",
     "Storage & database" : "Archiviazione e database",
     "Data folder" : "Cartella dati",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index bba306dafc6..f6a7aa1f846 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
-    "Reset password" : "パスワードをリセット",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
     "Yes" : "はい",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
-    "Username" : "ユーザー名",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
-    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
-    "Reset" : "リセット",
     "New password" : "新しいパスワードを入力",
     "New Password" : "新しいパスワード",
+    "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
     "Personal" : "個人",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
     "Storage & database" : "ストレージとデータベース",
     "Data folder" : "データフォルダー",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 706d6bcfc29..c5f1ba49368 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
-    "Reset password" : "パスワードをリセット",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
     "Yes" : "はい",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
-    "Username" : "ユーザー名",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
-    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
-    "Reset" : "リセット",
     "New password" : "新しいパスワードを入力",
     "New Password" : "新しいパスワード",
+    "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
     "Personal" : "個人",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
     "Storage & database" : "ストレージとデータベース",
     "Data folder" : "データフォルダー",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index 699065f6c50..782cd54cf33 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
-    "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
@@ -65,9 +64,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-    "Username" : "მომხმარებლის სახელი",
     "New password" : "ახალი პაროლი",
+    "Reset password" : "პაროლის შეცვლა",
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
@@ -78,6 +76,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
     "Data folder" : "მონაცემთა საქაღალდე",
     "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index c7d8d774620..648f71af987 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -20,7 +20,6 @@
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
-    "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
@@ -63,9 +62,8 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-    "Username" : "მომხმარებლის სახელი",
     "New password" : "ახალი პაროლი",
+    "Reset password" : "პაროლის შეცვლა",
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
@@ -76,6 +74,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
     "Data folder" : "მონაცემთა საქაღალდე",
     "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 80b25cbe34c..4b23b1f8a2a 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -24,7 +24,6 @@ OC.L10N.register(
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
-    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
@@ -74,8 +73,8 @@ OC.L10N.register(
     "Add" : "បញ្ចូល",
     "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
@@ -84,6 +83,7 @@ OC.L10N.register(
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
     "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
     "Data folder" : "ថត​ទិន្នន័យ",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 50f693d3620..ccaf0576f2c 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -22,7 +22,6 @@
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
-    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
@@ -72,8 +71,8 @@
     "Add" : "បញ្ចូល",
     "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
@@ -82,6 +81,7 @@
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
     "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
     "Data folder" : "ថត​ទិន្នន័យ",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index a4c637cec83..91ed8a0fde6 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-    "Reset password" : "암호 재설정",
     "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
     "Yes" : "예",
@@ -103,13 +102,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
     "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
-    "Username" : "사용자 이름",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
-    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
-    "Reset" : "재설정",
     "New password" : "새 암호",
     "New Password" : "새 암호",
+    "Reset password" : "암호 재설정",
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
@@ -132,6 +127,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Username" : "사용자 이름",
     "Password" : "암호",
     "Storage & database" : "스토리지 & 데이터베이스",
     "Data folder" : "데이터 폴더",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index b068150f590..769bc98315b 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -30,7 +30,6 @@
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-    "Reset password" : "암호 재설정",
     "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
     "Yes" : "예",
@@ -101,13 +100,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
     "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
-    "Username" : "사용자 이름",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
-    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
-    "Reset" : "재설정",
     "New password" : "새 암호",
     "New Password" : "새 암호",
+    "Reset password" : "암호 재설정",
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
@@ -130,6 +125,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Username" : "사용자 이름",
     "Password" : "암호",
     "Storage & database" : "스토리지 & 데이터베이스",
     "Data folder" : "데이터 폴더",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index 7f249580986..1c780a6a019 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Settings" : "ده‌ستكاری",
     "Saving..." : "پاشکه‌وتده‌کات...",
-    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
@@ -13,12 +12,13 @@ OC.L10N.register(
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
     "Help" : "یارمەتی",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "Data folder" : "زانیاری فۆڵده‌ر",
     "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index 2772a2895a2..3dcea4b4fa2 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Settings" : "ده‌ستكاری",
     "Saving..." : "پاشکه‌وتده‌کات...",
-    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
@@ -11,12 +10,13 @@
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
     "Help" : "یارمەتی",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "Data folder" : "زانیاری فۆڵده‌ر",
     "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 90ceb4cd8b8..cb918f1e87e 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -28,7 +28,6 @@ OC.L10N.register(
     "December" : "Dezember",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
-    "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
@@ -80,12 +79,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-    "Username" : "Benotzernumm",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-    "Reset" : "Zeréck setzen",
     "New password" : "Neit Passwuert",
+    "Reset password" : "Passwuert zréck setzen",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
@@ -100,6 +95,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 9a1be1e4dd9..f20d81a44cf 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -26,7 +26,6 @@
     "December" : "Dezember",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
-    "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
@@ -78,12 +77,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-    "Username" : "Benotzernumm",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-    "Reset" : "Zeréck setzen",
     "New password" : "Neit Passwuert",
+    "Reset password" : "Passwuert zréck setzen",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
@@ -98,6 +93,7 @@
     "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index e3796940fbe..5f7f1e3e4e1 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
-    "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -94,12 +93,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-    "Username" : "Prisijungimo vardas",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
-    "Reset" : "Atstatyti",
     "New password" : "Naujas slaptažodis",
+    "Reset password" : "Atkurti slaptažodį",
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
@@ -122,6 +117,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
     "Data folder" : "Duomenų katalogas",
     "Configure the database" : "Nustatyti duomenų bazę",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index a70b966aae2..781373ec76e 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -29,7 +29,6 @@
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
-    "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -92,12 +91,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-    "Username" : "Prisijungimo vardas",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
-    "Reset" : "Atstatyti",
     "New password" : "Naujas slaptažodis",
+    "Reset password" : "Atkurti slaptažodį",
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
@@ -120,6 +115,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
     "Data folder" : "Duomenų katalogas",
     "Configure the database" : "Nustatyti duomenų bazę",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 16bb3007e4c..e71b24a060e 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
-    "Reset password" : "Mainīt paroli",
     "No" : "Nē",
     "Yes" : "Jā",
     "Choose" : "Izvēlieties",
@@ -68,11 +67,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-    "Username" : "Lietotājvārds",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
     "New password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
@@ -85,6 +81,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Data folder" : "Datu mape",
     "Configure the database" : "Konfigurēt datubāzi",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index afeb3f82a17..684c659d844 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -20,7 +20,6 @@
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
-    "Reset password" : "Mainīt paroli",
     "No" : "Nē",
     "Yes" : "Jā",
     "Choose" : "Izvēlieties",
@@ -66,11 +65,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-    "Username" : "Lietotājvārds",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
     "New password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
@@ -83,6 +79,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Data folder" : "Datu mape",
     "Configure the database" : "Konfigurēt datubāzi",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 0b1e993a8f4..20ad24d1e38 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -28,7 +28,6 @@ OC.L10N.register(
     "December" : "Декември",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
-    "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Избери",
@@ -86,11 +85,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-    "Username" : "Корисничко име",
-    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
-    "Reset" : "Поништи",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетирај лозинка",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
@@ -109,6 +105,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фолдер со податоци",
     "Configure the database" : "Конфигурирај ја базата",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 2da6b74e601..19fbf344532 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -26,7 +26,6 @@
     "December" : "Декември",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
-    "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Избери",
@@ -84,11 +83,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-    "Username" : "Корисничко име",
-    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
-    "Reset" : "Поништи",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетирај лозинка",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
@@ -107,6 +103,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фолдер со податоци",
     "Configure the database" : "Конфигурирај ја базата",
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index 612641fe748..7bf41489825 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Disember",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
-    "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
@@ -38,9 +37,8 @@ OC.L10N.register(
     "Add" : "Tambah",
     "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-    "Username" : "Nama pengguna",
     "New password" : "Kata laluan baru",
+    "Reset password" : "Penetapan semula kata laluan",
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
@@ -49,6 +47,7 @@ OC.L10N.register(
     "Access forbidden" : "Larangan akses",
     "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Data folder" : "Fail data",
     "Configure the database" : "Konfigurasi pangkalan data",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index c1323607c8c..3f23b40e847 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -20,7 +20,6 @@
     "December" : "Disember",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
-    "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
@@ -36,9 +35,8 @@
     "Add" : "Tambah",
     "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-    "Username" : "Nama pengguna",
     "New password" : "Kata laluan baru",
+    "Reset password" : "Penetapan semula kata laluan",
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
@@ -47,6 +45,7 @@
     "Access forbidden" : "Larangan akses",
     "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Data folder" : "Fail data",
     "Configure the database" : "Konfigurasi pangkalan data",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index ff87f52a5e2..4865ebd319e 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -28,8 +28,6 @@ OC.L10N.register(
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "_download %n file_::_download %n files_" : [""],
-    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-    "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
@@ -37,6 +35,7 @@ OC.L10N.register(
     "Help" : "အကူအညီ",
     "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Username" : "သုံးစွဲသူအမည်",
     "Password" : "စကားဝှက်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
     "Database user" : "Database သုံးစွဲသူ",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 086e14cdad0..fd30a3df74b 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -26,8 +26,6 @@
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "_download %n file_::_download %n files_" : [""],
-    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-    "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
@@ -35,6 +33,7 @@
     "Help" : "အကူအညီ",
     "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Username" : "သုံးစွဲသူအမည်",
     "Password" : "စကားဝှက်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
     "Database user" : "Database သုံးစွဲသူ",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index a033c38aa77..5bb81e3f7a1 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
-    "Reset password" : "Tilbakestill passord",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
     "Yes" : "Ja",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
     "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-    "Username" : "Brukernavn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-    "Reset" : "Tilbakestill",
     "New password" : "Nytt passord",
     "New Password" : "Nytt passord",
+    "Reset password" : "Tilbakestill passord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
     "Personal" : "Personlig",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
     "Storage & database" : "Lagring og database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 9ad2c468000..14c4ce0de01 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
-    "Reset password" : "Tilbakestill passord",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
     "Yes" : "Ja",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
     "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-    "Username" : "Brukernavn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-    "Reset" : "Tilbakestill",
     "New password" : "Nytt passord",
     "New Password" : "Nytt passord",
+    "Reset password" : "Tilbakestill passord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
     "Personal" : "Personlig",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
     "Storage & database" : "Lagring og database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 011b04fd790..a3def91c894 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
     "I know what I'm doing" : "Ik weet wat ik doe",
-    "Reset password" : "Reset wachtwoord",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
     "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-    "Username" : "Gebruikersnaam",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
-    "Reset" : "Reset",
     "New password" : "Nieuw wachtwoord",
     "New Password" : "Nieuw wachtwoord",
+    "Reset password" : "Reset wachtwoord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
     "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
     "Personal" : "Persoonlijk",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
     "Storage & database" : "Opslag & database",
     "Data folder" : "Gegevensmap",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index b59c04e73ff..6a5e2dccab3 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "De link om uw wachtwoord te herstellen is per e-mail naar u verstuurd. Als u dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan uw spammap. <br>Als het daar niet in zit, neem dan contact op met uw beheerder.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u de herstelsleutel niet hebt geactiveerd, is er geen mogelijk om uw gegevens terug te krijgen nadat uw wachtwoord is hersteld. <br>Als u niet weet wat u moet doen, neem dan eerst contact op met uw beheerder. <br>Wilt u echt verder gaan?",
     "I know what I'm doing" : "Ik weet wat ik doe",
-    "Reset password" : "Reset wachtwoord",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
     "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-    "Username" : "Gebruikersnaam",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
-    "Reset" : "Reset",
     "New password" : "Nieuw wachtwoord",
     "New Password" : "Nieuw wachtwoord",
+    "Reset password" : "Reset wachtwoord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
     "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
     "Personal" : "Persoonlijk",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
     "Storage & database" : "Opslag & database",
     "Data folder" : "Gegevensmap",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index d6ba6612f0e..2dccb25d657 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
-    "Reset password" : "Nullstill passord",
     "No" : "Nei",
     "Yes" : "Ja",
     "Choose" : "Vel",
@@ -91,11 +90,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-    "Username" : "Brukarnamn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
     "New password" : "Nytt passord",
+    "Reset password" : "Nullstill passord",
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
@@ -108,6 +104,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Data folder" : "Datamappe",
     "Configure the database" : "Set opp databasen",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 7c1bbc858f4..25151b7f68e 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -30,7 +30,6 @@
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
-    "Reset password" : "Nullstill passord",
     "No" : "Nei",
     "Yes" : "Ja",
     "Choose" : "Vel",
@@ -89,11 +88,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-    "Username" : "Brukarnamn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
     "New password" : "Nytt passord",
+    "Reset password" : "Nullstill passord",
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
@@ -106,6 +102,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Data folder" : "Datamappe",
     "Configure the database" : "Set opp databasen",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 43fee792602..eae84339932 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembre",
     "Settings" : "Configuracion",
     "Saving..." : "Enregistra...",
-    "Reset password" : "Senhal tornat botar",
     "No" : "Non",
     "Yes" : "Òc",
     "Choose" : "Causís",
@@ -52,9 +51,8 @@ OC.L10N.register(
     "Add" : "Ajusta",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-    "Username" : "Non d'usancièr",
     "New password" : "Senhal novèl",
+    "Reset password" : "Senhal tornat botar",
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
@@ -63,6 +61,7 @@ OC.L10N.register(
     "Access forbidden" : "Acces enebit",
     "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Username" : "Non d'usancièr",
     "Password" : "Senhal",
     "Data folder" : "Dorsièr de donadas",
     "Configure the database" : "Configura la basa de donadas",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index c2068151419..3b26135470a 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -20,7 +20,6 @@
     "December" : "Decembre",
     "Settings" : "Configuracion",
     "Saving..." : "Enregistra...",
-    "Reset password" : "Senhal tornat botar",
     "No" : "Non",
     "Yes" : "Òc",
     "Choose" : "Causís",
@@ -50,9 +49,8 @@
     "Add" : "Ajusta",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-    "Username" : "Non d'usancièr",
     "New password" : "Senhal novèl",
+    "Reset password" : "Senhal tornat botar",
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
@@ -61,6 +59,7 @@
     "Access forbidden" : "Acces enebit",
     "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Username" : "Non d'usancièr",
     "Password" : "Senhal",
     "Data folder" : "Dorsièr de donadas",
     "Configure the database" : "Configura la basa de donadas",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 63933496c0c..c4cc7222434 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -34,8 +34,8 @@ OC.L10N.register(
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index 6b1259ba9cc..c46d4a37b42 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -32,8 +32,8 @@
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 57b18d457c3..35d7faeabf4 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
-    "Reset password" : "Zresetuj hasło",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
     "Yes" : "Tak",
@@ -119,13 +118,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
     "%s password reset" : "%s reset hasła",
     "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
-    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-    "Username" : "Nazwa użytkownika",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
-    "Reset" : "Resetuj",
     "New password" : "Nowe hasło",
     "New Password" : "Nowe hasło",
+    "Reset password" : "Zresetuj hasło",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
     "Personal" : "Osobiste",
@@ -164,6 +159,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
     "Storage & database" : "Zasoby dysku & baza danych",
     "Data folder" : "Katalog danych",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index f6c0615fc4e..7ee07cc66af 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
-    "Reset password" : "Zresetuj hasło",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
     "Yes" : "Tak",
@@ -117,13 +116,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
     "%s password reset" : "%s reset hasła",
     "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
-    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-    "Username" : "Nazwa użytkownika",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
-    "Reset" : "Resetuj",
     "New password" : "Nowe hasło",
     "New Password" : "Nowe hasło",
+    "Reset password" : "Zresetuj hasło",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
     "Personal" : "Osobiste",
@@ -162,6 +157,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
     "Storage & database" : "Zasoby dysku & baza danych",
     "Data folder" : "Katalog danych",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 041159ce172..918d3d7adea 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
-    "Reset password" : "Redefinir senha",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
     "Yes" : "Sim",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
     "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
-    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
-    "Username" : "Nome de usuário",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
-    "Reset" : "Resetar",
     "New password" : "Nova senha",
     "New Password" : "Nova Senha",
+    "Reset password" : "Redefinir senha",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
     "Personal" : "Pessoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Username" : "Nome de usuário",
     "Password" : "Senha",
     "Storage & database" : "Armazenamento & banco de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 05be1f4cb1c..75f4b8eff1d 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para redefinir sua senha foi enviada para o seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo. <br> Se ele não estiver lá, pergunte ao administrador do local.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida. <br/> Se você não tem certeza do que fazer, por favor, contate o administrador antes de continuar. <br/> Você realmente deseja continuar?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
-    "Reset password" : "Redefinir senha",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
     "Yes" : "Sim",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
     "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
-    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
-    "Username" : "Nome de usuário",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
-    "Reset" : "Resetar",
     "New password" : "Nova senha",
     "New Password" : "Nova Senha",
+    "Reset password" : "Redefinir senha",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
     "Personal" : "Pessoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Username" : "Nome de usuário",
     "Password" : "Senha",
     "Storage & database" : "Armazenamento & banco de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index f304226c321..09e688a0eb8 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Updated database" : "Base de dados atualizada",
@@ -33,31 +33,30 @@ OC.L10N.register(
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
-    "Settings" : "Configurações",
+    "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
-    "Reset password" : "Repor palavra-passe",
+    "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
-    "Choose" : "Escolha",
-    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}",
     "Ok" : "Ok",
-    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
     "One file conflict" : "Um conflito no ficheiro",
     "New Files" : "Ficheiros Novos",
-    "Already existing files" : "Ficheiro já existente",
+    "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
-    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
@@ -76,7 +75,7 @@ OC.L10N.register(
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
     "Share with user or group …" : "Partilhar com utilizador ou grupo...",
-    "Share link" : "Partilhar o link",
+    "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Password protect" : "Proteger com Palavra-passe",
     "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
@@ -85,17 +84,17 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Set expiration date" : "Especificar data de expiração",
     "Expiration date" : "Data de expiração",
-    "Adding user..." : "A adicionar utilizador...",
+    "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "Resharing is not allowed" : "Não é permitido partilhar de novo",
     "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Deixar de partilhar",
-    "notify by email" : "Notificar por email",
+    "Unshare" : "Cancelar partilha",
+    "notify by email" : "Notificar por correio eletrónico",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "Controlo de acesso",
+    "access control" : "controlo de acesso",
     "create" : "criar",
-    "update" : "actualizar",
+    "update" : "atualizar",
     "delete" : "apagar",
     "Password protected" : "Protegido com Palavra-passe",
     "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
@@ -112,9 +111,9 @@ OC.L10N.register(
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
     "unknown text" : "texto desconhecido",
     "Hello world!" : "Olá mundo!",
-    "sunny" : "solarengo",
+    "sunny" : "soalheiro",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
-    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
+    "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
     "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
-    "Username" : "Nome de utilizador",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
-    "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
     "New Password" : "Nova palavra-passe",
+    "Reset password" : "Repor palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 70586658f8a..8789b6e13d8 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Updated database" : "Base de dados atualizada",
@@ -31,31 +31,30 @@
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
-    "Settings" : "Configurações",
+    "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
-    "Reset password" : "Repor palavra-passe",
+    "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
-    "Choose" : "Escolha",
-    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}",
     "Ok" : "Ok",
-    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
     "One file conflict" : "Um conflito no ficheiro",
     "New Files" : "Ficheiros Novos",
-    "Already existing files" : "Ficheiro já existente",
+    "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
-    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
@@ -74,7 +73,7 @@
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
     "Share with user or group …" : "Partilhar com utilizador ou grupo...",
-    "Share link" : "Partilhar o link",
+    "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Password protect" : "Proteger com Palavra-passe",
     "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
@@ -83,17 +82,17 @@
     "Send" : "Enviar",
     "Set expiration date" : "Especificar data de expiração",
     "Expiration date" : "Data de expiração",
-    "Adding user..." : "A adicionar utilizador...",
+    "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "Resharing is not allowed" : "Não é permitido partilhar de novo",
     "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Deixar de partilhar",
-    "notify by email" : "Notificar por email",
+    "Unshare" : "Cancelar partilha",
+    "notify by email" : "Notificar por correio eletrónico",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "Controlo de acesso",
+    "access control" : "controlo de acesso",
     "create" : "criar",
-    "update" : "actualizar",
+    "update" : "atualizar",
     "delete" : "apagar",
     "Password protected" : "Protegido com Palavra-passe",
     "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
@@ -110,9 +109,9 @@
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
     "unknown text" : "texto desconhecido",
     "Hello world!" : "Olá mundo!",
-    "sunny" : "solarengo",
+    "sunny" : "soalheiro",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
-    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
+    "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
     "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
-    "Username" : "Nome de utilizador",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
-    "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
     "New Password" : "Nova palavra-passe",
+    "Reset password" : "Repor palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 8c48c440460..7970ecf18ae 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
-    "Reset password" : "Resetează parola",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
     "No" : "Nu",
     "Yes" : "Da",
@@ -94,13 +93,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
     "%s password reset" : "%s resetare parola",
     "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
-    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
-    "Username" : "Nume utilizator",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
-    "Reset" : "Resetare",
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
+    "Reset password" : "Resetează parola",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
@@ -114,6 +109,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
     "Storage & database" : "Stocare și baza de date",
     "Data folder" : "Director date",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 137a0bc7a52..037574515eb 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -29,7 +29,6 @@
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
-    "Reset password" : "Resetează parola",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
     "No" : "Nu",
     "Yes" : "Da",
@@ -92,13 +91,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
     "%s password reset" : "%s resetare parola",
     "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
-    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
-    "Username" : "Nume utilizator",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
-    "Reset" : "Resetare",
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
+    "Reset password" : "Resetează parola",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
@@ -112,6 +107,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
     "Storage & database" : "Stocare și baza de date",
     "Data folder" : "Director date",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 066be34d07a..f3e11f7abda 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
-    "Reset password" : "Сбросить пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
     "Yes" : "Да",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "%s сброс пароля",
     "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
-    "Username" : "Имя пользователя",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
-    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
-    "Reset" : "Сброс",
     "New password" : "Новый пароль",
     "New Password" : "Новый пароль",
+    "Reset password" : "Сбросить пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
     "Personal" : "Личное",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Storage & database" : "Система хранения данных & база данных",
     "Data folder" : "Директория с данными",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index a65f9b502b0..a77cf869064 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
-    "Reset password" : "Сбросить пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
     "Yes" : "Да",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "%s сброс пароля",
     "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
-    "Username" : "Имя пользователя",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
-    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
-    "Reset" : "Сброс",
     "New password" : "Новый пароль",
     "New Password" : "Новый пароль",
+    "Reset password" : "Сбросить пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
     "Personal" : "Личное",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Storage & database" : "Система хранения данных & база данных",
     "Data folder" : "Директория с данными",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 3a9978aea85..65184265ad6 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
-    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
@@ -48,9 +47,8 @@ OC.L10N.register(
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
     "_download %n file_::_download %n files_" : ["",""],
-    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-    "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
@@ -58,6 +56,7 @@ OC.L10N.register(
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 112e6eb5014..db383dc6ae7 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -20,7 +20,6 @@
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
-    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
@@ -46,9 +45,8 @@
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
     "_download %n file_::_download %n files_" : ["",""],
-    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-    "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
@@ -56,6 +54,7 @@
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 2954e513327..28e3a3b4a4d 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
     "I know what I'm doing" : "Viem, čo robím",
-    "Reset password" : "Obnovenie hesla",
     "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
     "No" : "Nie",
     "Yes" : "Áno",
@@ -122,13 +121,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
-    "Username" : "Meno používateľa",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
-    "Reset" : "Resetovať",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
     "Personal" : "Osobné",
@@ -164,6 +159,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
     "Password" : "Heslo",
     "Storage & database" : "Úložislo & databáza",
     "Data folder" : "Priečinok dát",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index fa6ed266564..17daa232693 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
     "I know what I'm doing" : "Viem, čo robím",
-    "Reset password" : "Obnovenie hesla",
     "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
     "No" : "Nie",
     "Yes" : "Áno",
@@ -120,13 +119,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
-    "Username" : "Meno používateľa",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
-    "Reset" : "Resetovať",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
     "Personal" : "Osobné",
@@ -162,6 +157,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
     "Password" : "Heslo",
     "Storage & database" : "Úložislo & databáza",
     "Data folder" : "Priečinok dát",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index a0e815d1618..59a9e8bd72a 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
-    "Reset password" : "Ponastavi geslo",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
     "%s password reset" : "Ponastavitev gesla %s",
     "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
-    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-    "Username" : "Uporabniško ime",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
-    "Reset" : "Ponastavi",
     "New password" : "Novo geslo",
     "New Password" : "Novo geslo",
+    "Reset password" : "Ponastavi geslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
     "Personal" : "Osebno",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
     "Storage & database" : "Shramba in podatkovna zbirka",
     "Data folder" : "Podatkovna mapa",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index d5a516d4429..abea92d1325 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
-    "Reset password" : "Ponastavi geslo",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
     "%s password reset" : "Ponastavitev gesla %s",
     "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
-    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-    "Username" : "Uporabniško ime",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
-    "Reset" : "Ponastavi",
     "New password" : "Novo geslo",
     "New Password" : "Novo geslo",
+    "Reset password" : "Ponastavi geslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
     "Personal" : "Osebno",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
     "Storage & database" : "Shramba in podatkovna zbirka",
     "Data folder" : "Podatkovna mapa",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 9dd27342905..246c12bd9ec 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -1,9 +1,19 @@
 OC.L10N.register(
     "core",
     {
+    "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s",
     "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
     "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
     "Updated database" : "Database-i u azhurnua",
+    "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave",
+    "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet",
+    "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s",
+    "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s",
+    "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
+    "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri",
+    "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje",
     "Sunday" : "E djelë",
     "Monday" : "E hënë",
     "Tuesday" : "E martë",
@@ -25,7 +35,6 @@ OC.L10N.register(
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
-    "Reset password" : "Rivendos kodin",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
@@ -69,11 +78,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-    "Username" : "Përdoruesi",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
     "New password" : "Kodi i ri",
+    "Reset password" : "Rivendos kodin",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
@@ -86,6 +92,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Username" : "Përdoruesi",
     "Password" : "Kodi",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 72230681a4e..e183fafb33c 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -1,7 +1,17 @@
 { "translations": {
+    "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s",
     "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
     "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
     "Updated database" : "Database-i u azhurnua",
+    "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave",
+    "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet",
+    "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s",
+    "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s",
+    "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
+    "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri",
+    "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje",
     "Sunday" : "E djelë",
     "Monday" : "E hënë",
     "Tuesday" : "E martë",
@@ -23,7 +33,6 @@
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
-    "Reset password" : "Rivendos kodin",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
@@ -67,11 +76,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-    "Username" : "Përdoruesi",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
     "New password" : "Kodi i ri",
+    "Reset password" : "Rivendos kodin",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
@@ -84,6 +90,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Username" : "Përdoruesi",
     "Password" : "Kodi",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 5e2c8354261..39ca7b1fda4 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Децембар",
     "Settings" : "Поставке",
     "Saving..." : "Чување у току...",
-    "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Одабери",
@@ -61,9 +60,8 @@ OC.L10N.register(
     "Add" : "Додај",
     "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
-    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
-    "Username" : "Корисничко име",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетуј лозинку",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
@@ -72,6 +70,7 @@ OC.L10N.register(
     "Access forbidden" : "Забрањен приступ",
     "Security Warning" : "Сигурносно упозорење",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фацикла података",
     "Configure the database" : "Подешавање базе",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index bfd13040906..ab3e8e04495 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -20,7 +20,6 @@
     "December" : "Децембар",
     "Settings" : "Поставке",
     "Saving..." : "Чување у току...",
-    "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Одабери",
@@ -59,9 +58,8 @@
     "Add" : "Додај",
     "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
-    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
-    "Username" : "Корисничко име",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетуј лозинку",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
@@ -70,6 +68,7 @@
     "Access forbidden" : "Забрањен приступ",
     "Security Warning" : "Сигурносно упозорење",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фацикла података",
     "Configure the database" : "Подешавање базе",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 11c3d2e40a7..a327c2ee55a 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembar",
     "Settings" : "Podešavanja",
     "I know what I'm doing" : "Znam šta radim",
-    "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
     "Yes" : "Da",
     "Choose" : "Izaberi",
@@ -69,9 +68,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
-    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-    "Username" : "Korisničko ime",
     "New password" : "Nova lozinka",
+    "Reset password" : "Resetuj lozinku",
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
@@ -82,6 +80,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Data folder" : "Fascikla podataka",
     "Configure the database" : "Podešavanje baze",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index a358f57d028..219141ff1df 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -20,7 +20,6 @@
     "December" : "Decembar",
     "Settings" : "Podešavanja",
     "I know what I'm doing" : "Znam šta radim",
-    "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
     "Yes" : "Da",
     "Choose" : "Izaberi",
@@ -67,9 +66,8 @@
     "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
-    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-    "Username" : "Korisničko ime",
     "New password" : "Nova lozinka",
+    "Reset password" : "Resetuj lozinku",
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
@@ -80,6 +78,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Data folder" : "Fascikla podataka",
     "Configure the database" : "Podešavanje baze",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index c0066471dc0..dc427b46dba 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -37,7 +37,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
-    "Reset password" : "Återställ lösenordet",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
     "%s password reset" : "%s återställ lösenord",
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
-    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
-    "Username" : "Användarnamn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
-    "Reset" : "Återställ",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
+    "Reset password" : "Återställ lösenordet",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
     "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
     "Personal" : "Personligt",
@@ -150,6 +145,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
     "Storage & database" : "Lagring & databas",
     "Data folder" : "Datamapp",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 82a228565e3..c69d5001b5f 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -35,7 +35,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
-    "Reset password" : "Återställ lösenordet",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
     "%s password reset" : "%s återställ lösenord",
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
-    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
-    "Username" : "Användarnamn",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
-    "Reset" : "Återställ",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
+    "Reset password" : "Återställ lösenordet",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
     "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
     "Personal" : "Personligt",
@@ -148,6 +143,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
     "Storage & database" : "Lagring & databas",
     "Data folder" : "Datamapp",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index 520feac8871..831729238b1 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
-    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
@@ -57,9 +56,8 @@ OC.L10N.register(
     "Add" : "சேர்க்க",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-    "Username" : "பயனாளர் பெயர்",
     "New password" : "புதிய கடவுச்சொல்",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
@@ -68,6 +66,7 @@ OC.L10N.register(
     "Access forbidden" : "அணுக தடை",
     "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Data folder" : "தரவு கோப்புறை",
     "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 41cdfe8281a..d88f8f42ae5 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -20,7 +20,6 @@
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
-    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
@@ -55,9 +54,8 @@
     "Add" : "சேர்க்க",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-    "Username" : "பயனாளர் பெயர்",
     "New password" : "புதிய கடவுச்சொல்",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
@@ -66,6 +64,7 @@
     "Access forbidden" : "அணுக தடை",
     "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Data folder" : "தரவு கோப்புறை",
     "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index 37dfe005efe..e4febdac9ca 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -35,11 +35,11 @@ OC.L10N.register(
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Log out" : "నిష్క్రమించు"
 },
diff --git a/core/l10n/te.json b/core/l10n/te.json
index d8224f5ffa1..1f749883e2c 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -33,11 +33,11 @@
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Log out" : "నిష్క్రమించు"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 7b65977d950..7cf97df4823 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
-    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
@@ -65,9 +64,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-    "Username" : "ชื่อผู้ใช้งาน",
     "New password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
@@ -76,6 +74,7 @@ OC.L10N.register(
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
     "Configure the database" : "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 12457e67752..4237deb738a 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -20,7 +20,6 @@
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
-    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
@@ -63,9 +62,8 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-    "Username" : "ชื่อผู้ใช้งาน",
     "New password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
@@ -74,6 +72,7 @@
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
     "Configure the database" : "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 32144b5441c..37eab400dd4 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
-    "Reset password" : "Parolayı sıfırla",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
     "Yes" : "Evet",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
     "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-    "Username" : "Kullanıcı Adı",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-    "Reset" : "Sıfırla",
     "New password" : "Yeni parola",
     "New Password" : "Yeni Parola",
+    "Reset password" : "Parolayı sıfırla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
     "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
     "Personal" : "Kişisel",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
     "Storage & database" : "Depolama ve veritabanı",
     "Data folder" : "Veri klasörü",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index c22d47c9e37..a34a07bd0e8 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
-    "Reset password" : "Parolayı sıfırla",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
     "Yes" : "Evet",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
     "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-    "Username" : "Kullanıcı Adı",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-    "Reset" : "Sıfırla",
     "New password" : "Yeni parola",
     "New Password" : "Yeni Parola",
+    "Reset password" : "Parolayı sıfırla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
     "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
     "Personal" : "Kişisel",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
     "Storage & database" : "Depolama ve veritabanı",
     "Data folder" : "Veri klasörü",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index d6a74751c7a..c71c67807c7 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -38,13 +38,13 @@ OC.L10N.register(
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
     "_download %n file_::_download %n files_" : [""],
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق"
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index bd061a85025..aadc8c1cf8b 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -36,13 +36,13 @@
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
     "_download %n file_::_download %n files_" : [""],
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق"
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 38f9d17e692..cd444036896 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
-    "Reset password" : "Скинути пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
     "Yes" : "Так",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s пароль скинуто",
     "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
-    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-    "Username" : "Ім'я користувача",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
-    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
-    "Reset" : "Перевстановити",
     "New password" : "Новий пароль",
     "New Password" : "Новий пароль",
+    "Reset password" : "Скинути пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
     "Personal" : "Особисте",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
     "Storage & database" : "Сховище і база даних",
     "Data folder" : "Каталог даних",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 8ec13dedae7..4e649b34ff4 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
-    "Reset password" : "Скинути пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
     "Yes" : "Так",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s пароль скинуто",
     "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
-    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-    "Username" : "Ім'я користувача",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
-    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
-    "Reset" : "Перевстановити",
     "New password" : "Новий пароль",
     "New Password" : "Новий пароль",
+    "Reset password" : "Скинути пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
     "Personal" : "Особисте",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
     "Storage & database" : "Сховище і база даних",
     "Data folder" : "Каталог даних",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index ce5c57e5fdf..491309f60a9 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
-    "Reset password" : "ری سیٹ پاسورڈ",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
@@ -90,11 +89,8 @@ OC.L10N.register(
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-    "Username" : "یوزر نیم",
-    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-    "Reset" : "ری سیٹ",
     "New password" : "نیا پاسورڈ",
+    "Reset password" : "ری سیٹ پاسورڈ",
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
@@ -107,6 +103,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
     "Data folder" : "ڈیٹا فولڈر",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index 6f3a5993a9f..138c67824f2 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -27,7 +27,6 @@
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
-    "Reset password" : "ری سیٹ پاسورڈ",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
@@ -88,11 +87,8 @@
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-    "Username" : "یوزر نیم",
-    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-    "Reset" : "ری سیٹ",
     "New password" : "نیا پاسورڈ",
+    "Reset password" : "ری سیٹ پاسورڈ",
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
@@ -105,6 +101,7 @@
     "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
     "Data folder" : "ڈیٹا فولڈر",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 5e48c7802d9..6c53239cdf4 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
-    "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
@@ -93,12 +92,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-    "Username" : "Tên đăng nhập",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-    "Reset" : "Khởi động lại",
     "New password" : "Mật khẩu mới",
+    "Reset password" : "Khôi phục mật khẩu",
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
@@ -119,6 +114,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Data folder" : "Thư mục dữ liệu",
     "Configure the database" : "Cấu hình cơ sở dữ liệu",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 7567c0a65bb..1670cad7777 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -29,7 +29,6 @@
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
-    "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
@@ -91,12 +90,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-    "Username" : "Tên đăng nhập",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-    "Reset" : "Khởi động lại",
     "New password" : "Mật khẩu mới",
+    "Reset password" : "Khôi phục mật khẩu",
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
@@ -117,6 +112,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Data folder" : "Thư mục dữ liệu",
     "Configure the database" : "Cấu hình cơ sở dữ liệu",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index da5521925ea..8a432e857ff 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
     "I know what I'm doing" : "我知道我在做什么",
-    "Reset password" : "重置密码",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
     "No" : "否",
     "Yes" : "是",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
     "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
-    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
-    "Username" : "用户名",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
-    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
-    "Reset" : "重置",
     "New password" : "新密码",
     "New Password" : "新密码",
+    "Reset password" : "重置密码",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "Personal" : "个人",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Username" : "用户名",
     "Password" : "密码",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index ff67feacad0..7f2aa70e0cd 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
     "I know what I'm doing" : "我知道我在做什么",
-    "Reset password" : "重置密码",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
     "No" : "否",
     "Yes" : "是",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
     "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
-    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
-    "Username" : "用户名",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
-    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
-    "Reset" : "重置",
     "New password" : "新密码",
     "New Password" : "新密码",
+    "Reset password" : "重置密码",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "Personal" : "个人",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Username" : "用户名",
     "Password" : "密码",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index c36746e12fc..9e4ef8969d8 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
-    "Reset password" : "重設密碼",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
@@ -54,17 +53,16 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
-    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
-    "Username" : "用戶名稱",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
     "Admin" : "管理",
     "Help" : "幫助",
     "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Configure the database" : "設定資料庫",
     "Database user" : "資料庫帳戶",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 294bdce33b6..83806390d1f 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -20,7 +20,6 @@
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
-    "Reset password" : "重設密碼",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
@@ -52,17 +51,16 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
-    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
-    "Username" : "用戶名稱",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
     "Admin" : "管理",
     "Help" : "幫助",
     "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Configure the database" : "設定資料庫",
     "Database user" : "資料庫帳戶",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 47a9f738ed0..2a3e38d6ff8 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
-    "Reset password" : "重設密碼",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
     "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
-    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
-    "Username" : "使用者名稱",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
-    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
     "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
     "Personal" : "個人",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
     "Storage & database" : "儲存空間和資料庫",
     "Data folder" : "資料儲存位置",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 875b5b5af4a..c8db6e348c7 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
-    "Reset password" : "重設密碼",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
     "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
-    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
-    "Username" : "使用者名稱",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
-    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
     "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
     "Personal" : "個人",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
     "Storage & database" : "儲存空間和資料庫",
     "Data folder" : "資料儲存位置",