From b923d96752010a4457e5444ab534f45a9391e99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 26 Sep 2019 09:09:01 +0200 Subject: [PATCH 1/4] Language reworked --- portal/locales/en.json | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/portal/locales/en.json b/portal/locales/en.json index e09467a..8166a90 100644 --- a/portal/locales/en.json +++ b/portal/locales/en.json @@ -1,15 +1,15 @@ { "portal": "YunoHost Portal", - "information": "Your information", + "information": "Your info", "username": "Username", "password": "Password", - "fullname": "Fullname", - "mail_addresses": "Mail addresses", - "mail_forward": "Mail forward", + "fullname": "Full name", + "mail_addresses": "E-mail addresses", + "mail_forward": "E-mail forwarding address", "new_mail": "newmail@mydomain.org", "new_forward": "newforward@myforeigndomain.org", - "add_mail": "Add a mail alias", - "add_forward": "Add a mail forward", + "add_mail": "Add an e-mail alias", + "add_forward": "Add an e-mail forwarding address", "ok": "OK", "cancel": "Cancel", "change_password": "Change password", @@ -17,30 +17,30 @@ "current_password": "Current password", "new_password": "New password", "confirm": "Confirm", - "login": "Login", - "logout": "Logout", - "password_changed": "Password successfully changed", - "password_changed_error": "An error occurred on password changing", - "password_not_match": "New passwords don't match", - "password_listed": "This password is among the most used password in the world. Please choose something a bit more unique.", - "password_too_simple_1": "Password needs to be at least 8 characters long", - "password_too_simple_2": "Password needs to be at least 8 characters long and contains digit, upper and lower characters", - "password_too_simple_3": "Password needs to be at least 8 characters long and contains digit, upper, lower and special characters", - "password_too_simple_4": "Password needs to be at least 12 characters long and contains digit, upper, lower and special characters", - "good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters - though it is good practice to use longer password (i.e. a passphrase) and/or to use various kind of characters (uppercase, lowercase, digits and special characters).", - "wrong_current_password": "Current password is wrong", - "invalid_mail": "Invalid mail address", + "login": "Log in", + "logout": "Log out", + "password_changed": "Password changed", + "password_changed_error": "Could not change passowrd", + "password_not_match": "The passwords don't match", + "password_listed": "This password is among the most used passwords in the world. Please choose something a bit more unique.", + "password_too_simple_1": "The password needs to be at least 8 characters long", + "password_too_simple_2": "The password needs to be at least 8 characters long and contains digit, upper and lower characters", + "password_too_simple_3": "The password needs to be at least 8 characters long and contains digit, upper, lower and special characters", + "password_too_simple_4": "The password needs to be at least 12 characters long and contains digit, upper, lower and special characters", + "good_practices_about_user_password": "Pick a user password of at least 8 characters - though it is good practice to use longer ones (i.e. a passphrase) and/or use various kind of characters (uppercase, lowercase, digits and special characters).", + "wrong_current_password": "The current password is wrong", + "invalid_mail": "Invalid e-mail address", "invalid_domain": "Invalid domain in", - "invalid_mailforward": "Invalid mail forward address", - "mail_already_used": "Mail address already used:", - "information_updated": "Information updated", - "user_saving_fail": "An error occurred on user's modification saving", - "missing_required_fields": "Required fields are missing", + "invalid_mailforward": "Invalid e-mail forwarding address", + "mail_already_used": "E-mail address already in use:", + "information_updated": "Info updated", + "user_saving_fail": "Could not save new user info", + "missing_required_fields": "Fill inn the required fields", "wrong_username_password": "Wrong username or password", "logged_out": "Logged out", "please_login": "Please log in to access to this content", "please_login_from_portal": "Please log in from the portal", - "redirection_error_invalid_url": "Redirection error: Invalid url", + "redirection_error_invalid_url": "Redirection error: Invalid URL", "redirection_error_unmanaged_domain": "Redirection error: Unmanaged domain", "footerlink_edit": "Edit my profile", "footerlink_documentation": "Documentation", From 29ae8abc3a4464cf4dc9786638395ec4ad79c313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 27 Sep 2019 23:58:12 +0200 Subject: [PATCH 2/4] password Co-Authored-By: decentral1se --- portal/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal/locales/en.json b/portal/locales/en.json index 8166a90..a1c93e2 100644 --- a/portal/locales/en.json +++ b/portal/locales/en.json @@ -20,7 +20,7 @@ "login": "Log in", "logout": "Log out", "password_changed": "Password changed", - "password_changed_error": "Could not change passowrd", + "password_changed_error": "Could not change password", "password_not_match": "The passwords don't match", "password_listed": "This password is among the most used passwords in the world. Please choose something a bit more unique.", "password_too_simple_1": "The password needs to be at least 8 characters long", From 85ee4879dc50386338af9cab5c8e9304ce1207ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 27 Sep 2019 23:58:57 +0200 Subject: [PATCH 3/4] in use: Co-Authored-By: decentral1se --- portal/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal/locales/en.json b/portal/locales/en.json index a1c93e2..b1fdf79 100644 --- a/portal/locales/en.json +++ b/portal/locales/en.json @@ -32,7 +32,7 @@ "invalid_mail": "Invalid e-mail address", "invalid_domain": "Invalid domain in", "invalid_mailforward": "Invalid e-mail forwarding address", - "mail_already_used": "E-mail address already in use:", + "mail_already_used": "E-mail address already in use", "information_updated": "Info updated", "user_saving_fail": "Could not save new user info", "missing_required_fields": "Fill inn the required fields", From 67a06135c87b0409e5c51d391a9faebfa1288e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sat, 28 Sep 2019 20:00:57 +0200 Subject: [PATCH 4/4] Spelling: Fill in --- portal/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portal/locales/en.json b/portal/locales/en.json index b1fdf79..2d07f11 100644 --- a/portal/locales/en.json +++ b/portal/locales/en.json @@ -35,7 +35,7 @@ "mail_already_used": "E-mail address already in use", "information_updated": "Info updated", "user_saving_fail": "Could not save new user info", - "missing_required_fields": "Fill inn the required fields", + "missing_required_fields": "Fill in the required fields", "wrong_username_password": "Wrong username or password", "logged_out": "Logged out", "please_login": "Please log in to access to this content",