Merge remote-tracking branch 'origin/master' into users-management-enhancements

6 files changed, 9 insertions, 27 deletions

diff --git a/settings/Makefile b/settings/Makefile
deleted file mode 100644
index 666e99f1e06..00000000000
--- a/settings/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-all: dev-setup build-js-production
-
-dev-setup: clean clean-dev npm-init
-
-npm-init:
-	npm install
-
-npm-update:
-	npm update
-
-build-js:
-	npm run dev
-
-build-js-production:
-	npm run build
-
-watch-js:
-	npm run watch
-
-clean:
-	rm -f js/vue-*.js
-	rm -f js/vue-*.js.map
-
-clean-dev:
-	rm -rf node_modules
-
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 17f7ab29830..46e00109c4d 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Your email address was changed by an administrator" : "Votre adresse e-mail a été modifiée par un administrateur",
     "You created app password \"{token}\"" : "Vous avez créé un mot de passe d'application \"{token}\"",
     "You deleted app password \"{token}\"" : "Vous avez supprimé un mot de passe d'application \"{token}\"",
+    "You renamed app password \"{token}\" to \"{newToken}\"" : "Vous avez renommé le mot de passe d'application \"{token}\" en \"{newToken}\" ",
     "Security" : "Sécurité",
     "You successfully logged in using two-factor authentication (%1$s)" : "Vous avez réussi à vous connecter en utilisant l'authentification à deux facteurs (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Une tentative de connexion utilisant l'authentification à deux facteurs a échoué (%1$s)",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index b5cdc8d8fca..f8f653f5ccb 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -7,6 +7,7 @@
     "Your email address was changed by an administrator" : "Votre adresse e-mail a été modifiée par un administrateur",
     "You created app password \"{token}\"" : "Vous avez créé un mot de passe d'application \"{token}\"",
     "You deleted app password \"{token}\"" : "Vous avez supprimé un mot de passe d'application \"{token}\"",
+    "You renamed app password \"{token}\" to \"{newToken}\"" : "Vous avez renommé le mot de passe d'application \"{token}\" en \"{newToken}\" ",
     "Security" : "Sécurité",
     "You successfully logged in using two-factor authentication (%1$s)" : "Vous avez réussi à vous connecter en utilisant l'authentification à deux facteurs (%1$s)",
     "A login attempt using two-factor authentication failed (%1$s)" : "Une tentative de connexion utilisant l'authentification à deux facteurs a échoué (%1$s)",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 8673f28ca38..d72139a8a89 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -146,6 +146,7 @@ OC.L10N.register(
     "User backend" : "ユーザーバックエンド",
     "Last login" : "最終ログイン",
     "Default language" : "既定の言語",
+    "Add a new user" : "新しいユーザーを追加",
     "Unlimited" : "無制限",
     "Default quota" : "デフォルトのクォータ",
     "Password change is disabled because the master key is disabled" : "マスターキーが無効になっているため、パスワードの変更は無効です",
@@ -159,6 +160,7 @@ OC.L10N.register(
     "{license}-licensed" : "{license}-ライセンス",
     "New user" : "新しいユーザー",
     "Default quota:" : "デフォルトのクォータ :",
+    "Select default quota" : "デフォルトのクォーター",
     "Show last login" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
     "You are about to remove the group {group}. The users will NOT be deleted." : "{group}グループを削除しようとしています。 ユーザーは削除されません。",
@@ -228,6 +230,7 @@ OC.L10N.register(
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
     "Start migration" : "移行を開始",
+    "save" : "保存",
     "Background jobs" : "バックグラウンドジョブ",
     "Last job ran %s." : "最終ジョブ実行: %s",
     "Last job execution ran %s. Something seems wrong." : "最終ジョブ実行は %s です。何か問題が発生しています。",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 6243bfadc7b..038ef4ac4c6 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -144,6 +144,7 @@
     "User backend" : "ユーザーバックエンド",
     "Last login" : "最終ログイン",
     "Default language" : "既定の言語",
+    "Add a new user" : "新しいユーザーを追加",
     "Unlimited" : "無制限",
     "Default quota" : "デフォルトのクォータ",
     "Password change is disabled because the master key is disabled" : "マスターキーが無効になっているため、パスワードの変更は無効です",
@@ -157,6 +158,7 @@
     "{license}-licensed" : "{license}-ライセンス",
     "New user" : "新しいユーザー",
     "Default quota:" : "デフォルトのクォータ :",
+    "Select default quota" : "デフォルトのクォーター",
     "Show last login" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
     "You are about to remove the group {group}. The users will NOT be deleted." : "{group}グループを削除しようとしています。 ユーザーは削除されません。",
@@ -226,6 +228,7 @@
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。\"デフォルトの暗号化モジュール\" を有効にして 'occ encryption:migrate' を実行してください。",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "古い暗号化(ownCloud <= 8.0) から新しいものに暗号化キーを移行する必要があります。",
     "Start migration" : "移行を開始",
+    "save" : "保存",
     "Background jobs" : "バックグラウンドジョブ",
     "Last job ran %s." : "最終ジョブ実行: %s",
     "Last job execution ran %s. Something seems wrong." : "最終ジョブ実行は %s です。何か問題が発生しています。",
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
index ab69f36a00f..f3edec0c18c 100644
--- a/settings/templates/settings/personal/security.php
+++ b/settings/templates/settings/personal/security.php
@@ -52,7 +52,7 @@ if($_['passwordChangeSupported']) {
 						   placeholder="<?php p($l->t('New password')); ?>"
 						   data-typetoggle="#personal-show"
 						   autocomplete="off" autocapitalize="none" autocorrect="off" />
-					<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="personal-show-label"></label>
+					<input type="checkbox" id="personal-show" class="hidden-visually" name="show" /><label for="personal-show" class="personal-show-label"></label>
 				</div>
 
 				<input id="passwordbutton" type="submit" value="<?php p($l->t('Change password')); ?>" />