Skip to content

Commit b9556a5

Browse files
committed
frontend: update translations.
Made them more consistent and added recommendations in case of an error
1 parent 3cf3c43 commit b9556a5

File tree

2 files changed

+40
-48
lines changed

2 files changed

+40
-48
lines changed

frontend/src/locales/de.ts

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ export const de ={
5252
"connect": "Verbinden",
5353
"remove": "Löschen",
5454
"close": "Schließen",
55-
"loading_secret_failed": "Laden des Secrets ist mit dem Code {{status}} fehlgeschlagen: {{response}}",
56-
"loading_keys_failed": "Laden des Verbindungsschlüssels mit dem code {{status}} fehlgeschlagen: {{response}}",
55+
"loading_secret_failed": "Laden des Secrets ist mit dem Code {{status}} fehlgeschlagen: {{response}}. Bitte lade die Seite neu.",
56+
"loading_keys_failed": "Laden des Verbindungsschlüssels mit dem code {{status}} fehlgeschlagen: {{response}}. Bitte lade die Seite neu.",
5757
"all_keys_in_use": "Zur Zeit sind alle Fernzugriffsverbindungen belegt",
5858
"no_keys": "Bitte lerne das Gerät erneut an",
59-
"loading_devices_failed": "Laden der Geräte ist mit dem Code {{status}} fehlgeschlagen: {{response}}",
59+
"loading_devices_failed": "Laden der Geräte ist mit dem Code {{status}} fehlgeschlagen: {{response}}. Bitte lade die Seite neu.",
6060
"no_devices": "Noch keine Geräte registriert. Bitte verbinde dein Gerät mit diesem Konto, um zu beginnen.",
61-
"connect_error_text": "Verbindung zu Gerät {{charger_id}} ist mit dem code {{status}} fehlgeschlagen: {{response}}",
62-
"remove_error_text": "Entfernen des Gerätes {{charger_id}} ist mit dem code {{status}} fehlgeschlagen: {{response}}",
61+
"connect_error_text": "Verbindung zu Gerät {{charger_id}} ist mit dem code {{status}} fehlgeschlagen: {{response}}. Bitte lade die Seite neu.",
62+
"remove_error_text": "Entfernen des Gerätes {{charger_id}} ist mit dem code {{status}} fehlgeschlagen: {{response}}. Bitte lade die Seite neu.",
6363
"delete_modal_heading": "Gerät {{name}} entfernen",
6464
"delete_modal_body": "Bist du sicher, dass du das Gerät {{name}} entfernen willst? Dies ist permanent und das Gerät kann nur wiederhergestellt werden wenn du direkten Zugriff auf das Webinterface hast.",
6565
"select_sorting": "Sortieren",
@@ -73,16 +73,16 @@ export const de ={
7373
"time_hours_ago": "vor {{count}}h",
7474
"time_days_ago": "vor {{count}}d",
7575
"edit_note_heading": "Notiz bearbeiten",
76-
"edit_note_failed": "Notiz bearbeiten fehlgeschlagen",
76+
"edit_note_failed": "Notiz bearbeiten fehlgeschlagen, bitte lade die Seite neu.",
7777
"accept": "Bestätigen",
7878
"decline": "Verwerfen",
7979
"show_more": "Mehr anzeigen",
8080
"show_less": "Weniger anzeigen",
8181
"abort": "Abbrechen",
82-
"not_connected": "Das Gerät ist aktuell nicht erreichbar",
82+
"not_connected": "Das Gerät ist aktuell nicht erreichbar. Sollte das Problem weiterhin bestehen, überprüfe bitte deine Internetverbindung und die Verbindung des Gerätes zum Internet.",
8383
"connecting": "Verbindung wird aufgebaut",
8484
"loading_webinterface": "Webinterface wird geladen",
85-
"invalid_key": "Die auf dem Gerät gespeicherten Schlüssel scheinen fehlerhaft zu sein",
85+
"invalid_key": "Die auf dem Gerät gespeicherten Schlüssel scheinen fehlerhaft zu sein. Sollte der Fehler weiterhin bestehen, entferne das Gerät und füge es erneut hinzu.",
8686
"connection_timeout": "Timeout",
8787
"connection_timeout_text": "Ein Timeout ist während des Aufbaus der Verbindung aufgetreten. Bitte versuche es später erneut oder kontaktiere uns falls das Problem bestehen bleibt."
8888
},
@@ -105,8 +105,6 @@ export const de ={
105105
"confirm_password_error_message": "Passwörter stimmen nicht überein",
106106
"accept_privacy_notice": "Ich habe die <0>Datenschutzerklärung</0> gelesen, verstanden und stimme zu.",
107107
"accept_terms_and_conditions": "Ich habe die <0>AGB</0> gelesen, verstanden und stimme zu.",
108-
"accept_privacy_notice_alpha": "Ich verstehe, dass dies eine Alpha-Version ist und stimme der verarbeitung meiner Daten wie <0>hier</0> beschrieben zu.",
109-
"register": "Registrieren",
110108
"save_recovery_data": "Wiederhestellungsdatei speichern",
111109
"save": "Speichern",
112110
"save_recovery_data_text": "Da die Zugangsdaten für die Geräte nur mithilfe des korrekten Passworts entschlüsselt werden können brauchst du, falls du dein Passwort vergessen solltest, diese Datei um den Zugang zu deinen Geräten wiederherzustellen. Bewahre diese Datei sicher und für niemanden sonst zugänglich auf, da sie mit deinem Passwort gleichzustellen ist.",
@@ -136,11 +134,11 @@ export const de ={
136134
"close_remote_access": "Fernzugriff schließen"
137135
},
138136
"tokens": {
139-
"fetch_user_failed": "Konto konnte nicht abgerufen werden",
140-
"fetch_tokens_failed": "Token konnten nicht abgerufen werden",
141-
"unexpected_error": "Ein unerwarteter Fehler ist aufgetreten",
142-
"create_token_failed": "Token konnte nicht erstellt werden",
143-
"delete_token_failed": "Token konnte nicht gelöscht werden",
137+
"fetch_user_failed": "Konto konnte nicht abgerufen werden. Bitte lade die Seite neu.",
138+
"fetch_tokens_failed": "Token konnten nicht abgerufen werden. Bitte lade die Seite neu.",
139+
"unexpected_error": "Ein unerwarteter Fehler ist aufgetreten. Bitte lade die Seite neu.",
140+
"create_token_failed": "Token konnte nicht erstellt werden. Bitte lade die Seite neu.",
141+
"delete_token_failed": "Token konnte nicht gelöscht werden. Bitte lade die Seite neu.",
144142
"copy_success": "Erfolg",
145143
"copy_success_text": "Token in die Zwischenablage kopiert",
146144
"copy_failed": "Token konnte nicht kopiert werden",

frontend/src/locales/en.ts

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const en = {
77
description,
88
"no_service_worker": "Your browser needs support for ServiceWorkers to be able to run the Remote Access.",
99
"user": {
10+
"account_actions": "Account actions",
1011
"profile_information": "Account information",
1112
"save_changes": "Save changes",
1213
"user_id": "Account-ID",
@@ -17,26 +18,21 @@ export const en = {
1718
"current_password": "Current password",
1819
"current_password_error_message": "Must not be empty.",
1920
"new_password": "New password",
20-
"new_password_error_message": "Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters",
21+
"new_password_error_message": "Must be at least 8 characters long and contain at least one lowercase and uppercase letter, and one special character.",
2122
"confirm_new_password": "Confirm new password",
2223
"confirm_new_password_error_message": "Passwords do not match",
2324
"close": "Close",
2425
"delete_user": "Delete account",
2526
"password": "Password",
2627
"password_invalid": "Password is wrong",
2728
"logout_all": "Logout from all sessions",
28-
"get_user_failed": "Loading account data failed with status code {{status}}: {{response}}",
29-
"update_user_failed": "Updating the account-data failed with status code {{status}}: {{response}}",
30-
"update_password_failed": "Updating the password failed with status code {{status}}: {{response}}",
31-
"delete_user_failed": "Deleting account failed with status code {{status}}: {{response}}",
32-
"account_actions": "Account actions",
29+
"get_user_failed": "Loading account data failed with status code {{status}}: {{response}}. Please reload the page.",
30+
"update_user_failed": "Updating the account-data failed with status code {{status}}: {{response}}. Please reload the page.",
31+
"update_password_failed": "Updating the password failed with status code {{status}}: {{response}}. Please reload the page.",
32+
"delete_user_failed": "Deleting account failed with status code {{status}}: {{response}}. Please reload the page.",
3333
"email_change_disabled": "Email changes are disabled because you have chargers with old firmware versions. Please update your chargers first.",
3434
"local_settings": "Local settings",
3535
"debug_mode": "Debug mode",
36-
"invalid_key": "The keys saved on the device seem to be corrupted",
37-
"connection_timeout": "Timeout",
38-
"invalid_name": "The name must not be empty",
39-
"connection_timeout_text": "A timeout occured while establishing the connection. Please try again later or contact us in case the problem persists."
4036
},
4137
"recovery": {
4238
"recovery": "Password recovery",
@@ -56,16 +52,16 @@ export const en = {
5652
"connect": "Connect",
5753
"remove": "Remove",
5854
"close": "Close",
59-
"loading_secret_failed": "Loading secret failed with status code {{status}}: {{response}}",
60-
"loading_keys_failed": "Loading connection keys failed with status code {{status}}: {{response}}",
55+
"loading_secret_failed": "Loading secret failed with status code {{status}}: {{response}}. Please reload the page.",
56+
"loading_keys_failed": "Loading connection keys failed with status code {{status}}: {{response}}. Please reload the page.",
6157
"all_keys_in_use": "Currently all remote connections are in use",
6258
"no_keys": "You need to register this device again.",
63-
"loading_devices_failed": "Loading devices failed with status code {{status}}: {{response}}",
59+
"loading_devices_failed": "Loading devices failed with status code {{status}}: {{response}}. Please reload the page.",
6460
"no_devices": "No devices registered yet. Please connect your device to this account to get started.",
65-
"connect_error_text": "Connecting to device {{charger_id}} failed with status code {{status}}: {{response}}",
66-
"remove_error_text": "Removing device {{charger_id}} failed with status code {{status}}: {{response}}",
61+
"connect_error_text": "Connecting to device {{charger_id}} failed with status code {{status}}: {{response}}. Please reload the page.",
62+
"remove_error_text": "Removing device {{charger_id}} failed with status code {{status}}: {{response}}. Please reload the page.",
6763
"delete_modal_heading": "Remove device {{name}}",
68-
"delete_modal_body": "Are you sure you want to remove device {{name}}? This is permanently and the device can only be added again once you have direct access to the device again.",
64+
"delete_modal_body": "Are you sure you want to remove device {{name}}? This is permanent and the device can only be restored if you have direct access to the web interface.",
6965
"select_sorting": "Sort",
7066
"sorting_sequence_asc": "Ascending",
7167
"sorting_sequence_desc": "Descending",
@@ -77,16 +73,16 @@ export const en = {
7773
"time_hours_ago": "{{count}}h ago",
7874
"time_days_ago": "{{count}}d ago",
7975
"edit_note_heading": "Edit note",
80-
"edit_note_failed": "Editing note failed",
76+
"edit_note_failed": "Editing note failed, please reload the page.",
8177
"accept": "Accept",
8278
"decline": "Decline",
8379
"show_more": "Show more",
8480
"show_less": "Show less",
8581
"abort": "Cancel",
86-
"not_connected": "The device is currently not reachable",
82+
"not_connected": "The device is currently not reachable. If the problem persists, please check your internet connection and the device's connection to the internet.",
8783
"connecting": "Connecting",
8884
"loading_webinterface": "Loading webinterface",
89-
"invalid_key": "The keys saved on the device seem to be corrupted",
85+
"invalid_key": "The keys saved on the device seem to be corrupted. If the error persists, remove the device and add it again.",
9086
"connection_timeout": "Timeout",
9187
"connection_timeout_text": "A timeout occured while establishing the connection. Please try again later or contact us in case the problem persists."
9288
},
@@ -104,18 +100,16 @@ export const en = {
104100
"email": "Email-address",
105101
"email_error_message": "The email-address must not be empty",
106102
"password": "Password",
107-
"password_error_message": "Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters",
103+
"password_error_message": "Must be at least 8 characters long and contain at least one lowercase and uppercase letter, and one special character.",
108104
"confirm_password": "Confirm password",
109105
"confirm_password_error_message": "Passwords do not match",
110106
"accept_privacy_notice": "I have read, understood and I am accepting the <0>privacy notice</0>.",
111107
"accept_terms_and_conditions": "I have read, understood and I am accepting the <0>terms and conditions</0>.",
112-
"accept_privacy_notice_alpha": "I understand that this is an alpha-version and accept the usage of my data as described <0>here</0>.",
113-
"register": "Register",
114108
"save_recovery_data": "Save recovery file",
115109
"save": "Save",
116-
"save_recovery_data_text": "Since we can only decrypt the access code with the correct password we need this file to recover access to your devices in case of a password loss. Save this file in a safe location which is inaccessible by others since it is equivalent to your password.",
110+
"save_recovery_data_text": "Since the access data for the devices can only be decrypted with the correct password, you need this file to restore access to your devices if you forget your password. Keep this file safe and inaccessible to others, as it is equivalent to your password.",
117111
"close": "Close",
118-
"registration_successful": "Registration was successful, you should receive an email in the next couple of minutes."
112+
"registration_successful": "Registration was successful. You should receive an email with a confirmation link within the next few minutes."
119113
},
120114
"login": {
121115
"password_recovery": "Password reset",
@@ -125,9 +119,9 @@ export const en = {
125119
"password": "Password",
126120
"login": "Login",
127121
"wrong_credentials": "Email-address or password wrong.",
128-
"success_alert_text": "You should receive an email in the next couple of minutes.",
122+
"success_alert_text": "You should receive an email within the next few minutes.",
129123
"success_alert_heading": "Success",
130-
"error_alert_text": "Failed to start recovery with status {{- status}}: {{text}}",
124+
"error_alert_text": "Failed to start recovery with status {{status}}: {{text}}",
131125
"verify_before_login": "Please verify your email address before logging in",
132126
"verify_before_login_heading": "Email not verified"
133127
},
@@ -140,14 +134,14 @@ export const en = {
140134
"close_remote_access": "Close Remote-Access"
141135
},
142136
"tokens": {
143-
"fetch_user_failed": "Failed to fetch account",
144-
"fetch_tokens_failed": "Failed to fetch tokens",
145-
"unexpected_error": "An unexpected error occurred",
146-
"create_token_failed": "Failed to create token",
147-
"delete_token_failed": "Failed to delete token",
137+
"fetch_user_failed": "Account could not be retrieved. Please reload the page.",
138+
"fetch_tokens_failed": "Tokens could not be retrieved. Please reload the page.",
139+
"unexpected_error": "An unexpected error occurred. Please reload the page.",
140+
"create_token_failed": "Token could not be created. Please reload the page.",
141+
"delete_token_failed": "Token could not be deleted. Please reload the page.",
148142
"copy_success": "Success",
149143
"copy_success_text": "Token copied to clipboard",
150-
"copy_failed": "Failed to copy token",
144+
"copy_failed": "Token could not be copied",
151145
"create_token": "Create authorization token",
152146
"use_once": "Use once",
153147
"name": "Name",
@@ -167,7 +161,7 @@ export const en = {
167161
"layout_changed": "The format of the token has changed. Please ensure that your device runs the latest firmware."
168162
},
169163
"wg_client": {
170-
"not_initialized": "The WireGuard client is not initialized. Please try again later.",
164+
"not_initialized": "The WireGuard client is not initialized. Please reload the page."
171165
},
172166
"version_checker": {
173167
"new_version_available": "A new version of the application is available. Reload now to get the latest features and bug fixes?",

0 commit comments

Comments
 (0)