Merge remote-tracking branch 'origin/master'

bin/migrate

@@ -40,6 +40,6 @@ if (file_exists(__DIR__.'/../install') && (!isset($config['debug']) || !$config[
     removeDirectory(__DIR__.'/../install');
 }
 
-echo 'If you are upgrading from a previous version, please run a "php bin\clean".'.PHP_EOL;
+echo 'If you are upgrading from a previous version, please run a "php bin' . DIRECTORY_SEPARATOR . 'clean".'.PHP_EOL;
 echo 'Done.'.PHP_EOL;
-exit(0);
+exit(0);

package-lock.json

@@ -963,9 +963,9 @@
       "dev": true
     },
     "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.0.tgz",
+      "integrity": "sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ=="
     },
     "js-yaml": {
       "version": "3.13.1",

package.json

@@ -6,7 +6,7 @@
     "clipboard": "^2.0.6",
     "dropzone": "^5.7.0",
     "highlightjs": "^9.16.2",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.0",
     "plyr": "^3.5.10",
     "popper.js": "^1.16.1",
     "tooltip.js": "^1.3.3"

resources/lang/de.lang.php

@@ -62,8 +62,8 @@ return [
     'welcome' => 'Willkommen, %s!',
     'goodbye' => 'Auf Wiedersehen!',
     'token_not_found' => 'Das angegebene Schlüssel wurde nicht gefunden.',
-    'email_required' => 'Die E-Mail ist erforderlich.',
-    'email_taken' => 'Die E-Mail ist bereits vergeben.',
+    'email_required' => 'E-Mail-Adresse erforderlich.',
+    'email_taken' => 'Die E-Mail-Adresse wird bereits verwendet.',
     'username_required' => 'Der Benutzername ist erforderlich.',
     'username_taken' => 'Der Benutzername ist bereits vergeben.',
     'password_required' => 'Das Passwort ist erforderlich.',

resources/lang/en.lang.php

@@ -65,8 +65,8 @@ return [
     'welcome' => 'Welcome, %s!',
     'goodbye' => 'Goodbye!',
     'token_not_found' => 'Token specified not found.',
-    'email_required' => 'The email is required.',
-    'email_taken' => 'The email is already taken.',
+    'email_required' => 'E-mail address required.',
+    'email_taken' => 'The e-mail address is already in use.',
     'username_required' => 'The username is required.',
     'username_taken' => 'The username is already taken.',
     'password_required' => 'The password is required.',
@@ -118,15 +118,15 @@ return [
     'password_recovery' => 'Recover password',
     'no_account' => 'Don\'t have an account?',
     'register' => 'Register',
-    'register_success' => 'The account has been created, a confirmation email has been sent.',
+    'register_success' => 'The account has been created, a confirmation e-mail has been sent.',
     'default_user_quota' => 'Default User Quota',
     'max_user_quota' => 'Max User Quota',
     'invalid_quota' => 'Invalid values as default user quota.',
     'mail.activate_text' => 'Hi %s!<br>thank you for creating your account on %s (<a href="%s">%s</a>), click on the following link to activate it:<br><br><a href="%s">%s</a>',
     'mail.activate_account' => '%s - Account Activation',
-    'mail.recover_text' => 'Hi %s,<br>a password reset has been requested for your account. To complete the procedure click on the following link:<br><br><a href="%s">%s</a><br><br>If it wasn\'t you who requested the password reset, simply ignore this email.',
+    'mail.recover_text' => 'Hi %s,<br>a password reset has been requested for your account. To complete the procedure click on the following link:<br><br><a href="%s">%s</a><br><br>If it wasn\'t you who requested the password reset, simply ignore this e-mail.',
     'mail.recover_password' => '%s - Password Recovery',
-    'recover_email_sent' => 'If present, a recovery email was sent to the specified account.',
+    'recover_email_sent' => 'If present, a recovery e-mail was sent to the specified account.',
     'account_activated' => 'Account activated, now you can login!',
     'quota_enabled' => 'Enable user quota',
     'password_repeat' => 'Repeat Password',
@@ -146,11 +146,11 @@ return [
     'only_recaptcha_v3' => 'Only reCAPTCHA v3 is supported.',
     'recaptcha_site_key' => 'reCAPTCHA Site Key',
     'recaptcha_secret_key' => 'reCAPTCHA Secret Key',
-    'send_notification' => 'Send Mail Notification',
+    'send_notification' => 'Send E-mail Notification',
     'mail.new_account' => '%s - New Account Creation',
     'mail.new_account_text_with_reset' => 'Hi %s!<br>a new account was created for you on %s (<a href="%s">%s</a>), click on the following link to set a password and activate it:<br><br><a href="%s">%s</a>',
     'mail.new_account_text_with_pw' => 'Hi %s!<br>a new account was created for you on %s (<a href="%s">%s</a>), with the following credentials:<br><br>Username: %s<br>Password: %s<br><br>Click on the following link to go to the login page:<br><a href="%s">%s</a>',
-    'user_create_password' => 'If leaved empty, you might want to send a notification to the user email.',
+    'user_create_password' => 'If leaved empty, you might want to send a notification to the user e-mail address.',
     'ldap_cant_connect' => 'Can\'t connect to the LDAP auth server.',
     'upload_max_file_size' => 'The max file size is currently %s.',
     'no_tags' => 'No tags added',

resources/lang/nb_NO.lang.php

@@ -149,4 +149,10 @@ return [
     'only_recaptcha_v3' => 'Bare reCAPTCHA v3 støttes.',
     'recaptcha_site_key' => 'reCAPTCHA Sidenøkkel',
     'recaptcha_secret_key' => 'reCAPTCHA Hemmelig Nøkkel',
+    'show_changelog' => 'Vis endringslogg',
+    'changelog' => 'Endringslogg',
+    'mail.new_account_text_with_reset' => 'Hei %s.<br>en ny konto ble opprettet for deg på %s (<a href="%s">%s</a>), klikk på følgende lenke for å sette et passord og aktivere den:<br><br><a href="%s">%s</a>',
+    'no_tags' => 'Ingen etiketter lagt til',
+    'upload_max_file_size' => 'Maksimal filstørrelse er for tiden %s.',
+    'ldap_cant_connect' => 'Kan ikke koble til LDAP-identitetsbekreftelsestjener.',
 ];

resources/lang/pl.lang.php

@@ -42,7 +42,7 @@ return [
     'confirm_string' => 'Jesteś pewien?',
     'installed' => 'Instalacja zakończona pomyślnie!',
     'welcome' => 'Witaj, %s!',
-    'email_required' => 'E-mail jest wymagany.',
+    'email_required' => 'Adres e-mail jest wymagany.',
     'username_required' => 'Nazwa użytkownika jest wymagana.',
     'username_taken' => 'Nazwa użytkownika jest już zajęta.',
     'password_required' => 'Hasło jest wymagane.',
@@ -70,7 +70,7 @@ return [
     'account_disabled' => 'Twoje konto jest wyłączone.',
     'goodbye' => 'Do zobaczenia!',
     'token_not_found' => 'Nie znaleziono określonego tokena.',
-    'email_taken' => 'Ten e-mail jest już zajęty.',
+    'email_taken' => 'Ten adres e-mail jest już zajęty.',
     'user_updated' => 'Użytkownik "%s" zaktualizowany!',
     'user_deleted' => 'Użytkownik usunięty.',
     'cannot_delete' => 'Nie możesz usunąć siebie.',