From 77c1f516266b2db5e1c97c5cbc8a3fb9e08d40cd Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 17 Sep 2025 19:22:36 -0400 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 9d4f1b8f534a3cdfb22812f2a25ababd7a236a87 Author: Jacob Date: Sat Sep 13 15:17:22 2025 +0200 Translated using Weblate (Swedish) Currently translated at 99.8% (957 of 958 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/ commit 8fac40cfde425c989521c891b3ba9c75ab32e57e Author: Christian S Date: Sat Sep 13 12:54:52 2025 +0200 Translated using Weblate (German) Currently translated at 100.0% (958 of 958 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 8e8c42396ec77b763983155e8b1e89cabf38ce17 Author: Patricio Carrau Date: Tue Sep 9 21:59:48 2025 +0200 Translated using Weblate (Spanish) Currently translated at 100.0% (958 of 958 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit be818ab408d00c5c26dfb3b25632604a415d3570 Author: pplulee Date: Mon Sep 8 04:06:54 2025 +0100 fix(i18n): update Chinese translations for location-related terms (#829) Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> commit 9e40dcf6a1dc194d4694a114b3c7e88135121016 Merge: af2f2809 733eefce Author: Sean Morley Date: Sun Sep 7 23:03:57 2025 -0400 Merge remote-tracking branch 'weblate/development' into development commit af2f28090b9242fb7ab263fa5bbb95a5bcc1b27f Author: Sean Morley Date: Sun Sep 7 23:00:33 2025 -0400 [BUG] Location Visit End Date not affected by Location Timezone Fixes #843 commit 733eefceddbdad01726364e5d4523605f095fde2 Author: Alex Date: Sun Sep 7 23:28:20 2025 +0200 Translated using Weblate (German) Currently translated at 100.0% (958 of 958 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 6c750d1c8f95b42418893e15ad46c3d4ed86d053 Author: fantastron27 Date: Sun Sep 7 09:17:16 2025 +0200 Translated using Weblate (Slovak) Currently translated at 100.0% (958 of 958 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/ commit f733b3b96bbddc71d426f2e60320a5ad2f6755af Merge: 769ea6ad af4e541c Author: Sean Morley Date: Sat Sep 6 21:36:35 2025 -0400 Merge branch 'development' of github.com:seanmorley15/AdventureLog into development commit 769ea6ad710890e931aabace2c00dc37436f869f Author: Sean Morley Date: Sat Sep 6 21:36:33 2025 -0400 Implement code changes to enhance functionality and improve performance commit af4e541c1c9e7309857102287199279aec339387 Author: fantastron27 Date: Sun Sep 7 03:36:23 2025 +0200 Added Slovak translations (#815) * Created sk.json * Update Navbar.svelte * Update +layout.svelte --------- Co-authored-by: Sean Morley <98704938+seanmorley15@users.noreply.github.com> commit 904474d757577229b47441d1378a6fd6788fbe40 Merge: d4709434 f87a5fe3 Author: Sean Morley Date: Sat Sep 6 21:31:58 2025 -0400 Merge remote-tracking branch 'weblate/development' into development commit d47094346c0b63ea753294a0786414e5e070ae7f Merge: 4a5f59bf 6366a3eb Author: Sean Morley Date: Sat Sep 6 21:29:39 2025 -0400 Merge remote-tracking branch 'weblate/development' into development commit f87a5fe3bcc2fe28cfc206fb5cba517bbffa8df6 Author: Sergio Date: Sun Sep 7 01:12:50 2025 +0200 Translated using Weblate (Spanish) Currently translated at 100.0% (956 of 956 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 4a5f59bfd24e32fdf3558b009a8f636636cb3663 Author: Sean Morley Date: Sat Sep 6 21:06:17 2025 -0400 Fixes #654 commit c1302bb54ab272c2a98c53ce0d508b7d39e9674b Author: Sean Morley Date: Sat Sep 6 20:52:05 2025 -0400 [BUG] Single day Collections will think location visits are out of date range Fixes #827 commit 773f2d65bbfb2a9591b31fabfd6844612b840f1a Author: Sean Morley Date: Sat Sep 6 19:52:28 2025 -0400 [BUG] Server Error (500) when trying to access the API docs Fixes #712 commit 4228db249ed5e3261931a1cdb3895d0ddd3ac4ac Author: Sean Morley Date: Sat Sep 6 19:44:00 2025 -0400 [BUG]Ordered Itinerary includes visits that are outside itinerary date range Fixes #746 commit 26f36cabb0a860f10d7ba62b5279ddd1e282c78e Author: Sean Morley Date: Sat Sep 6 18:36:50 2025 +0200 Translated using Weblate (Spanish) Currently translated at 100.0% (956 of 956 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 3bfd2dd5615afdbd04e3451c2ef728f1d7caf466 Author: Sean Morley Date: Sat Sep 6 12:33:23 2025 -0400 Remove empty English (United States) locale file commit 6366a3eba6ab72090e52be474212a663799dfe19 Author: Nikolai Eidsheim Date: Sat Sep 6 18:10:15 2025 +0200 Translated using Weblate (Norwegian Bokmål) Currently translated at 100.0% (956 of 956 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/ commit 671cd3701fc5a601f2f1bad9aef93106f91eec0b Author: Sean Morley Date: Sat Sep 6 16:58:04 2025 +0200 Added translation using Weblate (English (United States)) commit bdbbe5f4978f041f620f0503da69fa870cb1997c Author: Sean Morley Date: Sat Sep 6 16:54:43 2025 +0200 Translated using Weblate (Spanish) Currently translated at 100.0% (956 of 956 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ --- backend/server/.env.example | 2 ++ frontend/src/locales/de.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/server/.env.example b/backend/server/.env.example index 3246f9b9..60fa9dc0 100644 --- a/backend/server/.env.example +++ b/backend/server/.env.example @@ -37,6 +37,8 @@ EMAIL_BACKEND='console' # PGUSER='admin' # PGPASSWORD='admin' +# ------ For Sean's use: ----- # +# Re-sync the development branch with main after doing squash merges # ------ For Sean's use: ----- # # Re-sync the development branch with main after doing squash merges # git fetch origin && git checkout development && git reset --hard origin/main && git push origin development --force diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 77108896..77ed84c4 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -696,7 +696,7 @@ "verify_setup": "Verifizierung des Setup", "whats_included": "Was ist enthalten", "backup_your_data": "Sichern Sie Ihre Daten", - "backup_your_data_desc": "Laden Sie eine vollständige Sicherung Ihrer Kontodaten, einschließlich Standorte, Sammlungen, Medien und Besuchen, herunter.", + "backup_your_data_desc": "Laden Sie eine vollständige Sicherung Ihrer Kontodaten, einschließlich Standorte, Sammlungen, Medien und Besuche, herunter.", "data_override_acknowledge": "Ich bestätige, dass dies alle meine vorhandenen Daten überschreibt", "data_override_acknowledge_desc": "Diese Aktion ist irreversibel und ersetzt alle Standorte, Sammlungen und Besuche in Ihrem Konto.", "data_override_warning": "Daten-Überschreibungs-Warnung",