Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b445985e authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/fix-reset-password-msg' into 'main' 

Reset password msg fix

See merge request !202
parents f8280c24 b8b269ee

.gitlab-ci.yml

+9 −9
Original line number Diff line number Diff line
@@ -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:

core/l10n/de.js

+2 −1
Original line number Diff line number Diff line
@@ -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/."

},

"");

core/l10n/de.json

+2 −1
Original line number Diff line number Diff line
@@ -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

core/l10n/en.js

+2 −1
Original line number Diff line number Diff line
@@ -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/."

},

"");

core/l10n/en.json

+2 −1
Original line number Diff line number Diff line
@@ -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