From 2fcbeccd0c5bc7ed853629ec566b83739a8dddf4 Mon Sep 17 00:00:00 2001 From: AVINASH GUSAIN Date: Wed, 2 Oct 2024 14:52:45 +0000 Subject: [PATCH 1/5] Reset password msg fix --- .gitlab-ci.yml | 18 +++++++++--------- core/l10n/de.js | 3 ++- core/l10n/de.json | 3 ++- core/l10n/en.js | 3 ++- core/l10n/en.json | 3 ++- core/l10n/en_GB.js | 36 ++++++++++++++++++++++++++++++++++++ core/l10n/en_GB.json | 34 ++++++++++++++++++++++++++++++++++ core/l10n/es.js | 3 ++- core/l10n/es.json | 3 ++- core/l10n/fr.js | 3 ++- core/l10n/fr.json | 3 ++- core/l10n/it.js | 3 ++- core/l10n/it.json | 3 ++- 13 files changed, 99 insertions(+), 19 deletions(-) create mode 100755 core/l10n/en_GB.js create mode 100755 core/l10n/en_GB.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b860253..784c203 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,15 +12,15 @@ include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main file: "nc-apps-checkout-deploy.yml" - - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: main - file: "mr-review-tools.yml" - - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: main - file: "git-operations.yml" - - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: main - file: "populate-code-climate-default-config.yml" +# - project: "e/infra/ecloud/nextcloud-apps/ci-templates" +# ref: main +# file: "mr-review-tools.yml" +# - project: "e/infra/ecloud/nextcloud-apps/ci-templates" +# ref: main +# file: "git-operations.yml" +# - project: "e/infra/ecloud/nextcloud-apps/ci-templates" +# ref: main +# file: "populate-code-climate-default-config.yml" .deploy:nextcloud-app-by-checkout: script: diff --git a/core/l10n/de.js b/core/l10n/de.js index d55d537..987e061 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -30,6 +30,7 @@ OC.L10N.register( "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Das Wiederherstellungs-E-Mail konnte nicht gesendet werden. Kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Nachdem Ihr Passwort zurückgesetzt wurde, gibt es keine Möglichkeit mehr, Ihre Daten zurückzuerhalten. Wenn Sie nicht sicher sind, was zu tun ist, wenden Sie sich bitte an Murena Workspace unter helpdesk@murena.com bevor Sie fortfahren. Wollen Sie wirklich weitermachen?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Das Passwort kann nicht geändert werden. Bitte kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien." + "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Wenn dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." }, ""); diff --git a/core/l10n/de.json b/core/l10n/de.json index c9c0d1a..91dec03 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -28,6 +28,7 @@ "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Das Wiederherstellungs-E-Mail konnte nicht gesendet werden. Kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Nachdem Ihr Passwort zurückgesetzt wurde, gibt es keine Möglichkeit mehr, Ihre Daten zurückzuerhalten. Wenn Sie nicht sicher sind, was zu tun ist, wenden Sie sich bitte an Murena Workspace unter helpdesk@murena.com bevor Sie fortfahren. Wollen Sie wirklich weitermachen?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Das Passwort kann nicht geändert werden. Bitte kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien." + "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Wenn dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." },"pluralForm" :"" } \ No newline at end of file diff --git a/core/l10n/en.js b/core/l10n/en.js index af4ea20..7ab296e 100755 --- a/core/l10n/en.js +++ b/core/l10n/en.js @@ -30,6 +30,7 @@ OC.L10N.register( "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name." + "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"If this account exists, a password reset message has been sent to its recovery email address. If you do not receive it, please verify your login and check your spam/junk folders. If you still cannot login please contact the Helpdesk at https://murena.com/contact-us/." }, ""); diff --git a/core/l10n/en.json b/core/l10n/en.json index 4c11ee2..316ff54 100755 --- a/core/l10n/en.json +++ b/core/l10n/en.json @@ -28,6 +28,7 @@ "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name." + "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"If this account exists, a password reset message has been sent to its recovery email address. If you do not receive it, please verify your login and check your spam/junk folders. If you still cannot login please contact the Helpdesk at https://murena.com/contact-us/." },"pluralForm" :"" } \ No newline at end of file diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js new file mode 100755 index 0000000..7ab296e --- /dev/null +++ b/core/l10n/en_GB.js @@ -0,0 +1,36 @@ +OC.L10N.register( + "core", + { + "Get your FREE Murena Workspace account now" : "Get your FREE Murena Workspace account now", + "1GB storage for FREE to store and sync your pictures & videos." : "1GB storage for FREE to store and sync your pictures & videos.", + "Edit your documents online." : "Edit your documents online.", + "Your unique email address @murena.io" : "Your unique email address @murena.io", + "Sync calendar and contacts with the cloud" : "Sync calendar and contacts with the cloud", + "and many new features added regularly!" : "and many new features added regularly!", + "Create My Account" : "Create My Account", + "Sign in to your account" : "Sign in to your account", + "Terms of Service" : "Terms of Service", + "Privacy Policy" : "Privacy Policy", + "All Rights Reserved" : "All Rights Reserved", + "Copyright" : "Copyright", + "Don't have an account yet?" : "Don't have an account yet?", + "Create an account" : "Create an account", + "Please contact Murena Workspace at helpdesk@murena.com" : "Please contact Murena Workspace at helpdesk@murena.com", + "Please try again or contact Murena Workspace at helpdesk@murena.com." : "Please try again or contact Murena Workspace at helpdesk@murena.com.", + "If you did not request this, please contact Murena Workspace at helpdesk@murena.com." : "If you did not request this, please contact Murena Workspace at helpdesk@murena.com.", + "There were too many requests from your network. Retry later or please contact Murena Workspace at helpdesk@murena.com if this is an error." : "There were too many requests from your network. Retry later or please contact Murena Workspace at helpdesk@murena.com if this is an error.", + "Contact Murena Workspace at helpdesk@murena.com if this message persists or appeared unexpectedly." : "Contact Murena Workspace at helpdesk@murena.com if this message persists or appeared unexpectedly.", + "This directory is unavailable, please check the logs or contact Murena Workspace at helpdesk@murena.com." : "This directory is unavailable, please check the logs or contact Murena Workspace at helpdesk@murena.com.", + "An unexpected error occurred. Please contact Murena Workspace at helpdesk@murena.com." : "An unexpected error occurred. Please contact Murena Workspace at helpdesk@murena.com.", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact Murena Workspace at helpdesk@murena.com." : "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact Murena Workspace at helpdesk@murena.com.", + "Please contact Murena Workspace at helpdesk@murena.com. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Please contact Murena Workspace at helpdesk@murena.com. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php.", + "Could not enable the recovery key, please try again or contact Murena Workspace at helpdesk@murena.com." : "Could not enable the recovery key, please try again or contact Murena Workspace at helpdesk@murena.com.", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact Murena Workspace at helpdesk@murena.com." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact Murena Workspace at helpdesk@murena.com.", + "Se ha enviado un mensaje de restablecimiento de contraseña a la dirección de correo electrónico de recuperación de esta cuenta. If you do not receive it, check your spam/junk folders or contact Murena Workspace at helpdesk@murena.com for help." : "Se ha enviado un mensaje de restablecimiento de contraseña a la dirección de correo electrónico de recuperación de esta cuenta. If you do not receive it, check your spam/junk folders or contact Murena Workspace at helpdesk@murena.com for help.", + "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com.", + "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?", + "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com.", + "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"If this account exists, a password reset message has been sent to its recovery email address. If you do not receive it, please verify your login and check your spam/junk folders. If you still cannot login please contact the Helpdesk at https://murena.com/contact-us/." +}, +""); diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json new file mode 100755 index 0000000..316ff54 --- /dev/null +++ b/core/l10n/en_GB.json @@ -0,0 +1,34 @@ +{ "translations": { + "Get your FREE Murena Workspace account now" : "Get your FREE Murena Workspace account now", + "1GB storage for FREE to store and sync your pictures & videos." : "1GB storage for FREE to store and sync your pictures & videos.", + "Edit your documents online." : "Edit your documents online.", + "Your unique email address @murena.io" : "Your unique email address @murena.io", + "Sync calendar and contacts with the cloud" : "Sync calendar and contacts with the cloud", + "and many new features added regularly!" : "and many new features added regularly!", + "Create My Account" : "Create My Account", + "Sign in to your account" : "Sign in to your account", + "Terms of Service" : "Terms of Service", + "Privacy Policy" : "Privacy Policy", + "All Rights Reserved" : "All Rights Reserved", + "Copyright" : "Copyright", + "Don't have an account yet?" : "Don't have an account yet?", + "Create an account" : "Create an account", + "Please contact Murena Workspace at helpdesk@murena.com" : "Please contact Murena Workspace at helpdesk@murena.com", + "Please try again or contact Murena Workspace at helpdesk@murena.com." : "Please try again or contact Murena Workspace at helpdesk@murena.com.", + "If you did not request this, please contact Murena Workspace at helpdesk@murena.com." : "If you did not request this, please contact Murena Workspace at helpdesk@murena.com.", + "There were too many requests from your network. Retry later or please contact Murena Workspace at helpdesk@murena.com if this is an error." : "There were too many requests from your network. Retry later or please contact Murena Workspace at helpdesk@murena.com if this is an error.", + "Contact Murena Workspace at helpdesk@murena.com if this message persists or appeared unexpectedly." : "Contact Murena Workspace at helpdesk@murena.com if this message persists or appeared unexpectedly.", + "This directory is unavailable, please check the logs or contact Murena Workspace at helpdesk@murena.com." : "This directory is unavailable, please check the logs or contact Murena Workspace at helpdesk@murena.com.", + "An unexpected error occurred. Please contact Murena Workspace at helpdesk@murena.com." : "An unexpected error occurred. Please contact Murena Workspace at helpdesk@murena.com.", + "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact Murena Workspace at helpdesk@murena.com." : "If you are not trying to set up a new device or app, someone is trying to trick you into granting them access to your data. In this case do not proceed and instead contact Murena Workspace at helpdesk@murena.com.", + "Please contact Murena Workspace at helpdesk@murena.com. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php." : "Please contact Murena Workspace at helpdesk@murena.com. If you are an administrator, edit the \"trusted_domains\" setting in config/config.php like the example in config.sample.php.", + "Could not enable the recovery key, please try again or contact Murena Workspace at helpdesk@murena.com." : "Could not enable the recovery key, please try again or contact Murena Workspace at helpdesk@murena.com.", + "Module with ID: %s does not exist. Please enable it in your apps settings or contact Murena Workspace at helpdesk@murena.com." : "Module with ID: %s does not exist. Please enable it in your apps settings or contact Murena Workspace at helpdesk@murena.com.", + "Se ha enviado un mensaje de restablecimiento de contraseña a la dirección de correo electrónico de recuperación de esta cuenta. If you do not receive it, check your spam/junk folders or contact Murena Workspace at helpdesk@murena.com for help." : "Se ha enviado un mensaje de restablecimiento de contraseña a la dirección de correo electrónico de recuperación de esta cuenta. If you do not receive it, check your spam/junk folders or contact Murena Workspace at helpdesk@murena.com for help.", + "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com.", + "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?", + "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com.", + "Due to encryption the search is only done on files' name." : "Due to encryption the search is only done on files' name.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"If this account exists, a password reset message has been sent to its recovery email address. If you do not receive it, please verify your login and check your spam/junk folders. If you still cannot login please contact the Helpdesk at https://murena.com/contact-us/." +},"pluralForm" :"" +} \ No newline at end of file diff --git a/core/l10n/es.js b/core/l10n/es.js index 069ad4d..d62d353 100644 --- a/core/l10n/es.js +++ b/core/l10n/es.js @@ -30,6 +30,7 @@ OC.L10N.register( "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "No se ha podido enviar el correo electrónico de restablecimiento. Póngase en contacto con Murena Workspace en helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Tus archivos están encriptados. No habrá manera de recuperar sus datos después de que se restablezca su contraseña. Si no está seguro de qué hacer, póngase en contacto con Murena Workspace en helpdesk@murena.com antes de continuar. Realmente quieres continuar?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "La contraseña no se puede cambiar. Póngase en contacto con Murena Workspace en helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Como los ficheros están cifrados, la búsqueda sólo se hace sobre el nombre de los mismos." + "Due to encryption the search is only done on files' name." : "Como los ficheros están cifrados, la búsqueda sólo se hace sobre el nombre de los mismos.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Si la cuenta existe, recibirás un mensaje de restablecimiento de contraseña a tu dirección de correo de recuperación. Si no lo recibes, verifica tus datos de acceso y/o comprueba tus carpetas de spam/correo no deseado. Si aun no puedes iniciar sesión, contacta el servicio de asistencia en https://murena.com/es/contact-us/." }, ""); diff --git a/core/l10n/es.json b/core/l10n/es.json index ac004a3..33c0892 100644 --- a/core/l10n/es.json +++ b/core/l10n/es.json @@ -28,6 +28,7 @@ "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "No se ha podido enviar el correo electrónico de restablecimiento. Póngase en contacto con Murena Workspace en helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Tus archivos están encriptados. No habrá manera de recuperar sus datos después de que se restablezca su contraseña. Si no está seguro de qué hacer, póngase en contacto con Murena Workspace en helpdesk@murena.com antes de continuar. Realmente quieres continuar?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "La contraseña no se puede cambiar. Póngase en contacto con Murena Workspace en helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Como los ficheros están cifrados, la búsqueda sólo se hace sobre el nombre de los mismos." + "Due to encryption the search is only done on files' name." : "Como los ficheros están cifrados, la búsqueda sólo se hace sobre el nombre de los mismos.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Si la cuenta existe, recibirás un mensaje de restablecimiento de contraseña a tu dirección de correo de recuperación. Si no lo recibes, verifica tus datos de acceso y/o comprueba tus carpetas de spam/correo no deseado. Si aun no puedes iniciar sesión, contacta el servicio de asistencia en https://murena.com/es/contact-us/." },"pluralForm" :"" } \ No newline at end of file diff --git a/core/l10n/fr.js b/core/l10n/fr.js index 85e6949..06e6eae 100644 --- a/core/l10n/fr.js +++ b/core/l10n/fr.js @@ -30,6 +30,7 @@ OC.L10N.register( "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Impossible d'envoyer l'email de réinitialisation. Veuillez contacter Murena Workspace au helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Vos fichiers sont cryptés. Il n'y aura aucun moyen de récupérer vos données après la réinitialisation de votre mot de passe. Si vous n'êtes pas sûr de ce que vous devez faire, veuillez contacter Murena Workspace au helpdesk@murena.com avant de continuer. Voulez-vous vraiment continuer?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Le mot de passe ne peut pas être modifié. Veuillez contacter Murena Workspace à helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers." + "Due to encryption the search is only done on files' name." : "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Si ce compte existe, un message de réinitialisation du mot de passe a été envoyé à l'adresse e-mail de récupération. Si vous ne le recevez pas, veuillez vérifier vos identifiants de connexion et vos dossiers de spam/courrier indésirable. Si vous ne parvenez toujours pas à vous connecter, veuillez contacter le support à l'adresse suivante : https://murena.com/fr/contact-us/." }, ""); diff --git a/core/l10n/fr.json b/core/l10n/fr.json index 194c20c..38a8c4e 100644 --- a/core/l10n/fr.json +++ b/core/l10n/fr.json @@ -28,6 +28,7 @@ "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Impossible d'envoyer l'email de réinitialisation. Veuillez contacter Murena Workspace au helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Vos fichiers sont cryptés. Il n'y aura aucun moyen de récupérer vos données après la réinitialisation de votre mot de passe. Si vous n'êtes pas sûr de ce que vous devez faire, veuillez contacter Murena Workspace au helpdesk@murena.com avant de continuer. Voulez-vous vraiment continuer?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Le mot de passe ne peut pas être modifié. Veuillez contacter Murena Workspace à helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers." + "Due to encryption the search is only done on files' name." : "Les fichiers étant chiffrés, la recherche n'est effectuée que sur le nom des fichiers.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Si ce compte existe, un message de réinitialisation du mot de passe a été envoyé à l'adresse e-mail de récupération. Si vous ne le recevez pas, veuillez vérifier vos identifiants de connexion et vos dossiers de spam/courrier indésirable. Si vous ne parvenez toujours pas à vous connecter, veuillez contacter le support à l'adresse suivante : https://murena.com/fr/contact-us/." },"pluralForm" :"" } \ No newline at end of file diff --git a/core/l10n/it.js b/core/l10n/it.js index b0d04d4..b9b1ddd 100755 --- a/core/l10n/it.js +++ b/core/l10n/it.js @@ -30,6 +30,7 @@ OC.L10N.register( "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Non è stato possibile inviare l'e-mail di ripristino. Contattare Murena Workspace al numero helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "I vostri file sono criptati. Non ci sarà modo di recuperare i dati dopo la reimpostazione della password. Se non siete sicuri di cosa fare, contattate Murena Workspace all'indirizzo helpdesk@murena.com prima di continuare. Volete davvero continuare?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "La password non può essere modificata. Contattare Murena Workspace all'indirizzo helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "A causa della crittografia, la ricerca viene effettuata solo sul nome dei file." + "Due to encryption the search is only done on files' name." : "A causa della crittografia, la ricerca viene effettuata solo sul nome dei file.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Se il Nome utente/email esiste, un messaggio di reimpostazione della password verrà inviato all'indirizzo email di recupero. Se non lo ricevi, verifica il tuo nome utente/email e controlla le cartelle di spam/posta indesiderata. Se ancora non riesci ad accedere, contatta l'assistenza all'indirizzo https://murena.com/contact-us/." }, ""); diff --git a/core/l10n/it.json b/core/l10n/it.json index 6e4360c..ca064da 100644 --- a/core/l10n/it.json +++ b/core/l10n/it.json @@ -28,6 +28,7 @@ "Couldn't send reset email. Please contact Murena Workspace at helpdesk@murena.com." : "Non è stato possibile inviare l'e-mail di ripristino. Contattare Murena Workspace al numero helpdesk@murena.com.", "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "I vostri file sono criptati. Non ci sarà modo di recuperare i dati dopo la reimpostazione della password. Se non siete sicuri di cosa fare, contattate Murena Workspace all'indirizzo helpdesk@murena.com prima di continuare. Volete davvero continuare?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "La password non può essere modificata. Contattare Murena Workspace all'indirizzo helpdesk@murena.com.", - "Due to encryption the search is only done on files' name." : "A causa della crittografia, la ricerca viene effettuata solo sul nome dei file." + "Due to encryption the search is only done on files' name." : "A causa della crittografia, la ricerca viene effettuata solo sul nome dei file.", + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Se il Nome utente/email esiste, un messaggio di reimpostazione della password verrà inviato all'indirizzo email di recupero. Se non lo ricevi, verifica il tuo nome utente/email e controlla le cartelle di spam/posta indesiderata. Se ancora non riesci ad accedere, contatta l'assistenza all'indirizzo https://murena.com/contact-us/." },"pluralForm" :"" } \ No newline at end of file -- GitLab From 07771c440d1d48cb36026adde77ff1a38484c683 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 4 Oct 2024 15:57:30 +0530 Subject: [PATCH 2/5] translation added german --- core/l10n/de.js | 2 +- core/l10n/de.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/l10n/de.js b/core/l10n/de.js index 987e061..fbed8ee 100644 --- a/core/l10n/de.js +++ b/core/l10n/de.js @@ -31,6 +31,6 @@ OC.L10N.register( "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Nachdem Ihr Passwort zurückgesetzt wurde, gibt es keine Möglichkeit mehr, Ihre Daten zurückzuerhalten. Wenn Sie nicht sicher sind, was zu tun ist, wenden Sie sich bitte an Murena Workspace unter helpdesk@murena.com bevor Sie fortfahren. Wollen Sie wirklich weitermachen?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Das Passwort kann nicht geändert werden. Bitte kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien.", - "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Wenn dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Falls dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten haben, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." }, ""); diff --git a/core/l10n/de.json b/core/l10n/de.json index 91dec03..3d5b30f 100644 --- a/core/l10n/de.json +++ b/core/l10n/de.json @@ -29,6 +29,6 @@ "Your files are encrypted. 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 Murena Workspace at helpdesk@murena.com before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Nachdem Ihr Passwort zurückgesetzt wurde, gibt es keine Möglichkeit mehr, Ihre Daten zurückzuerhalten. Wenn Sie nicht sicher sind, was zu tun ist, wenden Sie sich bitte an Murena Workspace unter helpdesk@murena.com bevor Sie fortfahren. Wollen Sie wirklich weitermachen?", "Password cannot be changed. Please contact Murena Workspace at helpdesk@murena.com." : "Das Passwort kann nicht geändert werden. Bitte kontaktieren Sie Murena Workspace unter helpdesk@murena.com.", "Due to encryption the search is only done on files' name." : "Aufgrund der Verschlüsselung erfolgt die Suche nur nach dem Namen der Dateien.", - "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Wenn dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." + "If this account exists, a password reset message has been sent to its email address. If you do not receive it, verify your email address and/or account name, check your spam/junk folders or ask your local administration for help.":"Falls dieses Konto existiert, wurde eine Nachricht zum Zurücksetzen des Passworts an die hinterlegte E-Mail-Adresse gesendet. Sollten Sie diese nicht erhalten haben, überprüfen Sie bitte Ihre Anmeldedaten und Ihren Spam-/Junk-Ordner. Wenn Sie sich immer noch nicht anmelden können, wenden Sie sich bitte an den Helpdesk unter https://murena.com/de/contact-us/." },"pluralForm" :"" } \ No newline at end of file -- GitLab From d63f90a671496c9789c7d2c36538d930a14a0e6d Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 21 Oct 2024 08:41:04 +0000 Subject: [PATCH 3/5] Footer height issue --- core/css/server.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 6c1a090..fdf0f45 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -411,10 +411,12 @@ input.primary, border: 1px solid #fff; color: #fff; } -footer { +#body-public footer { height: 92px; } - +#body-public main { + padding-bottom: calc(var(--footer-height)* 2); +} #header #notifications .notifications-button__icon { display: none; } -- GitLab From 0268796d1de23506f6f63df85c015b8da58ce8db Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 21 Oct 2024 12:18:06 +0000 Subject: [PATCH 4/5] password app icon --- apps/passwords/img/app.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/passwords/img/app.svg b/apps/passwords/img/app.svg index 015ed02..76d49f9 100644 --- a/apps/passwords/img/app.svg +++ b/apps/passwords/img/app.svg @@ -1,3 +1,3 @@ - + -- GitLab From 656c9663cd9c68df8253c25133db37482e24778d Mon Sep 17 00:00:00 2001 From: AVINASH GUSAIN Date: Tue, 17 Jun 2025 12:31:06 +0530 Subject: [PATCH 5/5] fix for sharing --- core/css/server.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/server.css b/core/css/server.css index fdf0f45..c8c904e 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -417,6 +417,9 @@ input.primary, #body-public main { padding-bottom: calc(var(--footer-height)* 2); } +#body-public.onlyoffice-inline #content.app-files_sharing{ + padding-bottom: unset; +} #header #notifications .notifications-button__icon { display: none; } -- GitLab