aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files_sharing/.l10nignore4
-rwxr-xr-xautotest-checkers.sh3
-rw-r--r--core/templates/login.php2
-rw-r--r--settings/.l10nignore6
4 files changed, 9 insertions, 6 deletions
diff --git a/apps/files_sharing/.l10nignore b/apps/files_sharing/.l10nignore
index dfb7d6c4e6d..f5aa2c6a868 100644
--- a/apps/files_sharing/.l10nignore
+++ b/apps/files_sharing/.l10nignore
@@ -1,2 +1,6 @@
#webpack bundled files
js/additionalScripts.js
+js/dist/additionalScripts.js
+js/dist/files_sharing.js
+js/dist/files_sharing2.js
+js/dist/files_sharing3.js
diff --git a/autotest-checkers.sh b/autotest-checkers.sh
index 37b396de5e5..abadeeb182b 100755
--- a/autotest-checkers.sh
+++ b/autotest-checkers.sh
@@ -28,10 +28,7 @@ for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;);
[ "$app" == "files_sharing" ] || \
[ "$app" == "files_trashbin" ] || \
[ "$app" == "files_versions" ] || \
- [ "$app" == "lookup_server_connector" ] || \
[ "$app" == "provisioning_api" ] || \
- [ "$app" == "testing" ] || \
- [ "$app" == "twofactor_backupcodes" ] || \
[ "$app" == "updatenotification" ] || \
[ "$app" == "user_ldap" ]
then
diff --git a/core/templates/login.php b/core/templates/login.php
index c85f32ba8e3..74bb8b92393 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -61,7 +61,7 @@ use OC\Core\Controller\LoginController;
<?php if (!empty($_[LoginController::LOGIN_MSG_INVALIDPASSWORD])) { ?>
<p class="warning wrongPasswordMsg">
- <?php p($l->t('Wrong password.')); ?>
+ <?php p($l->t('Wrong username or password.')); ?>
</p>
<?php } else if (!empty($_[LoginController::LOGIN_MSG_USERDISABLED])) { ?>
<p class="warning userDisabledMsg">
diff --git a/settings/.l10nignore b/settings/.l10nignore
index bdb9284f2d6..0361e8a12c4 100644
--- a/settings/.l10nignore
+++ b/settings/.l10nignore
@@ -6,7 +6,9 @@ js/vue-3.js
js/vue-4.js
js/vue-5.js
js/vue-6.js
-js/settings-vue.js
-js/vue-settings-apps-users-management.js
+js/vue-7.js
+js/vue-8.js
js/vue-settings-admin-security.js
+js/vue-settings-apps-users-management.js
+js/vue-settings-personal-security.js
js/templates.js