From 033d070362ff1f24c015b5c462021ee851fdd9cb Mon Sep 17 00:00:00 2001
From: Till JS <tills95@gmail.com>
Date: Thu, 2 Apr 2026 18:09:10 +0200
Subject: [PATCH] feat(i18n): replace 126 hardcoded German strings with $_()
 calls (Phase 4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Systematically replace hardcoded UI strings across 48 files with svelte-i18n
$_('common.*') calls. Added 14 new common translation keys (saving, close,
create, creating, edit, add, search, settings, upload, uploading,
error_saving, error_loading, error_deleting, click_to_close) in all 5 languages.

Covers: profile modals, onboarding, workbench, calendar, cards, contacts,
context, credits, gifts, inventar, memoro, moodlit, mukke, nutriphi, photos,
picture, planta, questions, settings, skilltree, storage, subscription,
times, todo, uload — all common button/action/error strings now i18n-ready.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../onboarding/steps/ProfileStep.svelte          |  3 ++-
 .../components/profile/DeleteAccountModal.svelte |  5 +++--
 .../components/profile/EditProfileModal.svelte   |  9 +++++----
 .../src/lib/components/workbench/AppPage.svelte  |  3 ++-
 .../components/workbench/AppPagePicker.svelte    |  3 ++-
 .../apps/web/src/lib/i18n/locales/common/de.json | 16 +++++++++++++++-
 .../apps/web/src/lib/i18n/locales/common/en.json | 16 +++++++++++++++-
 .../apps/web/src/lib/i18n/locales/common/es.json | 16 +++++++++++++++-
 .../apps/web/src/lib/i18n/locales/common/fr.json | 16 +++++++++++++++-
 .../apps/web/src/lib/i18n/locales/common/it.json | 16 +++++++++++++++-
 .../calendar/components/EventDetailModal.svelte  | 13 +++++++++----
 .../modules/calendar/components/EventForm.svelte |  7 +++++--
 .../calendar/components/QuickEventPopover.svelte |  7 ++++---
 .../cards/components/CreateDeckModal.svelte      |  5 +++--
 .../components/albums/CreateAlbumModal.svelte    |  5 +++--
 .../skilltree/components/AddSkillModal.svelte    |  5 +++--
 .../skilltree/components/AddXpModal.svelte       |  5 +++--
 .../skilltree/components/EditSkillModal.svelte   | 11 ++++++-----
 .../skilltree/components/SkillCard.svelte        |  5 +++--
 .../todo/components/pages/PagePicker.svelte      |  3 ++-
 .../routes/(app)/calendar/calendars/+page.svelte |  3 ++-
 .../(app)/calendar/event/[id]/+page.svelte       |  5 +++--
 .../src/routes/(app)/cards/decks/+page.svelte    |  3 ++-
 .../src/routes/(app)/chat/templates/+page.svelte |  3 ++-
 .../src/routes/(app)/contacts/[id]/+page.svelte  |  7 ++++---
 .../(app)/context/spaces/[id]/+page.svelte       |  5 +++--
 .../web/src/routes/(app)/credits/+page.svelte    |  3 ++-
 .../apps/web/src/routes/(app)/gifts/+page.svelte |  3 ++-
 .../apps/web/src/routes/(app)/home/+page.svelte  |  7 ++++++-
 .../(app)/inventar/categories/+page.svelte       |  6 ++++--
 .../(app)/inventar/items/[id]/+page.svelte       |  7 ++++---
 .../src/routes/(app)/memoro/tags/+page.svelte    |  3 ++-
 .../src/routes/(app)/moodlit/moods/+page.svelte  |  3 ++-
 .../routes/(app)/moodlit/sequences/+page.svelte  |  3 ++-
 .../routes/(app)/mukke/playlists/+page.svelte    |  3 ++-
 .../src/routes/(app)/mukke/projects/+page.svelte |  3 ++-
 .../src/routes/(app)/nutriphi/add/+page.svelte   |  3 ++-
 .../src/routes/(app)/picture/board/+page.svelte  |  3 ++-
 .../routes/(app)/picture/board/[id]/+page.svelte |  5 +++--
 .../src/routes/(app)/questions/[id]/+page.svelte |  3 ++-
 .../(app)/questions/collections/+page.svelte     |  7 ++++---
 .../src/routes/(app)/questions/new/+page.svelte  |  3 ++-
 .../web/src/routes/(app)/settings/+page.svelte   |  7 ++++---
 .../src/routes/(app)/subscription/+page.svelte   |  3 ++-
 .../routes/(app)/times/clock/alarms/+page.svelte |  4 ++--
 .../apps/web/src/routes/(app)/todo/+page.svelte  |  8 ++++++--
 .../apps/web/src/routes/(app)/uload/+page.svelte |  3 ++-
 .../web/src/routes/(app)/uload/tags/+page.svelte |  6 ++++--
 48 files changed, 209 insertions(+), 82 deletions(-)

diff --git a/apps/manacore/apps/web/src/lib/components/onboarding/steps/ProfileStep.svelte b/apps/manacore/apps/web/src/lib/components/onboarding/steps/ProfileStep.svelte
index 1a1889440..c4164340e 100644
--- a/apps/manacore/apps/web/src/lib/components/onboarding/steps/ProfileStep.svelte
+++ b/apps/manacore/apps/web/src/lib/components/onboarding/steps/ProfileStep.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { authStore } from '$lib/stores/auth.svelte';
 	import { profileService } from '$lib/api/profile';
 	import { Camera, Check } from '@manacore/shared-icons';
@@ -70,7 +71,7 @@
 			// Refresh auth store
 			// The profile update should update the user in authStore
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Fehler beim Speichern';
+			error = e instanceof Error ? e.message : $_('common.error_saving');
 		} finally {
 			saving = false;
 		}
diff --git a/apps/manacore/apps/web/src/lib/components/profile/DeleteAccountModal.svelte b/apps/manacore/apps/web/src/lib/components/profile/DeleteAccountModal.svelte
index 2f51319d0..c2de98583 100644
--- a/apps/manacore/apps/web/src/lib/components/profile/DeleteAccountModal.svelte
+++ b/apps/manacore/apps/web/src/lib/components/profile/DeleteAccountModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { profileService } from '$lib/api/profile';
 	import { Warning, XCircle } from '@manacore/shared-icons';
 
@@ -141,7 +142,7 @@
 							onclick={onClose}
 							class="flex-1 px-4 py-2 border rounded-lg hover:bg-muted transition-colors"
 						>
-							Abbrechen
+							{$_('common.cancel')}
 						</button>
 						<button
 							onclick={handleContinue}
@@ -198,7 +199,7 @@
 							disabled={deleting}
 							class="flex-1 px-4 py-2 border rounded-lg hover:bg-muted transition-colors disabled:opacity-50"
 						>
-							Zurück
+							{$_('common.back')}
 						</button>
 						<button
 							onclick={handleDelete}
diff --git a/apps/manacore/apps/web/src/lib/components/profile/EditProfileModal.svelte b/apps/manacore/apps/web/src/lib/components/profile/EditProfileModal.svelte
index b21011f12..0557db0f5 100644
--- a/apps/manacore/apps/web/src/lib/components/profile/EditProfileModal.svelte
+++ b/apps/manacore/apps/web/src/lib/components/profile/EditProfileModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { profileService, type UserProfile } from '$lib/api/profile';
 	import { PencilSimple } from '@manacore/shared-icons';
 
@@ -119,7 +120,7 @@
 			onSuccess(updatedUser);
 			onClose();
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Fehler beim Speichern';
+			error = e instanceof Error ? e.message : $_('common.error_saving');
 		} finally {
 			saving = false;
 			uploadingAvatar = false;
@@ -271,7 +272,7 @@
 							disabled={saving || uploadingAvatar}
 							class="flex-1 px-4 py-2 border rounded-lg hover:bg-muted transition-colors disabled:opacity-50"
 						>
-							Abbrechen
+							{$_('common.cancel')}
 						</button>
 						<button
 							type="submit"
@@ -294,9 +295,9 @@
 										d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
 									></path>
 								</svg>
-								<span>{uploadingAvatar ? 'Hochladen...' : 'Speichern...'}</span>
+								<span>{uploadingAvatar ? $_('common.uploading') : $_('common.saving')}</span>
 							{:else}
-								Speichern
+								{$_('common.save')}
 							{/if}
 						</button>
 					</div>
diff --git a/apps/manacore/apps/web/src/lib/components/workbench/AppPage.svelte b/apps/manacore/apps/web/src/lib/components/workbench/AppPage.svelte
index 9fdc5aaf7..6c792f391 100644
--- a/apps/manacore/apps/web/src/lib/components/workbench/AppPage.svelte
+++ b/apps/manacore/apps/web/src/lib/components/workbench/AppPage.svelte
@@ -3,6 +3,7 @@
   Lazy-loads the app's AppView component and renders it inside the page shell.
 -->
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import {
 		X,
 		Minus,
@@ -117,7 +118,7 @@
 						{#if maximized}<CornersIn size={14} />{:else}<CornersOut size={14} />{/if}
 					</button>
 				{/if}
-				<button class="header-btn" onclick={onClose} title="Schließen">
+				<button class="header-btn" onclick={onClose} title={$_('common.close')}>
 					<X size={14} />
 				</button>
 			</div>
diff --git a/apps/manacore/apps/web/src/lib/components/workbench/AppPagePicker.svelte b/apps/manacore/apps/web/src/lib/components/workbench/AppPagePicker.svelte
index 8cbbc9f0e..3d82e6d54 100644
--- a/apps/manacore/apps/web/src/lib/components/workbench/AppPagePicker.svelte
+++ b/apps/manacore/apps/web/src/lib/components/workbench/AppPagePicker.svelte
@@ -2,6 +2,7 @@
   AppPagePicker — Shows available apps to add as pages to the workbench.
 -->
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { X } from '@manacore/shared-icons';
 	import { APP_REGISTRY } from './app-registry';
 
@@ -19,7 +20,7 @@
 <div class="app-picker">
 	<div class="picker-header">
 		<h3 class="picker-title">App hinzufügen</h3>
-		<button class="close-btn" onclick={onClose} title="Schließen"><X size={16} /></button>
+		<button class="close-btn" onclick={onClose} title={$_('common.close')}><X size={16} /></button>
 	</div>
 	<div class="picker-list">
 		{#each availableApps as app, i (app.id)}
diff --git a/apps/manacore/apps/web/src/lib/i18n/locales/common/de.json b/apps/manacore/apps/web/src/lib/i18n/locales/common/de.json
index 25609cefe..de158e25c 100644
--- a/apps/manacore/apps/web/src/lib/i18n/locales/common/de.json
+++ b/apps/manacore/apps/web/src/lib/i18n/locales/common/de.json
@@ -1,7 +1,21 @@
 {
 	"save": "Speichern",
+	"saving": "Speichern...",
 	"cancel": "Abbrechen",
 	"delete": "Löschen",
 	"back": "Zurück",
-	"loading": "Lädt..."
+	"loading": "Lädt...",
+	"close": "Schließen",
+	"create": "Erstellen",
+	"creating": "Erstelle...",
+	"edit": "Bearbeiten",
+	"add": "Hinzufügen",
+	"search": "Suchen...",
+	"settings": "Einstellungen",
+	"upload": "Hochladen",
+	"uploading": "Hochladen...",
+	"error_saving": "Fehler beim Speichern",
+	"error_loading": "Fehler beim Laden",
+	"error_deleting": "Fehler beim Löschen",
+	"click_to_close": "Klicken zum Schließen"
 }
diff --git a/apps/manacore/apps/web/src/lib/i18n/locales/common/en.json b/apps/manacore/apps/web/src/lib/i18n/locales/common/en.json
index 911204949..5b945f431 100644
--- a/apps/manacore/apps/web/src/lib/i18n/locales/common/en.json
+++ b/apps/manacore/apps/web/src/lib/i18n/locales/common/en.json
@@ -1,7 +1,21 @@
 {
 	"save": "Save",
+	"saving": "Saving...",
 	"cancel": "Cancel",
 	"delete": "Delete",
 	"back": "Back",
-	"loading": "Loading..."
+	"loading": "Loading...",
+	"close": "Close",
+	"create": "Create",
+	"creating": "Creating...",
+	"edit": "Edit",
+	"add": "Add",
+	"search": "Search...",
+	"settings": "Settings",
+	"upload": "Upload",
+	"uploading": "Uploading...",
+	"error_saving": "Error saving",
+	"error_loading": "Error loading",
+	"error_deleting": "Error deleting",
+	"click_to_close": "Click to close"
 }
diff --git a/apps/manacore/apps/web/src/lib/i18n/locales/common/es.json b/apps/manacore/apps/web/src/lib/i18n/locales/common/es.json
index efedc8e60..2e248b7ff 100644
--- a/apps/manacore/apps/web/src/lib/i18n/locales/common/es.json
+++ b/apps/manacore/apps/web/src/lib/i18n/locales/common/es.json
@@ -1,7 +1,21 @@
 {
 	"save": "Guardar",
+	"saving": "Guardando...",
 	"cancel": "Cancelar",
 	"delete": "Eliminar",
 	"back": "Atrás",
-	"loading": "Cargando..."
+	"loading": "Cargando...",
+	"close": "Cerrar",
+	"create": "Crear",
+	"creating": "Creando...",
+	"edit": "Editar",
+	"add": "Añadir",
+	"search": "Buscar...",
+	"settings": "Ajustes",
+	"upload": "Subir",
+	"uploading": "Subiendo...",
+	"error_saving": "Error al guardar",
+	"error_loading": "Error al cargar",
+	"error_deleting": "Error al eliminar",
+	"click_to_close": "Clic para cerrar"
 }
diff --git a/apps/manacore/apps/web/src/lib/i18n/locales/common/fr.json b/apps/manacore/apps/web/src/lib/i18n/locales/common/fr.json
index 6e6cc83f0..a9e0f60d0 100644
--- a/apps/manacore/apps/web/src/lib/i18n/locales/common/fr.json
+++ b/apps/manacore/apps/web/src/lib/i18n/locales/common/fr.json
@@ -1,7 +1,21 @@
 {
 	"save": "Enregistrer",
+	"saving": "Enregistrement...",
 	"cancel": "Annuler",
 	"delete": "Supprimer",
 	"back": "Retour",
-	"loading": "Chargement..."
+	"loading": "Chargement...",
+	"close": "Fermer",
+	"create": "Créer",
+	"creating": "Création...",
+	"edit": "Modifier",
+	"add": "Ajouter",
+	"search": "Rechercher...",
+	"settings": "Paramètres",
+	"upload": "Télécharger",
+	"uploading": "Téléchargement...",
+	"error_saving": "Erreur lors de l'enregistrement",
+	"error_loading": "Erreur lors du chargement",
+	"error_deleting": "Erreur lors de la suppression",
+	"click_to_close": "Cliquer pour fermer"
 }
diff --git a/apps/manacore/apps/web/src/lib/i18n/locales/common/it.json b/apps/manacore/apps/web/src/lib/i18n/locales/common/it.json
index 2ad05c251..7fa0ec582 100644
--- a/apps/manacore/apps/web/src/lib/i18n/locales/common/it.json
+++ b/apps/manacore/apps/web/src/lib/i18n/locales/common/it.json
@@ -1,7 +1,21 @@
 {
 	"save": "Salva",
+	"saving": "Salvataggio...",
 	"cancel": "Annulla",
 	"delete": "Elimina",
 	"back": "Indietro",
-	"loading": "Caricamento..."
+	"loading": "Caricamento...",
+	"close": "Chiudi",
+	"create": "Crea",
+	"creating": "Creazione...",
+	"edit": "Modifica",
+	"add": "Aggiungi",
+	"search": "Cerca...",
+	"settings": "Impostazioni",
+	"upload": "Carica",
+	"uploading": "Caricamento...",
+	"error_saving": "Errore durante il salvataggio",
+	"error_loading": "Errore durante il caricamento",
+	"error_deleting": "Errore durante l'eliminazione",
+	"click_to_close": "Clicca per chiudere"
 }
diff --git a/apps/manacore/apps/web/src/lib/modules/calendar/components/EventDetailModal.svelte b/apps/manacore/apps/web/src/lib/modules/calendar/components/EventDetailModal.svelte
index c928ec589..5526e617b 100644
--- a/apps/manacore/apps/web/src/lib/modules/calendar/components/EventDetailModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/calendar/components/EventDetailModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { eventsStore } from '../stores/events.svelte';
 	import { getCalendarById, getCalendarColor } from '../queries';
@@ -173,18 +174,22 @@
 					<button class="btn btn-ghost" onclick={copyToClipboard} title="Kopieren">
 						{#if copied}<Check size={16} />{:else}<Copy size={16} />{/if}
 					</button>
-					<button class="btn btn-ghost" onclick={() => (isEditing = true)} title="Bearbeiten">
+					<button
+						class="btn btn-ghost"
+						onclick={() => (isEditing = true)}
+						title={$_('common.edit')}
+					>
 						<PencilSimple size={16} />
 					</button>
 					<button
 						class="btn btn-ghost text-destructive"
 						onclick={handleDeleteClick}
-						title="Löschen"
+						title={$_('common.delete')}
 					>
 						<Trash size={16} />
 					</button>
 				{/if}
-				<button class="btn btn-ghost btn-close" onclick={onClose} aria-label="Schließen">
+				<button class="btn btn-ghost btn-close" onclick={onClose} aria-label={$_('common.close')}>
 					<X size={20} />
 				</button>
 			</div>
@@ -290,7 +295,7 @@
 					Alle Termine der Serie
 				</button>
 				<button class="btn btn-ghost" onclick={() => (showDeleteOptions = false)}>
-					Abbrechen
+					{$_('common.cancel')}
 				</button>
 			</div>
 		</div>
diff --git a/apps/manacore/apps/web/src/lib/modules/calendar/components/EventForm.svelte b/apps/manacore/apps/web/src/lib/modules/calendar/components/EventForm.svelte
index 095b24dba..b479815ac 100644
--- a/apps/manacore/apps/web/src/lib/modules/calendar/components/EventForm.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/calendar/components/EventForm.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { getDefaultCalendar } from '../queries';
 	import type { Calendar, CalendarEvent } from '../types';
@@ -214,9 +215,11 @@
 	</div>
 
 	<div class="form-actions">
-		<button type="button" class="btn btn-secondary" onclick={onCancel}> Abbrechen </button>
+		<button type="button" class="btn btn-secondary" onclick={onCancel}>
+			{$_('common.cancel')}
+		</button>
 		<button type="submit" class="btn btn-primary" disabled={submitting || !title.trim()}>
-			{mode === 'create' ? 'Erstellen' : 'Speichern'}
+			{mode === 'create' ? $_('common.create') : $_('common.save')}
 		</button>
 	</div>
 </form>
diff --git a/apps/manacore/apps/web/src/lib/modules/calendar/components/QuickEventPopover.svelte b/apps/manacore/apps/web/src/lib/modules/calendar/components/QuickEventPopover.svelte
index 4128ce030..9f06f6a5d 100644
--- a/apps/manacore/apps/web/src/lib/modules/calendar/components/QuickEventPopover.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/calendar/components/QuickEventPopover.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext, onMount, tick } from 'svelte';
 	import { getDefaultCalendar, getCalendarColor } from '../queries';
 	import type { Calendar } from '../types';
@@ -139,7 +140,7 @@
 		<!-- Header -->
 		<div class="popover-header">
 			<span class="header-title">Neuer Termin</span>
-			<button type="button" class="close-btn" onclick={onClose} aria-label="Schließen">
+			<button type="button" class="close-btn" onclick={onClose} aria-label={$_('common.close')}>
 				<X size={16} />
 			</button>
 		</div>
@@ -238,14 +239,14 @@
 
 		<!-- Actions -->
 		<div class="popover-actions">
-			<button type="button" onclick={onClose} class="cancel-btn">Abbrechen</button>
+			<button type="button" onclick={onClose} class="cancel-btn">{$_('common.cancel')}</button>
 			<button
 				type="submit"
 				disabled={!title.trim()}
 				class="save-btn"
 				style="background-color: {calendarColor};"
 			>
-				Speichern
+				{$_('common.save')}
 			</button>
 		</div>
 	</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/cards/components/CreateDeckModal.svelte b/apps/manacore/apps/web/src/lib/modules/cards/components/CreateDeckModal.svelte
index 4f7844b72..49965f42f 100644
--- a/apps/manacore/apps/web/src/lib/modules/cards/components/CreateDeckModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/cards/components/CreateDeckModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { deckStore } from '../stores/decks.svelte';
 	import { TagField, ColorPicker, COLORS_12, DEFAULT_COLOR } from '@manacore/shared-ui';
 	import { useAllTags } from '@manacore/shared-stores';
@@ -135,14 +136,14 @@
 						class="rounded-lg px-4 py-2 text-sm text-muted-foreground hover:text-foreground"
 						onclick={handleClose}
 					>
-						Abbrechen
+						{$_('common.cancel')}
 					</button>
 					<button
 						type="submit"
 						class="rounded-lg bg-primary px-4 py-2 text-sm text-white disabled:opacity-50"
 						disabled={submitting || !title.trim()}
 					>
-						{submitting ? 'Erstelle...' : 'Deck erstellen'}
+						{submitting ? $_('common.creating') : 'Deck erstellen'}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/photos/components/albums/CreateAlbumModal.svelte b/apps/manacore/apps/web/src/lib/modules/photos/components/albums/CreateAlbumModal.svelte
index 8e13e7cfc..09cff0512 100644
--- a/apps/manacore/apps/web/src/lib/modules/photos/components/albums/CreateAlbumModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/photos/components/albums/CreateAlbumModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { X } from '@manacore/shared-icons';
 
 	interface Props {
@@ -85,14 +86,14 @@
 					onclick={onClose}
 					disabled={loading}
 				>
-					Abbrechen
+					{$_('common.cancel')}
 				</button>
 				<button
 					type="submit"
 					class="rounded-lg bg-primary px-4 py-2 text-sm font-medium text-white hover:bg-primary/90 disabled:opacity-50"
 					disabled={!name.trim() || loading}
 				>
-					{loading ? 'Erstelle...' : 'Erstellen'}
+					{loading ? $_('common.creating') : $_('common.create')}
 				</button>
 			</div>
 		</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddSkillModal.svelte b/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddSkillModal.svelte
index b0c199578..7da2aa8bc 100644
--- a/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddSkillModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddSkillModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import type { Skill, SkillBranch } from '../types';
 	import { BRANCH_INFO } from '../types';
 	import { X } from '@manacore/shared-icons';
@@ -111,14 +112,14 @@
 					onclick={onClose}
 					class="flex-1 rounded-lg border border-gray-600 bg-transparent px-4 py-2 font-medium text-gray-300 transition-colors hover:bg-gray-700"
 				>
-					Abbrechen
+					{$_('common.cancel')}
 				</button>
 				<button
 					type="submit"
 					disabled={!name.trim() || saving}
 					class="flex-1 rounded-lg bg-emerald-600 px-4 py-2 font-medium text-white transition-colors hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-50"
 				>
-					{saving ? 'Speichern...' : 'Erstellen'}
+					{saving ? $_('common.saving') : $_('common.create')}
 				</button>
 			</div>
 		</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddXpModal.svelte b/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddXpModal.svelte
index 6e646f981..11d21a8f3 100644
--- a/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddXpModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/skilltree/components/AddXpModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import type { Skill } from '../types';
 	import { LEVEL_NAMES } from '../types';
 	import { X, Lightning, Clock, Star } from '@manacore/shared-icons';
@@ -156,14 +157,14 @@
 					onclick={onClose}
 					class="flex-1 rounded-lg border border-gray-600 bg-transparent px-4 py-2 font-medium text-gray-300 transition-colors hover:bg-gray-700"
 				>
-					Abbrechen
+					{$_('common.cancel')}
 				</button>
 				<button
 					type="submit"
 					disabled={xp <= 0 || saving}
 					class="flex-1 rounded-lg bg-emerald-600 px-4 py-2 font-medium text-white transition-colors hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-50"
 				>
-					{saving ? 'Speichern...' : 'XP vergeben'}
+					{saving ? $_('common.saving') : 'XP vergeben'}
 				</button>
 			</div>
 		</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/skilltree/components/EditSkillModal.svelte b/apps/manacore/apps/web/src/lib/modules/skilltree/components/EditSkillModal.svelte
index 081bbcc6c..529e1beac 100644
--- a/apps/manacore/apps/web/src/lib/modules/skilltree/components/EditSkillModal.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/skilltree/components/EditSkillModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import type { Skill, SkillBranch } from '../types';
 	import { BRANCH_INFO } from '../types';
 	import { X, Trash } from '@manacore/shared-icons';
@@ -82,13 +83,13 @@
 						onclick={() => (showDeleteConfirm = false)}
 						class="flex-1 rounded-lg border border-gray-600 bg-transparent px-4 py-2 font-medium text-gray-300 transition-colors hover:bg-gray-700"
 					>
-						Abbrechen
+						{$_('common.cancel')}
 					</button>
 					<button
 						onclick={confirmDelete}
 						class="flex-1 rounded-lg bg-red-600 px-4 py-2 font-medium text-white transition-colors hover:bg-red-500"
 					>
-						Löschen
+						{$_('common.delete')}
 					</button>
 				</div>
 			</div>
@@ -167,7 +168,7 @@
 						type="button"
 						onclick={() => (showDeleteConfirm = true)}
 						class="rounded-lg bg-red-600/20 p-2 text-red-400 transition-colors hover:bg-red-600/30"
-						title="Löschen"
+						title={$_('common.delete')}
 					>
 						<Trash class="h-5 w-5" />
 					</button>
@@ -176,14 +177,14 @@
 						onclick={onClose}
 						class="flex-1 rounded-lg border border-gray-600 bg-transparent px-4 py-2 font-medium text-gray-300 transition-colors hover:bg-gray-700"
 					>
-						Abbrechen
+						{$_('common.cancel')}
 					</button>
 					<button
 						type="submit"
 						disabled={!name.trim() || saving}
 						class="flex-1 rounded-lg bg-emerald-600 px-4 py-2 font-medium text-white transition-colors hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-50"
 					>
-						{saving ? 'Speichern...' : 'Speichern'}
+						{saving ? $_('common.saving') : $_('common.save')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/lib/modules/skilltree/components/SkillCard.svelte b/apps/manacore/apps/web/src/lib/modules/skilltree/components/SkillCard.svelte
index 232e4debd..7ba9fcb3a 100644
--- a/apps/manacore/apps/web/src/lib/modules/skilltree/components/SkillCard.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/skilltree/components/SkillCard.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import type { Skill } from '../types';
 	import { BRANCH_INFO, LEVEL_NAMES, xpProgress, xpForNextLevel } from '../types';
 	import { Plus, Trash, PencilSimple, Star } from '@manacore/shared-icons';
@@ -100,14 +101,14 @@
 		<button
 			onclick={onEdit}
 			class="rounded-lg bg-gray-600/20 p-2 text-gray-400 opacity-0 transition-all hover:bg-gray-600/30 hover:text-white group-hover:opacity-100"
-			title="Bearbeiten"
+			title={$_('common.edit')}
 		>
 			<PencilSimple class="h-4 w-4" />
 		</button>
 		<button
 			onclick={onDelete}
 			class="rounded-lg bg-red-600/20 p-2 text-red-400 opacity-0 transition-all hover:bg-red-600/30 group-hover:opacity-100"
-			title="Löschen"
+			title={$_('common.delete')}
 		>
 			<Trash class="h-4 w-4" />
 		</button>
diff --git a/apps/manacore/apps/web/src/lib/modules/todo/components/pages/PagePicker.svelte b/apps/manacore/apps/web/src/lib/modules/todo/components/pages/PagePicker.svelte
index 51c89ba2d..3494c6dbc 100644
--- a/apps/manacore/apps/web/src/lib/modules/todo/components/pages/PagePicker.svelte
+++ b/apps/manacore/apps/web/src/lib/modules/todo/components/pages/PagePicker.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import {
 		Circle,
 		CheckCircle,
@@ -80,7 +81,7 @@
 <div class="page-picker">
 	<div class="picker-header">
 		<h3 class="picker-title">Neue Seite</h3>
-		<button class="close-btn" onclick={onClose} title="Schließen"><X size={16} /></button>
+		<button class="close-btn" onclick={onClose} title={$_('common.close')}><X size={16} /></button>
 	</div>
 	<div class="picker-list">
 		{#each availableOptions as option, i (option.id)}
diff --git a/apps/manacore/apps/web/src/routes/(app)/calendar/calendars/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/calendar/calendars/+page.svelte
index 69f1aed37..7794dbf13 100644
--- a/apps/manacore/apps/web/src/routes/(app)/calendar/calendars/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/calendar/calendars/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { calendarsStore } from '$lib/modules/calendar/stores/calendars.svelte';
 	import type { Calendar } from '$lib/modules/calendar/types';
@@ -173,7 +174,7 @@
 						<button
 							onclick={() => handleDelete(cal.id)}
 							class="rounded-lg p-1.5 text-muted-foreground hover:text-red-600 transition-colors"
-							title="Löschen"
+							title={$_('common.delete')}
 						>
 							<Trash size={16} />
 						</button>
diff --git a/apps/manacore/apps/web/src/routes/(app)/calendar/event/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/calendar/event/[id]/+page.svelte
index 52ec84480..f39f82093 100644
--- a/apps/manacore/apps/web/src/routes/(app)/calendar/event/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/calendar/event/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { getContext } from 'svelte';
@@ -216,14 +217,14 @@
 					<button
 						onclick={startEditing}
 						class="rounded-lg p-2 text-muted-foreground hover:bg-muted hover:text-foreground transition-colors"
-						title="Bearbeiten"
+						title={$_('common.edit')}
 					>
 						<PencilSimple size={18} />
 					</button>
 					<button
 						onclick={handleDelete}
 						class="rounded-lg p-2 text-muted-foreground hover:bg-red-50 hover:text-red-600 dark:hover:bg-red-950/20 transition-colors"
-						title="Löschen"
+						title={$_('common.delete')}
 					>
 						<Trash size={18} />
 					</button>
diff --git a/apps/manacore/apps/web/src/routes/(app)/cards/decks/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/cards/decks/+page.svelte
index a815c62aa..ea5c7de84 100644
--- a/apps/manacore/apps/web/src/routes/(app)/cards/decks/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/cards/decks/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { goto } from '$app/navigation';
 	import { deckStore } from '$lib/modules/cards/stores/decks.svelte';
@@ -39,7 +40,7 @@
 	<!-- Error State -->
 	{#if deckStore.error}
 		<div class="rounded-lg bg-destructive/10 p-4 text-destructive">
-			<p class="font-medium">Fehler beim Laden</p>
+			<p class="font-medium">{$_('common.error_loading')}</p>
 			<p class="mt-1 text-sm">{deckStore.error}</p>
 		</div>
 	{:else if (allDecks?.value ?? []).length === 0}
diff --git a/apps/manacore/apps/web/src/routes/(app)/chat/templates/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/chat/templates/+page.svelte
index 7870ba3e7..dbf000e51 100644
--- a/apps/manacore/apps/web/src/routes/(app)/chat/templates/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/chat/templates/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { goto } from '$app/navigation';
 	import { getContext } from 'svelte';
 	import { templatesStore } from '$lib/modules/chat/stores/templates.svelte';
@@ -301,7 +302,7 @@
 						disabled={!formName.trim() || !formSystemPrompt.trim()}
 						class="rounded-lg bg-[hsl(var(--primary))] px-4 py-2 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 					>
-						{editingId ? 'Speichern' : 'Erstellen'}
+						{editingId ? $_('common.save') : $_('common.create')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/contacts/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/contacts/[id]/+page.svelte
index 92b22e5e9..1e8aee0cf 100644
--- a/apps/manacore/apps/web/src/routes/(app)/contacts/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/contacts/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { getContext } from 'svelte';
@@ -189,7 +190,7 @@
 					<button
 						onclick={() => startEdit()}
 						class="rounded-lg p-2 text-muted-foreground transition-colors hover:bg-muted hover:text-foreground"
-						title="Bearbeiten"
+						title={$_('common.edit')}
 					>
 						<PencilSimple size={18} />
 					</button>
@@ -432,13 +433,13 @@
 						type="button"
 						onclick={cancelEdit}
 						class="rounded-lg border border-border px-4 py-2 text-sm font-medium text-foreground hover:bg-muted"
-						>Abbrechen</button
+						>{$_('common.cancel')}</button
 					>
 					<button
 						type="button"
 						onclick={saveEdit}
 						class="rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90"
-						>Speichern</button
+						>{$_('common.save')}</button
 					>
 				</div>
 			</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/context/spaces/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/context/spaces/[id]/+page.svelte
index 58d95715f..dfeb3df23 100644
--- a/apps/manacore/apps/web/src/routes/(app)/context/spaces/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/context/spaces/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { Plus, ArrowLeft, PencilSimple, Check, X, MagnifyingGlass } from '@manacore/shared-icons';
@@ -157,7 +158,7 @@
 					<button
 						class="rounded-lg p-2 opacity-60 transition-colors hover:bg-gray-100 hover:opacity-100 dark:hover:bg-gray-700"
 						onclick={startEdit}
-						title="Bearbeiten"
+						title={$_('common.edit')}
 					>
 						<PencilSimple size={18} />
 					</button>
@@ -189,7 +190,7 @@
 					<input
 						type="text"
 						bind:value={searchQuery}
-						placeholder="Suchen..."
+						placeholder={$_('common.search')}
 						class="w-48 rounded-lg border border-gray-300 bg-white py-1.5 pl-8 pr-3 text-sm focus:border-indigo-500 focus:outline-none dark:border-gray-600 dark:bg-gray-700"
 					/>
 				</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/credits/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/credits/+page.svelte
index 00b95cf9d..c473d1638 100644
--- a/apps/manacore/apps/web/src/routes/(app)/credits/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/credits/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
 	import { Card, PageHeader } from '@manacore/shared-ui';
@@ -139,7 +140,7 @@
 			transactions = transactionsData;
 			packages = packagesData.filter((p) => p.active).sort((a, b) => a.sortOrder - b.sortOrder);
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Fehler beim Laden der Daten';
+			error = e instanceof Error ? e.message : $_('common.error_loading');
 			console.error('Failed to load credits data:', e);
 		} finally {
 			loading = false;
diff --git a/apps/manacore/apps/web/src/routes/(app)/gifts/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/gifts/+page.svelte
index b7928ee0f..ec205b2ad 100644
--- a/apps/manacore/apps/web/src/routes/(app)/gifts/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/gifts/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
 	import { Card, PageHeader } from '@manacore/shared-ui';
@@ -60,7 +61,7 @@
 			createdGifts = created;
 			balance = balanceData;
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Fehler beim Laden der Daten';
+			error = e instanceof Error ? e.message : $_('common.error_loading');
 			console.error('Failed to load gifts data:', e);
 		} finally {
 			loading = false;
diff --git a/apps/manacore/apps/web/src/routes/(app)/home/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/home/+page.svelte
index 9ab7876e2..31ec768cf 100644
--- a/apps/manacore/apps/web/src/routes/(app)/home/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/home/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { Plus, PencilSimple, X, ArrowsOut } from '@manacore/shared-icons';
 	import AppPage from '$lib/components/workbench/AppPage.svelte';
 	import AppPagePicker from '$lib/components/workbench/AppPagePicker.svelte';
@@ -286,7 +287,11 @@
 					>
 						<ArrowsOut size={12} />
 					</button>
-					<button class="tab-close" onclick={() => handleRemoveApp(app.appId)} title="Schließen">
+					<button
+						class="tab-close"
+						onclick={() => handleRemoveApp(app.appId)}
+						title={$_('common.close')}
+					>
 						<X size={12} />
 					</button>
 				</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/inventar/categories/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/inventar/categories/+page.svelte
index 1c709533a..1a365e60c 100644
--- a/apps/manacore/apps/web/src/routes/(app)/inventar/categories/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/inventar/categories/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { Plus } from '@manacore/shared-icons';
 	import { getContext } from 'svelte';
 	import { categoriesStore } from '$lib/modules/inventar/stores/categories.svelte';
@@ -100,11 +101,12 @@
 					onclick={save}
 					disabled={!name.trim()}
 					class="rounded-lg bg-[hsl(var(--primary))] px-4 text-sm text-[hsl(var(--primary-foreground))] disabled:opacity-50"
-					>Speichern</button
+					>{$_('common.save')}</button
 				>
 				<button
 					onclick={() => (showForm = false)}
-					class="rounded-lg border border-[hsl(var(--border))] px-3 text-sm">Abbrechen</button
+					class="rounded-lg border border-[hsl(var(--border))] px-3 text-sm"
+					>{$_('common.cancel')}</button
 				>
 			</div>
 		</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/inventar/items/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/inventar/items/[id]/+page.svelte
index 85c601109..d2ef460d9 100644
--- a/apps/manacore/apps/web/src/routes/(app)/inventar/items/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/inventar/items/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { CaretLeft } from '@manacore/shared-icons';
@@ -133,18 +134,18 @@
 					<button
 						onclick={() => (editing = false)}
 						class="rounded-lg border border-[hsl(var(--border))] px-3 py-1.5 text-sm"
-						>Abbrechen</button
+						>{$_('common.cancel')}</button
 					>
 					<button
 						onclick={saveEdit}
 						class="rounded-lg bg-[hsl(var(--primary))] px-4 py-1.5 text-sm font-medium text-[hsl(var(--primary-foreground))]"
-						>Speichern</button
+						>{$_('common.save')}</button
 					>
 				{:else}
 					<button
 						onclick={startEditing}
 						class="rounded-lg border border-[hsl(var(--border))] px-3 py-1.5 text-sm text-[hsl(var(--foreground))]"
-						>Bearbeiten</button
+						>{$_('common.edit')}</button
 					>
 					<button
 						onclick={deleteItem}
diff --git a/apps/manacore/apps/web/src/routes/(app)/memoro/tags/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/memoro/tags/+page.svelte
index 03a1e067c..3c26aa1e1 100644
--- a/apps/manacore/apps/web/src/routes/(app)/memoro/tags/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/memoro/tags/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { tagMutations } from '$lib/modules/memoro/stores/tags.svelte';
 	import type { Tag } from '@manacore/shared-tags';
@@ -201,7 +202,7 @@
 						disabled={!formName.trim()}
 						class="rounded-lg bg-[hsl(var(--primary))] px-4 py-2 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 					>
-						{editingId ? 'Speichern' : 'Erstellen'}
+						{editingId ? $_('common.save') : $_('common.create')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/moodlit/moods/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/moodlit/moods/+page.svelte
index 69be2ac55..1d44928ba 100644
--- a/apps/manacore/apps/web/src/routes/(app)/moodlit/moods/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/moodlit/moods/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { useLiveQuery } from '@manacore/local-store/svelte';
 	import { moodTable } from '$lib/modules/moodlit/collections';
 	import { moodsStore } from '$lib/modules/moodlit/stores/moods.svelte';
@@ -129,7 +130,7 @@
 				onclick={createMood}
 				disabled={!newName}
 				class="mt-4 rounded-lg bg-purple-600 px-6 py-2 font-medium text-white hover:bg-purple-700 disabled:opacity-50"
-				>Erstellen</button
+				>{$_('common.create')}</button
 			>
 		</div>
 	{/if}
diff --git a/apps/manacore/apps/web/src/routes/(app)/moodlit/sequences/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/moodlit/sequences/+page.svelte
index eca83c25a..3e8ac81ac 100644
--- a/apps/manacore/apps/web/src/routes/(app)/moodlit/sequences/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/moodlit/sequences/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { useLiveQuery } from '@manacore/local-store/svelte';
 	import { db } from '$lib/data/database';
 	import { sequencesStore } from '$lib/modules/moodlit/stores/sequences.svelte';
@@ -83,7 +84,7 @@
 					onclick={createSequence}
 					disabled={!newName}
 					class="rounded-lg bg-purple-600 px-4 py-2 text-sm font-medium text-white disabled:opacity-50"
-					>Erstellen</button
+					>{$_('common.create')}</button
 				>
 			</div>
 		</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/mukke/playlists/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/mukke/playlists/+page.svelte
index 1b3eb2fd8..19e2936e1 100644
--- a/apps/manacore/apps/web/src/routes/(app)/mukke/playlists/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/mukke/playlists/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { playlistsStore } from '$lib/modules/mukke/stores/playlists.svelte';
 	import type { Playlist } from '$lib/modules/mukke/types';
@@ -168,7 +169,7 @@
 						disabled={!newName.trim() || isCreating}
 						class="rounded-lg bg-[hsl(var(--primary))] px-4 py-2 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 					>
-						{isCreating ? 'Erstellen...' : 'Erstellen'}
+						{isCreating ? $_('common.creating') : $_('common.create')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/mukke/projects/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/mukke/projects/+page.svelte
index 8561172f2..4c32bc7da 100644
--- a/apps/manacore/apps/web/src/routes/(app)/mukke/projects/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/mukke/projects/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { getContext } from 'svelte';
 	import { projectsStore } from '$lib/modules/mukke/stores/projects.svelte';
 	import type { Project } from '$lib/modules/mukke/types';
@@ -168,7 +169,7 @@
 						disabled={!newTitle.trim() || isCreating}
 						class="rounded-lg bg-[hsl(var(--primary))] px-4 py-2 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 					>
-						{isCreating ? 'Erstellen...' : 'Erstellen'}
+						{isCreating ? $_('common.creating') : $_('common.create')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/nutriphi/add/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/nutriphi/add/+page.svelte
index be608799d..8c9279678 100644
--- a/apps/manacore/apps/web/src/routes/(app)/nutriphi/add/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/nutriphi/add/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { goto } from '$app/navigation';
 	import { db } from '$lib/data/database';
 	import { useAllFavorites } from '$lib/modules/nutriphi/queries';
@@ -261,7 +262,7 @@
 				disabled={saving || !description.trim()}
 				class="flex-1 rounded-lg bg-[hsl(var(--primary))] px-4 py-3 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 			>
-				{saving ? 'Speichert...' : 'Speichern'}
+				{saving ? $_('common.saving') : $_('common.save')}
 			</button>
 		</div>
 	</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/picture/board/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/picture/board/+page.svelte
index 16d4b28ab..f3366da5e 100644
--- a/apps/manacore/apps/web/src/routes/(app)/picture/board/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/picture/board/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { goto } from '$app/navigation';
 	import { getContext } from 'svelte';
 	import { boardsStore } from '$lib/modules/picture/stores/boards.svelte';
@@ -204,7 +205,7 @@
 						disabled={!boardName.trim() || isCreating}
 						class="flex-1 rounded-lg bg-primary px-4 py-2 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors disabled:opacity-50"
 					>
-						{isCreating ? 'Erstelle...' : 'Erstellen'}
+						{isCreating ? $_('common.creating') : $_('common.create')}
 					</button>
 				</div>
 			</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/picture/board/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/picture/board/[id]/+page.svelte
index a4bf08f5e..9a1b0cb16 100644
--- a/apps/manacore/apps/web/src/routes/(app)/picture/board/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/picture/board/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { goto } from '$app/navigation';
 	import { getContext } from 'svelte';
@@ -74,14 +75,14 @@
 				<button
 					onclick={startEditing}
 					class="rounded-lg p-1.5 text-muted-foreground hover:bg-muted hover:text-foreground transition-colors"
-					title="Bearbeiten"
+					title={$_('common.edit')}
 				>
 					<PencilSimple size={18} />
 				</button>
 				<button
 					onclick={handleDelete}
 					class="rounded-lg p-1.5 text-muted-foreground hover:bg-red-50 hover:text-red-600 dark:hover:bg-red-950/20 transition-colors"
-					title="Löschen"
+					title={$_('common.delete')}
 				>
 					<Trash size={18} />
 				</button>
diff --git a/apps/manacore/apps/web/src/routes/(app)/questions/[id]/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/questions/[id]/+page.svelte
index b041a4774..4295933eb 100644
--- a/apps/manacore/apps/web/src/routes/(app)/questions/[id]/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/questions/[id]/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { page } from '$app/stores';
 	import { db } from '$lib/data/database';
 	import {
@@ -249,7 +250,7 @@
 						<button
 							onclick={startEditing}
 							class="rounded-lg border border-[hsl(var(--border))] p-2 text-[hsl(var(--muted-foreground))] hover:text-[hsl(var(--foreground))]"
-							title="Bearbeiten"
+							title={$_('common.edit')}
 						>
 							<PencilSimple class="h-4 w-4" />
 						</button>
diff --git a/apps/manacore/apps/web/src/routes/(app)/questions/collections/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/questions/collections/+page.svelte
index ac0ab87a2..889d44109 100644
--- a/apps/manacore/apps/web/src/routes/(app)/questions/collections/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/questions/collections/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { db } from '$lib/data/database';
 	import {
 		useAllCollections,
@@ -175,7 +176,7 @@
 						<button
 							onclick={() => openEditModal(collection)}
 							class="rounded-lg p-2 text-[hsl(var(--muted-foreground))] hover:bg-[hsl(var(--muted))] hover:text-[hsl(var(--foreground))]"
-							title="Bearbeiten"
+							title={$_('common.edit')}
 						>
 							<PencilSimple class="h-4 w-4" />
 						</button>
@@ -275,14 +276,14 @@
 					onclick={closeModal}
 					class="rounded-lg border border-[hsl(var(--border))] px-4 py-2 text-sm text-[hsl(var(--foreground))] hover:bg-[hsl(var(--muted))]"
 				>
-					Abbrechen
+					{$_('common.cancel')}
 				</button>
 				<button
 					onclick={handleSave}
 					disabled={!formName.trim()}
 					class="rounded-lg bg-[hsl(var(--primary))] px-4 py-2 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 				>
-					{editingCollection ? 'Speichern' : 'Erstellen'}
+					{editingCollection ? $_('common.save') : $_('common.create')}
 				</button>
 			</div>
 		</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/questions/new/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/questions/new/+page.svelte
index 8365caea2..b6448c671 100644
--- a/apps/manacore/apps/web/src/routes/(app)/questions/new/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/questions/new/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { goto } from '$app/navigation';
 	import { db } from '$lib/data/database';
 	import { useAllCollections } from '$lib/modules/questions/queries';
@@ -247,7 +248,7 @@
 				disabled={loading || !title.trim()}
 				class="flex-1 rounded-lg bg-[hsl(var(--primary))] px-4 py-3 text-sm font-medium text-[hsl(var(--primary-foreground))] hover:opacity-90 disabled:opacity-50"
 			>
-				{loading ? 'Erstelle...' : 'Frage stellen'}
+				{loading ? $_('common.creating') : 'Frage stellen'}
 			</button>
 		</div>
 	</form>
diff --git a/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
index b8d6d25f2..533fe2b61 100644
--- a/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/settings/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { onMount } from 'svelte';
 	import { Button, Input, Card, PageHeader, GlobalSettingsSection } from '@manacore/shared-ui';
 	import {
@@ -85,7 +86,7 @@
 			profileSuccess = true;
 			ManaCoreEvents.profileUpdated();
 		} catch (e) {
-			profileError = e instanceof Error ? e.message : 'Fehler beim Speichern';
+			profileError = e instanceof Error ? e.message : $_('common.error_saving');
 		} finally {
 			savingProfile = false;
 		}
@@ -94,7 +95,7 @@
 
 <div>
 	<PageHeader
-		title="Einstellungen"
+		title={$_('common.settings')}
 		description="Verwalte deine Kontoeinstellungen und Präferenzen"
 		size="lg"
 	/>
@@ -164,7 +165,7 @@
 						</div>
 
 						<Button onclick={handleUpdateProfile} loading={savingProfile} class="w-full sm:w-auto">
-							{savingProfile ? 'Speichern...' : 'Änderungen speichern'}
+							{savingProfile ? $_('common.saving') : 'Änderungen speichern'}
 						</Button>
 					</div>
 				</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/subscription/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/subscription/+page.svelte
index 6ae8692b6..7eaf46e60 100644
--- a/apps/manacore/apps/web/src/routes/(app)/subscription/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/subscription/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { onMount } from 'svelte';
 	import { page } from '$app/stores';
 	import { Card, PageHeader } from '@manacore/shared-ui';
@@ -60,7 +61,7 @@
 			currentSubscription = subscriptionData;
 			invoices = invoicesData;
 		} catch (e) {
-			error = e instanceof Error ? e.message : 'Fehler beim Laden der Daten';
+			error = e instanceof Error ? e.message : $_('common.error_loading');
 			console.error('Failed to load subscription data:', e);
 		} finally {
 			loading = false;
diff --git a/apps/manacore/apps/web/src/routes/(app)/times/clock/alarms/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/times/clock/alarms/+page.svelte
index 60c491aa0..3f37e6b92 100644
--- a/apps/manacore/apps/web/src/routes/(app)/times/clock/alarms/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/times/clock/alarms/+page.svelte
@@ -117,7 +117,7 @@
 			toast.success('Wecker aktualisiert');
 			closeEditModal();
 		} else {
-			toast.error(result.error || 'Fehler beim Speichern');
+			toast.error(result.error || $_('common.error_saving'));
 		}
 	}
 
@@ -126,7 +126,7 @@
 		if (result.success) {
 			toast.success('Wecker gelöscht');
 		} else {
-			toast.error(result.error || 'Fehler beim Löschen');
+			toast.error(result.error || $_('common.error_deleting'));
 		}
 	}
 
diff --git a/apps/manacore/apps/web/src/routes/(app)/todo/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/todo/+page.svelte
index d5c8bdf99..51e9676ca 100644
--- a/apps/manacore/apps/web/src/routes/(app)/todo/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/todo/+page.svelte
@@ -317,7 +317,7 @@
 		</div>
 		<div class="todo-header-actions">
 			<SyncIndicator />
-			<a href="/todo/settings" class="settings-btn" title="Einstellungen">
+			<a href="/todo/settings" class="settings-btn" title={$_('common.settings')}>
 				<Gear size={16} />
 			</a>
 		</div>
@@ -437,7 +437,11 @@
 					>
 						<ArrowsOut size={12} />
 					</button>
-					<button class="tab-close" onclick={() => handleRemovePage(page.id)} title="Schließen">
+					<button
+						class="tab-close"
+						onclick={() => handleRemovePage(page.id)}
+						title={$_('common.close')}
+					>
 						<X size={12} />
 					</button>
 				</div>
diff --git a/apps/manacore/apps/web/src/routes/(app)/uload/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/uload/+page.svelte
index f083aa88e..78067257c 100644
--- a/apps/manacore/apps/web/src/routes/(app)/uload/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/uload/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import {
 		useAllLinks,
 		useAllTags,
@@ -562,7 +563,7 @@
 								<button
 									onclick={() => openEdit(link)}
 									class="rounded-lg p-2 opacity-0 transition-all hover:bg-gray-100 group-hover:opacity-100 dark:hover:bg-gray-700"
-									title="Bearbeiten"
+									title={$_('common.edit')}
 								>
 									<PencilSimple size={16} />
 								</button>
diff --git a/apps/manacore/apps/web/src/routes/(app)/uload/tags/+page.svelte b/apps/manacore/apps/web/src/routes/(app)/uload/tags/+page.svelte
index 44e5c0bca..73428908d 100644
--- a/apps/manacore/apps/web/src/routes/(app)/uload/tags/+page.svelte
+++ b/apps/manacore/apps/web/src/routes/(app)/uload/tags/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { _ } from 'svelte-i18n';
 	import { uloadTagTable, useAllTags, useAllLinkTags, slugify } from '$lib/modules/uload';
 	import type { LocalTag } from '$lib/modules/uload';
 	import { toast } from 'svelte-sonner';
@@ -122,12 +123,13 @@
 								<input type="color" bind:value={editingTag.color} class="h-8 w-12 rounded" />
 								<button
 									onclick={updateTag}
-									class="rounded bg-indigo-600 px-3 py-1 text-sm text-white">Speichern</button
+									class="rounded bg-indigo-600 px-3 py-1 text-sm text-white"
+									>{$_('common.save')}</button
 								>
 								<button
 									onclick={() => (editingTag = null)}
 									class="rounded border border-white/10 px-3 py-1 text-sm text-white/60"
-									>Abbrechen</button
+									>{$_('common.cancel')}</button
 								>
 							</div>
 						</div>