From f8e3b4ba4b61df1dd0c4b8a5183086925f3b8a7e Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:15:10 +0200 Subject: [PATCH 01/84] New translations email+intl-icu.en.json (German (Pfadi-spezifische Ausnahmen)) --- api/translations/email+intl-icu.de-CH-scout.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 api/translations/email+intl-icu.de-CH-scout.json diff --git a/api/translations/email+intl-icu.de-CH-scout.json b/api/translations/email+intl-icu.de-CH-scout.json new file mode 100644 index 0000000000..339439fa59 --- /dev/null +++ b/api/translations/email+intl-icu.de-CH-scout.json @@ -0,0 +1,14 @@ +{ + "inviteToCamp": { + "subject": "[eCamp v3] Du wurdest eingeladen im Lager \"{campName} \" zusammenzuarbeiten" + }, + "userActivation": { + "subject": "Willkommen auf eCamp v3" + }, + "passwordReset": { + "subject": "Passwort zurücksetzen" + }, + "emailVerification": { + "subject": "E-Mail-Adresse verifizieren" + } +} \ No newline at end of file From 81209ffda98fccf886f74122fc5fd582a7bd1838 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:15:11 +0200 Subject: [PATCH 02/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 9dd2fb13138d35d6c810370723c49818d047684b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:19:06 +0200 Subject: [PATCH 03/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From aee120d6b88b7a1633119ccf16e8ce91e445a8ec Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:19:09 +0200 Subject: [PATCH 04/84] New translations email+intl-icu.en.json (German (Pfadi-spezifische Ausnahmen)) --- api/translations/email+intl-icu.de-CH-scout.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/email+intl-icu.de-CH-scout.json b/api/translations/email+intl-icu.de-CH-scout.json index 339439fa59..fefb124912 100644 --- a/api/translations/email+intl-icu.de-CH-scout.json +++ b/api/translations/email+intl-icu.de-CH-scout.json @@ -6,9 +6,9 @@ "subject": "Willkommen auf eCamp v3" }, "passwordReset": { - "subject": "Passwort zurücksetzen" + "subject": "[eCamp v3] Passwort zurücksetzen" }, "emailVerification": { - "subject": "E-Mail-Adresse verifizieren" + "subject": "[eCamp v3] E-Mail-Adresse verifizieren" } } \ No newline at end of file From b0a4fef02f9fc665bb4a17932c49e305e45dae66 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 10:19:10 +0200 Subject: [PATCH 05/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 7d2beeebb9ae7b84d122626bbd69baec8af9ed61 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Apr 2024 12:40:08 +0200 Subject: [PATCH 06/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 6bb7192bdb9c55676e993bb2f342a8776428e594 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:54:05 +0200 Subject: [PATCH 07/84] New translations en.json (English) --- frontend/src/locales/en.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 46aae16e18..500f53aa2c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -498,6 +498,12 @@ "datetime": { "vuetifyTimePickerFormat": "ampm" }, + "info": { + "offline": { + "description": "Data saving/loading not possible.", + "title": "Your are offline:" + } + }, "language": "English", "loading": "Loading …", "navigation": { @@ -508,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -722,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 81d147cff581b54169fe00385df7a1017e46050c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 25 Apr 2024 21:54:08 +0200 Subject: [PATCH 08/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From 810edaf3d7b2801f279197a1c04fccd386ef732e Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:11:02 +0200 Subject: [PATCH 09/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 500f53aa2c..78a71ee26f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -514,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -728,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 0be2eeb896ab3214fb817622d947858baf4351f1 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:11:03 +0200 Subject: [PATCH 10/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 76039e84174c8df1d392dadbb6861b37631aa90f Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 28 Apr 2024 06:26:18 +0200 Subject: [PATCH 11/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 78a71ee26f..500f53aa2c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -514,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -728,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 69c2d431f0d45f07178bb820a87b723816fb9a38 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 28 Apr 2024 06:26:23 +0200 Subject: [PATCH 12/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From cb0a0fbbe0f294f0ea0a101fc25af378d1411a4d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 28 Apr 2024 07:31:34 +0200 Subject: [PATCH 13/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 500f53aa2c..78a71ee26f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -514,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -728,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 2e9546206c23c0f6651ba72ed1ad490e8d84ed2f Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 28 Apr 2024 07:31:35 +0200 Subject: [PATCH 14/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 2a1e3c940e86d895b42ed64b1b4b4ffad61f094c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 20:16:31 +0200 Subject: [PATCH 15/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 78a71ee26f..500f53aa2c 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -514,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -728,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From f5b8bb06d9c7e155b92004df19250c269f1b1ca7 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 20:16:32 +0200 Subject: [PATCH 16/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 2fffbf8059..2e78da683f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 4955a7559709e1b2a9b14d1705f1536840a1d54b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 20:16:33 +0200 Subject: [PATCH 17/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From e3a356dc659f1bfe105ed482c092feb3a9653402 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 21:20:56 +0200 Subject: [PATCH 18/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 500f53aa2c..78a71ee26f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -514,7 +514,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -728,7 +728,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 05b64f9c01e6613b349dbad08c3b7034650a6ec3 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 21:20:56 +0200 Subject: [PATCH 19/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 2e78da683f..2fffbf8059 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From 5b27c47a7a2b21978cc39f286f64d3da29151f80 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 25 May 2024 21:20:57 +0200 Subject: [PATCH 20/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 5537a49861baea93b57f7235b5cdf988ea9a6095 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:00:34 +0200 Subject: [PATCH 21/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 78a71ee26f..8ed99e5474 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -228,7 +228,11 @@ }, "form": { "base": { + "eColorField": { + "parseError": "Please enter a valid color." + }, "eColorPicker": { + "closePicker": "Close dialog", "openPicker": "Open dialog to select a color for {label}" }, "eDatePicker": { From 2398629d55965baf5f1f9306685a2026e1c65545 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:00:39 +0200 Subject: [PATCH 22/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 8ed99e5474..29491185d0 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -518,7 +518,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -732,7 +732,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 7d6c3b90f15d0c48ca44032987894d067d827b24 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:00:40 +0200 Subject: [PATCH 23/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 2fffbf8059..2e78da683f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 0a3ebf38dcc7a927bbd0a39ca5c92ec1aa31289c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:00:42 +0200 Subject: [PATCH 24/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From e5a59dc72fe17e9965ac5a47ddf3d681b80c43b3 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:18:34 +0200 Subject: [PATCH 25/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 29491185d0..8ed99e5474 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -518,7 +518,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -732,7 +732,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 44d825c9291efa0afd987722d615983eaddce896 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:18:34 +0200 Subject: [PATCH 26/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 2e78da683f..2fffbf8059 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From 8e3061a6743e69734bbb6dc2f5782476fce1f5f5 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:18:35 +0200 Subject: [PATCH 27/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From cc5495542e30ab989aa6570dcafd9c78821bac1d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:05:09 +0200 Subject: [PATCH 28/84] Update source file en.json --- frontend/src/locales/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 8ed99e5474..94978a67cf 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -527,7 +527,8 @@ "validation": { "greaterThanOrEqual_date": "{_field_} may not be earlier than {min}", "greaterThan_time": "{_field_} must be later than {min}", - "lessThanOrEqual_date": "{_field_} may not be later than {max}" + "lessThanOrEqual_date": "{_field_} may not be later than {max}", + "oneEmojiOrTwoCharacters": "{_field_} may only have 1 emoji or 2 letters/numbers" }, "warning": { "delete": "Do you really want to delete this? | Do you really want to delete \"{entity}\"?" From 1ba8729a9dd80b52c49844c9baa150527a0ff37d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:05:10 +0200 Subject: [PATCH 29/84] Update source file en.json --- common/locales/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/locales/en.json b/common/locales/en.json index 2fffbf8059..d78a0fa02a 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -147,6 +147,8 @@ }, "campCollaboration": { "fields": { + "abbreviation": "Abbreviation", + "color": "Color", "inviteEmail": "Email", "role": "Role", "status": "Status" From a5790fd8f1684edfd75d2b24b62680755125a241 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:05:17 +0200 Subject: [PATCH 30/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 94978a67cf..1e1524a5b1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -518,7 +518,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -733,7 +733,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 58debde336436f62d47d954517a2ca3a195d14a2 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:05:18 +0200 Subject: [PATCH 31/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index d78a0fa02a..ab62e29f4f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 9d513c6b17475a37e5b5143948a6d1d5b2f2b9bb Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:05:20 +0200 Subject: [PATCH 32/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From ec6d7fc38e197afadf5d65a047275e4408cc129c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:34:09 +0200 Subject: [PATCH 33/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 1e1524a5b1..94978a67cf 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -518,7 +518,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -733,7 +733,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 2376d3e4498da1ed60a894a46019bb1858154529 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:34:09 +0200 Subject: [PATCH 34/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index ab62e29f4f..d78a0fa02a 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From ef151fb942022dc79bc760a817dcb64b4f78063e Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:34:10 +0200 Subject: [PATCH 35/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From ce6db9fcd10bc860553d7522781efa39a991ae12 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:36:15 +0200 Subject: [PATCH 36/84] New translations en.json (English) --- frontend/src/locales/en.json | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 94978a67cf..4bab882608 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -209,6 +209,7 @@ "title": "Edit {user}" }, "collaboratorForm": { + "overrideAvatar": "Overwrite avatar for this camp", "roleHint": "Each camp needs at least one person with administrative rights." }, "promptCollaboratorDeactivate": { @@ -447,20 +448,6 @@ } } }, - "entity": { - "user": { - "fields": { - "birthday": "Birthday", - "email": "Email address", - "firstname": "Firstname", - "language": "Language", - "nickname": "Nickname", - "password": "Password", - "surname": "Lastname" - }, - "name": "User" - } - }, "global": { "button": { "add": "Add", @@ -518,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -733,7 +720,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 6610138c3d585ff81d555166a86611a94bbdb0bb Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:36:15 +0200 Subject: [PATCH 37/84] New translations en.json (English) --- common/locales/en.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index d78a0fa02a..1359d14ed8 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", @@ -209,6 +209,19 @@ }, "name": "Period | Periods" }, + "profile": { + "fields": { + "abbreviation": "Abbreviation", + "color": "Color", + "email": "Email address", + "firstname": "Firstname", + "language": "Language", + "nickname": "Nickname", + "password": "Password", + "surname": "Lastname" + }, + "name": "Profile" + }, "scheduleEntry": { "fields": { "duration": "Duration", From afb31b472f535c8038024369dccc67bedb0b5bc6 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 00:36:17 +0200 Subject: [PATCH 38/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From ca6d7f3008b45ec02cc64860602fe46efb9dc36d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 01:50:23 +0200 Subject: [PATCH 39/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4bab882608..d9e728d916 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -720,7 +720,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From a4230772f095efd95dea92d5f5c5aac333e5b0c1 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 01:50:24 +0200 Subject: [PATCH 40/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1359d14ed8..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From fc81f5b7f16589c6e4d24767ddf5e3702dd60303 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 8 Jul 2024 01:50:24 +0200 Subject: [PATCH 41/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 4633e6a3f659156d1c6dbb81323e4b73b36bd893 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:29:26 +0200 Subject: [PATCH 42/84] Update source file en.json --- frontend/src/locales/en.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index d9e728d916..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -574,6 +574,7 @@ "loginCallback": { "loginInProgress": "You will be logged in" }, + "notActivated": "Not activated?", "or": "or with", "password": "Password", "passwordForgotten": "Forgotten your password?", @@ -585,6 +586,8 @@ "midata": "MiData" }, "registernow": "Register now", + "resendActivation": "Send activation email again", + "resetPassword": "Reset password", "termsOfServiceLink": "terms of service" }, "register": { @@ -600,6 +603,12 @@ "success": "Successfully registered", "title": "Create account" }, + "resendActivation": { + "errorMessage": "Sending the activation email again failed.", + "send": "Send", + "successMessage": "Mail with link to activate your account will be delivered.", + "title": "Send activation email again" + }, "resetPassword": { "errorMessage": "Reset password failed.", "invalidRequest": "Invalid link", @@ -727,4 +736,4 @@ "profile": "Profile" } } -} \ No newline at end of file +} From 3614c05655da37e3447f2a428b27afda31911ba6 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:29:31 +0200 Subject: [PATCH 43/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..4bb625ce9f 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 695d52c47fa41c0de748ef7f5df6e8231301de31 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:29:32 +0200 Subject: [PATCH 44/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..1359d14ed8 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 7198d2ee5559ce1a87890814479bdfa5a511ef65 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 9 Jul 2024 23:29:34 +0200 Subject: [PATCH 45/84] New translations validators.en.yml (English) --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..ea62fe95e0 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" +"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" From f2f6b1a01637bf305710cbdf9dcfa770aa92b3c8 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 10 Jul 2024 00:49:12 +0200 Subject: [PATCH 46/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4bb625ce9f..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused an server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From eac17635dd5d179defb3b211430effecb7928748 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 10 Jul 2024 00:49:13 +0200 Subject: [PATCH 47/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1359d14ed8..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From 2a144b1fa6b087b49f0c5ec79726fa7fe1253fa7 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 10 Jul 2024 00:49:14 +0200 Subject: [PATCH 48/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index ea62fe95e0..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Cannot delete the last entry." Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -"Either this value or {{ other }} should not be null.": "Either this value or {{ other }} should not be null." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -"value must be one of {{ to }}, was {{ value }}": "value must be one of {{ to }}, was {{ value }}" +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 38f2e22faa783d5697bb5e2cda400be254ab4810 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 00:43:47 +0200 Subject: [PATCH 49/84] New translations validators.en.yml (German (Pfadi-spezifische Ausnahmen)) --- api/translations/validators.de_CH_scout.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/translations/validators.de_CH_scout.yml b/api/translations/validators.de_CH_scout.yml index b331eeb6ee..8b7de2b2df 100644 --- a/api/translations/validators.de_CH_scout.yml +++ b/api/translations/validators.de_CH_scout.yml @@ -1 +1,7 @@ +Cannot delete the last entry.: "Kann den letzten Eintrag nicht löschen." +Cannot delete the last schedule entry.: "Der letzte Eintrag des Zeitplans kann nicht gelöscht werden." +"Either this value or {{ other }} should not be null.": "Entweder dieser Wert oder {{ other }} sollte nicht null sein." +This inviteEmail is already present in the camp.: "Dieses Einladungs-E-Mail ist bereits im Lager." This is a test message for i18n variants: "de_CH_scout" +This user is already present in the camp.: "Dieser Teilnehmer oder einer mit dieser E-Mail-Adresse nimmt bereits am Lager teil." +"value must be one of {{ to }}, was {{ value }}": "der Wert muss einer von {{ to }} sein, war {{ value }}" From 34619cc10ad18b3ba347e598e794699623d89d71 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:01 +0200 Subject: [PATCH 50/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 07cc7d38e4..3597611792 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1,7 +1 @@ -Cannot delete the last entry.: "Cannot delete the last entry." -Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." -Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." -This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" -This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." -value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 3018750a9c64c37ada47b7f36038ee717480bc98 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:05 +0200 Subject: [PATCH 51/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..faaade74c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused a server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 079da0e0dbd4f353b32243d4f7ec66d50946efd2 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:07 +0200 Subject: [PATCH 52/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..1359d14ed8 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From a77a7ffcf6df104426e9b43a6905b23c13af5dba Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:12 +0200 Subject: [PATCH 53/84] New translations validators.en.yml (German (Pfadi-spezifische Ausnahmen)) --- api/translations/validators.de_CH_scout.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api/translations/validators.de_CH_scout.yml b/api/translations/validators.de_CH_scout.yml index 8b7de2b2df..b331eeb6ee 100644 --- a/api/translations/validators.de_CH_scout.yml +++ b/api/translations/validators.de_CH_scout.yml @@ -1,7 +1 @@ -Cannot delete the last entry.: "Kann den letzten Eintrag nicht löschen." -Cannot delete the last schedule entry.: "Der letzte Eintrag des Zeitplans kann nicht gelöscht werden." -"Either this value or {{ other }} should not be null.": "Entweder dieser Wert oder {{ other }} sollte nicht null sein." -This inviteEmail is already present in the camp.: "Dieses Einladungs-E-Mail ist bereits im Lager." This is a test message for i18n variants: "de_CH_scout" -This user is already present in the camp.: "Dieser Teilnehmer oder einer mit dieser E-Mail-Adresse nimmt bereits am Lager teil." -"value must be one of {{ to }}, was {{ value }}": "der Wert muss einer von {{ to }} sein, war {{ value }}" From cc464d1884caab15aab8d4127500b70c287ed92d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:44 +0200 Subject: [PATCH 54/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index faaade74c3..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused a server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From ff0c22607c6635f2491058b9ec407c95a1ad7229 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:45 +0200 Subject: [PATCH 55/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1359d14ed8..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From b355a0ecf20e297c01487cb03601590ae3cebad5 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:49 +0200 Subject: [PATCH 56/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..faaade74c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused a server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 8c3cb783574aed7b6a631a1ea246332b85bb5eb4 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:58:50 +0200 Subject: [PATCH 57/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..1359d14ed8 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From f24eb5275f0a9c14f9f05bb40ed3bfba9cfae63b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:13:31 +0200 Subject: [PATCH 58/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index faaade74c3..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused a server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 644992d9104cb9182d05fc24cdd7f106bb5c9ccb Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:13:32 +0200 Subject: [PATCH 59/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1359d14ed8..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From c5a84080076fc02d61cbcc00dfc5f25080992291 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:13:33 +0200 Subject: [PATCH 60/84] Update source file validators.en.yml --- api/translations/validators.en.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/translations/validators.en.yml b/api/translations/validators.en.yml index 3597611792..07cc7d38e4 100644 --- a/api/translations/validators.en.yml +++ b/api/translations/validators.en.yml @@ -1 +1,7 @@ +Cannot delete the last entry.: "Cannot delete the last entry." +Cannot delete the last schedule entry.: "Cannot delete the last schedule entry." +Either this value or {{ other }} should not be null.: "Either this value or {{ other }} should not be null." +This inviteEmail is already present in the camp.: "This inviteEmail is already present in the camp." This is a test message for i18n variants: "en" +This user is already present in the camp.: "This user or a user with this email address is already participating in the camp." +value must be one of {{ to }}, was {{ value }}: "value must be one of {{ to }}, was {{ value }}" From 3809256fda01248bf510e9f0028a4dad683f5d3d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 20:41:36 +0200 Subject: [PATCH 61/84] New translations en.json (English) --- common/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..a9ed0bfb21 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", @@ -220,7 +220,7 @@ "password": "Password", "surname": "Lastname" }, - "name": "Profile" + "name": "Profiles" }, "scheduleEntry": { "fields": { From 4e405d9189513cb7b0a97db9f68a0dd5886ee55c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:11:35 +0200 Subject: [PATCH 62/84] Update source file en.json --- common/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/locales/en.json b/common/locales/en.json index a9ed0bfb21..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", @@ -220,7 +220,7 @@ "password": "Password", "surname": "Lastname" }, - "name": "Profiles" + "name": "Profile" }, "scheduleEntry": { "fields": { From 7bf8826db24b8a2881a82de0a111292eae870f17 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:11:38 +0200 Subject: [PATCH 63/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..faaade74c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused a server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From b757e7b5ef7fdafeebcc0c9d7b759651846fc8bf Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:11:40 +0200 Subject: [PATCH 64/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..1359d14ed8 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From f901f14ce7f7e3ad4ced1c631642b15f0b8b4519 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 23:31:04 +0200 Subject: [PATCH 65/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index faaade74c3..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused a server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 2434d55569f62b20c0adc8786f1edeb2258cb2cc Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Sun, 21 Jul 2024 23:31:04 +0200 Subject: [PATCH 66/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1359d14ed8..1093dd758c 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From e98f11d6924284c1e015ce71fb5b0384b86fc4e5 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 22 Jul 2024 01:31:52 +0200 Subject: [PATCH 67/84] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml index f9c140bc66..f34c3de0e8 100644 --- a/api/translations/validators.de_CH.yml +++ b/api/translations/validators.de_CH.yml @@ -1 +1,7 @@ -This is a test message for i18n variants: "de_CH" +Cannot delete the last entry.: "Kann den letzten Eintrag nicht löschen." +Cannot delete the last schedule entry.: "Kann den letzten Zeitplaneintrag nicht löschen.\n" +"Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." +This inviteEmail is already present in the camp.: "Diese Email ist bereits im Lager vorhanden." +This is a test message for i18n variants: "de_ch" +This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser E-Mail-Adresse nimmt bereits teil an diesem Lager." +"value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war aber {{ value }}" From dde58791fb4e835c40c360fcb8457dc338b69d53 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 22 Jul 2024 02:45:11 +0200 Subject: [PATCH 68/84] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 49 ++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1967eb4772..7932f89d49 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -124,7 +124,7 @@ "copyCategoryOrActivity": "Kategorie oder Aktivität kopieren", "copyContent": "Inhalt kopieren", "copyPasteCategory": "Kategorie kopieren & einfügen", - "copySourceInfo": "Hier kannst du die URL einer Block-Kategorie oder einer Aktivität einfügen, um dessen Inhalte zu kopieren.", + "copySourceInfo": "Hier kannst du die URL einer Block-Kategorie oder einer Aktivität einfügen um dessen Inhalte zu kopieren.", "pasteCategory": "Kopierte Kategorie oder Aktivität einfügen", "title": "Block-Kategorie erstellen" }, @@ -185,11 +185,11 @@ "layout": "Layout", "noTemplate": "Keine Vorlage" }, - "copyCategoryInfoDialog": { - "allow": "Jetzt erlauben", - "denied": "Du hast das Lesen von der Zwischenablage untersagt. Du kannst daher kopierte Kategorien nicht einfügen.", + "copyActivityInfoDialog": { + "allow": "Jetzt zulassen", + "denied": "Sie haben den Zugriff auf Ihre Zwischenablage verweigert. Kopierte Kategorien können daher nicht eingefügt werden.", "description": "Damit du eine kopierte Kategorie einfügen kannst, musst du eCamp erlauben deine Zwischenablage zu lesen.", - "granted": "Du kannst nun kopierte Kategorien einfügen.", + "granted": "Sie können nun kopierte Kategorien einfügen.", "title": "Kategorie kopieren & einfügen" } }, @@ -209,6 +209,7 @@ "title": "{user} bearbeiten" }, "collaboratorForm": { + "overrideAvatar": "Avatar für dieses Lager überschreiben", "roleHint": "Jedes Lager benötigt mindestens eine Person mit Administrationsrechten." }, "promptCollaboratorDeactivate": { @@ -228,7 +229,11 @@ }, "form": { "base": { + "eColorField": { + "parseError": "Bitte gültige Farbe eingeben." + }, "eColorPicker": { + "closePicker": "Dialog schliessen", "openPicker": "Dialog öffnen, um eine Farbe für {label} zu wählen" }, "eDatePicker": { @@ -443,20 +448,6 @@ } } }, - "entity": { - "user": { - "fields": { - "birthday": "Geburtstag", - "email": "E-Mail-Adresse", - "firstname": "Vorname", - "language": "Sprache", - "nickname": "Spitzname", - "password": "Passwort", - "surname": "Nachname" - }, - "name": "User" - } - }, "global": { "button": { "add": "Hinzufügen", @@ -498,6 +489,12 @@ "datetime": { "vuetifyTimePickerFormat": "24hr" }, + "info": { + "offline": { + "description": "Daten speichern/laden nicht möglich.", + "title": "Du bist offline:" + } + }, "language": "Deutsch", "loading": "Laden …", "navigation": { @@ -517,7 +514,8 @@ "validation": { "greaterThanOrEqual_date": "{_field_} darf nicht vor {min} liegen", "greaterThan_time": "{_field_} muss später als {min} sein", - "lessThanOrEqual_date": "{_field_} darf nicht nach {max} liegen" + "lessThanOrEqual_date": "{_field_} darf nicht nach {max} liegen", + "oneEmojiOrTwoCharacters": "{_field_} darf nur 1 Emoji oder 2 Buchstaben/Zahlen haben" }, "warning": { "delete": "Möchtest du das wirklich löschen? | Möchtest du \"{entity}\" wirklich löschen?" @@ -576,6 +574,7 @@ "loginCallback": { "loginInProgress": "Du wirst eingeloggt" }, + "notActivated": "Nicht aktiviert?", "or": "oder mit", "password": "Passwort", "passwordForgotten": "Passwort vergessen?", @@ -587,6 +586,8 @@ "midata": "MiData" }, "registernow": "Jetzt registrieren", + "resendActivation": "Aktivierungsmail erneut senden", + "resetPassword": "Passwort zurücksetzen", "termsOfServiceLink": "Nutzungsbedingungen" }, "register": { @@ -602,6 +603,12 @@ "success": "Erfolgreich registriert", "title": "Konto erstellen" }, + "resendActivation": { + "errorMessage": "Erneutes Senden der Aktivierung fehlgeschlagen.", + "send": "Abschicken", + "successMessage": "Mail mit Link für 'Aktivierung' wird versendet.", + "title": "Aktivierungsmail erneut senden" + }, "resetPassword": { "errorMessage": "Passwort konnte nicht geändert werden.", "invalidRequest": "Ungültiger Link", @@ -729,4 +736,4 @@ "profile": "Profil" } } -} \ No newline at end of file +} From 5e90dce4abbeb27eebf7bc49ff1df58cb66e923c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Mon, 22 Jul 2024 02:45:13 +0200 Subject: [PATCH 69/84] New translations en.json (German, Switzerland) --- common/locales/de.json | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/common/locales/de.json b/common/locales/de.json index 1a6d850a58..5cadf0cc63 100644 --- a/common/locales/de.json +++ b/common/locales/de.json @@ -13,13 +13,14 @@ "name": "Spalte|Spalte {name}" } }, + "icon": "mdi-ansicht-spalte", "name": "Spaltenlayout" }, "laThematicArea": { "entity": { "option": { "campsiteAndSurroundings": { - "description": "Einrichten von Lagerplatz/Umgebung, Abbau, Erstellen von Spielplatz- einrichtungen und Sportgeräten.", + "description": "Einrichten von Lagerplatz/Umgebung, Abbau, Erstellen von Spielplatzeinrichtungen und Sportgeräten.", "name": "Lagerplatz/Umgebung" }, "natureAndEnvironment": { @@ -31,7 +32,7 @@ "name": "Outdoortechniken" }, "pioneeringTechnique": { - "description": "Biwakbau, Iglubau, Material- und Ausrüstungskunde, Materialpflege, Erstellen und Abbau von Pionierbauten, Seil- und Knotenkunde, Seil- bahnen, Seilbrücken, Abseilen.", + "description": "Biwakbau, Iglubau, Material- und Ausrüstungskunde, Materialpflege, Erstellen und Abbau von Pionierbauten, Seil- und Knotenkunde, Seilbahnen, Seilbrücken, Abseilen.", "name": "Pioniertechnik" }, "preventionAndIntegration": { @@ -44,6 +45,7 @@ } } }, + "icon": "mdi-form", "info": "Eine J+S Lageraktivität muss mindestens eines der aufgeführten Themen behandeln.{br}Erfasse, welche Themen in diesem Block behandelt werden.", "name": "LA Themenbereich" }, @@ -58,10 +60,12 @@ "name": "Blockinhalte" }, "material": { + "icon": "mdi-paket-variante", "info": "Hier kannst du den Material-Bedarf für diesen Block erfassen.{br}Die Materiallisten kannst du im Menu 'Admin' verwalten.{br}Eine Zusammenstellung für den Einkauf findest du im Menu 'Material'.", "name": "Material" }, "notes": { + "icon": "mdi-stift", "info": "Hier kannst du beliebige Notizen erfassen.{br}z.B. Ideen, Todo's, offene Fragen, Kontakte, ÖV-Verbindungen, usw.", "name": "Notizen" }, @@ -73,6 +77,7 @@ "printBelowMainContent": "Unter dem Hauptinhalt drucken" }, "safetyConcept": { + "icon": "mdi-sicherheit", "info": "Einige Blöcke erfordern, dass ihr euch Gedanken zu den Risiken macht. Hier könnt ihr diese Gedanken erfassen.{br}Haltet fest, welche Risiken ihr erkannt habt - und wie ihr diesen begegnen könnt.", "name": "Sicherheitskonzept" }, @@ -87,10 +92,12 @@ "name": "Programmpunkt | Programmpunkte" } }, + "icon": "mdi-skript-text-umriss", "info": "Hier kannst du den Inhalt von diesem Block planen.{br}In der linken Spalte [Zeit] kannst du die Dauer der einzelnen Elemente erfassen.{br}In der rechten Spalte [Verantwortlich] kannst du Personen zuteilen.", "name": "Programmabschnitt" }, "storycontext": { + "icon": "mdi-buch-offene-variante", "info": "Beschreibe, wie sich dieser Block in die Geschichte vom Lager einbettet.{br}Eine Zusammenstellung aller Geschichts-Elemente findest du im Menu 'Geschichte'.{br}Ihr könnt auch erst im Menu 'Geschichte' zuerst eine durchgängige Geschichte erarbeiten - so dass man den Block-Inhalt perfekt in die Geschichte einbetten kann.", "name": "Geschichte" } @@ -98,7 +105,7 @@ "entity": { "activity": { "fields": { - "category": "Block-Kategorie", + "category": "Block Kategorie", "location": "Ort", "progressLabel": "Status", "responsible": "Verantwortlich", @@ -127,7 +134,7 @@ "coachName": "Name des J+S-Coachs", "courseKind": "Kursbezeichnung (bei J+S Kurs: J+S Bezeichnung)", "courseNumber": "Kursnummer", - "kind": "Lagerart (Haus-, Zelt-, Unterwegslager, Sommer-, Herbstlager)", + "kind": "Lagerart (Haus-, Zelt-, Unterwegs-, Sommer-, Herbstlager)", "motto": "Motto", "name": "Lagername", "organizer": "Organisator", @@ -140,6 +147,8 @@ }, "campCollaboration": { "fields": { + "abbreviation": "Abkürzung", + "color": "Farbe", "inviteEmail": "E-Mail", "role": "Rolle", "status": "Status" @@ -157,7 +166,7 @@ "numberingStyle": "Nummerierung", "short": "Kürzel" }, - "name": "Block-Kategorien", + "name": "Block Kategorien", "numberingStyles": { "1": "1, 2, 3 - Zahlen", "A": "A, B, C - grosse Buchstaben", @@ -168,7 +177,7 @@ } }, "contentType": { - "name": "Inhalttyp | Inhalttypen" + "name": "Inhaltstyp | Inhaltstypen" }, "day": { "fields": { @@ -200,15 +209,28 @@ }, "name": "Lagerabschnitt | Lagerabschnitte" }, + "profile": { + "fields": { + "abbreviation": "Abkürzung", + "color": "Farbe", + "email": "E-Mail-Adresse", + "firstname": "Vorname", + "language": "Sprache", + "nickname": "Spitzname", + "password": "Passwort", + "surname": "Nachname" + }, + "name": "Profil" + }, "scheduleEntry": { "fields": { "duration": "Dauer", "endDate": "Enddatum", "endDatetime": "Endzeit", "nr": "Nr.", - "time": "Zeitpunkt", "startDate": "Startdatum", - "startDatetime": "Startzeit" + "startDatetime": "Startzeit", + "time": "Zeitpunkt" }, "name": "Zeitplaneintrag" } @@ -226,7 +248,7 @@ "hourLong": "LT", "hourShort": "H:mm" }, - "shortScheduleEntryDescription": "Tag\u202f{dayNumber} {startTime}" + "shortScheduleEntryDescription": "Tag {dayNumber} {startTime}" }, "print": { "cover": { From c3846fda0d1eeedcc9a28e8326bf8ff3ca1e0af8 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:47:42 +0200 Subject: [PATCH 70/84] Update source file en.json --- common/locales/en.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/locales/en.json b/common/locales/en.json index 1093dd758c..b14ef3acc5 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -132,13 +132,10 @@ "addressStreet": "Street", "addressZipcode": "Zipcode", "coachName": "Name of Y+S coach", - "courseKind": "Course kind (for Y+S courses: Y+S course term)", - "courseNumber": "Course number", "kind": "Camp kind (house, tent, traveling, summer, autumn)", "motto": "Motto", "name": "Name", "organizer": "Organizer", - "printYSLogoOnPicasso": "Print the Y+S logo on the picasso (required for Y+S courses)", "title": "Title", "trainingAdvisorName": "Name of training advisor" }, From 0e9fdb708121cfb2eaed99969483c1425615d33d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:47:42 +0200 Subject: [PATCH 71/84] Update source file email+intl-icu.en.json --- api/translations/email+intl-icu.en.json | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/api/translations/email+intl-icu.en.json b/api/translations/email+intl-icu.en.json index df5e61e81e..9e26dfeeb6 100644 --- a/api/translations/email+intl-icu.en.json +++ b/api/translations/email+intl-icu.en.json @@ -1,14 +1 @@ -{ - "inviteToCamp": { - "subject": "[eCamp v3] You were invited to collaborate in camp \"{campName}\"" - }, - "userActivation": { - "subject": "Welcome to eCamp v3" - }, - "passwordReset": { - "subject": "[eCamp v3] Password reset" - }, - "emailVerification": { - "subject": "[eCamp v3] Verify email address" - } -} \ No newline at end of file +{} \ No newline at end of file From bf593a4c7f496aebc88790097fd025bbd44d8e99 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:47:45 +0200 Subject: [PATCH 72/84] New translations en.json (German, Switzerland) --- frontend/src/locales/de.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 7932f89d49..3d5a938671 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -187,9 +187,9 @@ }, "copyActivityInfoDialog": { "allow": "Jetzt zulassen", - "denied": "Sie haben den Zugriff auf Ihre Zwischenablage verweigert. Kopierte Kategorien können daher nicht eingefügt werden.", + "denied": "Du hast den Zugriff auf die Zwischenablage verweigert. Kopierte Kategorien können daher nicht eingefügt werden.", "description": "Damit du eine kopierte Kategorie einfügen kannst, musst du eCamp erlauben deine Zwischenablage zu lesen.", - "granted": "Sie können nun kopierte Kategorien einfügen.", + "granted": "Du kannst nun kopierte Kategorien einfügen.", "title": "Kategorie kopieren & einfügen" } }, From 59c176839aca1851788c3743deba105aa6a150a4 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:47:47 +0200 Subject: [PATCH 73/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index b14ef3acc5..72c76a535f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 701a5faba60dbd6b5fae735bfd8b21738e3d4c6b Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 11:47:50 +0200 Subject: [PATCH 74/84] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml index f34c3de0e8..e193cff529 100644 --- a/api/translations/validators.de_CH.yml +++ b/api/translations/validators.de_CH.yml @@ -1,7 +1,7 @@ Cannot delete the last entry.: "Kann den letzten Eintrag nicht löschen." -Cannot delete the last schedule entry.: "Kann den letzten Zeitplaneintrag nicht löschen.\n" +Cannot delete the last schedule entry.: "Kann den letzten Blockzeitpunkt nicht löschen." "Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." -This inviteEmail is already present in the camp.: "Diese Email ist bereits im Lager vorhanden." +This inviteEmail is already present in the camp.: "Diese E-Mail-Adresse ist bereits im Lager vorhanden." This is a test message for i18n variants: "de_ch" -This user is already present in the camp.: "Dieser Benutzer oder ein Benutzer mit dieser E-Mail-Adresse nimmt bereits teil an diesem Lager." +This user is already present in the camp.: "Dieser Person oder eine Person mit dieser E-Mail-Adresse nimmt bereits an diesem Lager teil." "value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war aber {{ value }}" From 4ca35f3d816acf3ab3afc5ddc05dc51266e8726c Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:27:34 +0200 Subject: [PATCH 75/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 72c76a535f..b14ef3acc5 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From 68c871c2e4d5b84442114abb7d3545607473b1aa Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:22:48 +0200 Subject: [PATCH 76/84] New translations validators.en.yml (German, Switzerland) --- api/translations/validators.de_CH.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/translations/validators.de_CH.yml b/api/translations/validators.de_CH.yml index e193cff529..46e8d0c235 100644 --- a/api/translations/validators.de_CH.yml +++ b/api/translations/validators.de_CH.yml @@ -3,5 +3,5 @@ Cannot delete the last schedule entry.: "Kann den letzten Blockzeitpunkt nicht l "Either this value or {{ other }} should not be null.": "Dieser Wert oder {{ other }} sollte nicht null sein." This inviteEmail is already present in the camp.: "Diese E-Mail-Adresse ist bereits im Lager vorhanden." This is a test message for i18n variants: "de_ch" -This user is already present in the camp.: "Dieser Person oder eine Person mit dieser E-Mail-Adresse nimmt bereits an diesem Lager teil." +This user is already present in the camp.: "Diese Person oder eine Person mit dieser E-Mail-Adresse nimmt bereits an diesem Lager teil." "value must be one of {{ to }}, was {{ value }}": "Wert sollte einer von {{ to }} sein, war aber {{ value }}" From dc059a3cf2cb4336eb3816530bbdcc80421ab7ec Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 28 Aug 2024 22:52:39 +0200 Subject: [PATCH 77/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..faaade74c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused a server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 39eb3482463071e73a1ef82de62ca57d4929215f Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 28 Aug 2024 22:52:39 +0200 Subject: [PATCH 78/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index b14ef3acc5..72c76a535f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 60850006e640787dcca24553deb0cedcb9eae400 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:50:59 +0200 Subject: [PATCH 79/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index faaade74c3..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused a server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 4f9a307df720d8bdec5d25eac6973f52184e1ed2 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:50:59 +0200 Subject: [PATCH 80/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 72c76a535f..b14ef3acc5 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column", From 9cb66c71e244208d827055876c9f7bce7693d559 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:12:59 +0200 Subject: [PATCH 81/84] New translations en.json (English) --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 01ac2616c3..faaade74c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Uuuups... This action caused an server-side error.", + "409": "Ooops... This action caused a server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 30cf33a9dd18b482c2a50cbb72b0ff26c5ec9b90 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 12 Sep 2024 21:13:00 +0200 Subject: [PATCH 82/84] New translations en.json (English) --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index b14ef3acc5..72c76a535f 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column|Column {name}" + "name": "Column" } }, "icon": "mdi-view-column", From 5e05e59f6103f8cbfc78dd780a71f5af8d48d99d Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:23:22 +0200 Subject: [PATCH 83/84] Update source file en.json --- frontend/src/locales/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index faaade74c3..01ac2616c3 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -505,7 +505,7 @@ "news": "News" }, "serverError": { - "409": "Ooops... This action caused a server-side error.", + "409": "Uuuups... This action caused an server-side error.", "short": "Server error" }, "toast": { @@ -729,7 +729,7 @@ }, "pageNotFound": { "backToHome": "Back to home", - "detail": "Whoops. You've lost your way…{br}Unfortunately, this link does not work." + "detail": "Oops. You've lost your way…{br}Unfortunately, this link does not work." }, "profile": { "changeEmail": "Change", From 8b15825e1e64dae3bcf384962eb855592999da32 Mon Sep 17 00:00:00 2001 From: ecampcore <115356659+ecampcore@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:23:23 +0200 Subject: [PATCH 84/84] Update source file en.json --- common/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en.json b/common/locales/en.json index 72c76a535f..b14ef3acc5 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -10,7 +10,7 @@ "columnLayout": { "entity": { "column": { - "name": "Column" + "name": "Column|Column {name}" } }, "icon": "mdi-view-column",