diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte
index fbe8337..bbfbaf5 100644
--- a/frontend/src/lib/components/Navbar.svelte
+++ b/frontend/src/lib/components/Navbar.svelte
@@ -13,6 +13,18 @@
 	import { t, locale, locales } from 'svelte-i18n';
 	import { themes } from '$lib';
 
+	let languages: { [key: string]: string } = {
+		en: 'English',
+		de: 'Deutsch',
+		es: 'Español',
+		fr: 'Français',
+		it: 'Italiano',
+		nl: 'Nederlands',
+		sv: 'Svenska',
+		zh: '中文',
+		pl: 'Polski'
+	};
+
 	let query: string = '';
 
 	let isAboutModalOpen: boolean = false;
@@ -236,8 +248,8 @@
 						on:change={submitLocaleChange}
 						bind:value={$locale}
 					>
-						{#each $locales as loc}
-							<option value={loc} class="text-base-content">{$t(`languages.${loc}`)}</option>
+						{#each $locales as loc (loc)}
+							<option value={loc} class="text-base-content">{languages[loc]}</option>
 						{/each}
 					</select>
 					<input type="hidden" name="locale" value={$locale} />
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 0904392..a8edb0d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "Besuchte Regionen anzeigen",
     "view_details": "Details anzeigen"
   },
-  "languages": {
-    "de": "Deutsch",
-    "en": "Englisch",
-    "es": "Spanisch",
-    "fr": "Französisch",
-    "it": "Italienisch",
-    "nl": "Niederländisch",
-    "sv": "Schwedisch",
-    "zh": "chinesisch",
-    "pl": "Polnisch"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "Keine Benutzer geteilt mit",
     "not_shared_with": "Nicht geteilt mit",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 2acebc9..d64bdaa 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -467,17 +467,7 @@
 		"set_public": "In order to allow users to share with you, you need your profile set to public.",
 		"go_to_settings": "Go to settings"
 	},
-	"languages": {
-		"en": "English",
-		"de": "German",
-		"es": "Spanish",
-		"fr": "French",
-		"it": "Italian",
-		"nl": "Dutch",
-		"sv": "Swedish",
-		"zh": "Chinese",
-		"pl": "Polish"
-	},
+	"languages": {},
 	"profile": {
 		"member_since": "Member since",
 		"user_stats": "User Stats",
diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json
index aa23a71..a66b5ca 100644
--- a/frontend/src/locales/es.json
+++ b/frontend/src/locales/es.json
@@ -467,17 +467,7 @@
     "no_shared_found": "No se encontraron colecciones que se compartan contigo.",
     "set_public": "Para permitir que los usuarios compartan contenido con usted, necesita que su perfil esté configurado como público."
   },
-  "languages": {
-    "de": "Alemán",
-    "en": "Inglés",
-    "es": "Español",
-    "fr": "Francés",
-    "it": "italiano",
-    "nl": "Holandés",
-    "sv": "sueco",
-    "zh": "Chino",
-    "pl": "Polaco"
-  },
+  "languages": {},
   "profile": {
     "member_since": "Miembro desde",
     "user_stats": "Estadísticas de usuario",
diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json
index eaa8842..a6aa22d 100644
--- a/frontend/src/locales/fr.json
+++ b/frontend/src/locales/fr.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "Afficher les régions visitées",
     "view_details": "Afficher les détails"
   },
-  "languages": {
-    "de": "Allemand",
-    "en": "Anglais",
-    "es": "Espagnol",
-    "fr": "Français",
-    "it": "italien",
-    "nl": "Néerlandais",
-    "sv": "suédois",
-    "zh": "Chinois",
-    "pl": "Polonais"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "Aucun utilisateur partagé avec",
     "not_shared_with": "Non partagé avec",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 0b880a9..8f93cdd 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "Mostra regioni visitate",
     "view_details": "Visualizza dettagli"
   },
-  "languages": {
-    "de": "tedesco",
-    "en": "Inglese",
-    "es": "spagnolo",
-    "fr": "francese",
-    "it": "Italiano",
-    "nl": "Olandese",
-    "sv": "svedese",
-    "zh": "cinese",
-    "pl": "Polacco"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "Nessun utente condiviso con",
     "not_shared_with": "Non condiviso con",
diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json
index f00fac4..149baba 100644
--- a/frontend/src/locales/nl.json
+++ b/frontend/src/locales/nl.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "Toon bezochte regio's",
     "view_details": "Details bekijken"
   },
-  "languages": {
-    "de": "Duits",
-    "en": "Engels",
-    "es": "Spaans",
-    "fr": "Frans",
-    "it": "Italiaans",
-    "nl": "Nederlands",
-    "sv": "Zweeds",
-    "zh": "Chinese",
-    "pl": "Pools"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "Er zijn geen gebruikers gedeeld",
     "not_shared_with": "Niet gedeeld met",
diff --git a/frontend/src/locales/pl.json b/frontend/src/locales/pl.json
index b9a13cf..3e369b9 100644
--- a/frontend/src/locales/pl.json
+++ b/frontend/src/locales/pl.json
@@ -467,17 +467,7 @@
     "set_public": "Aby umożliwić użytkownikom udostępnianie Tobie, musisz ustawić swój profil jako publiczny.",
     "go_to_settings": "Przejdź do ustawień"
   },
-  "languages": {
-    "en": "Angielski",
-    "de": "Niemiecki",
-    "es": "Hiszpański",
-    "fr": "Francuski",
-    "it": "Włoski",
-    "nl": "Holenderski",
-    "sv": "Szwedzki",
-    "zh": "Chiński",
-    "pl": "Polski"
-  },
+  "languages": {},
   "profile": {
     "member_since": "Użytkownik od",
     "user_stats": "Statystyki użytkownika",
diff --git a/frontend/src/locales/sv.json b/frontend/src/locales/sv.json
index a4c443c..214393c 100644
--- a/frontend/src/locales/sv.json
+++ b/frontend/src/locales/sv.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "Visa besökta regioner",
     "view_details": "Visa detaljer"
   },
-  "languages": {
-    "de": "tyska",
-    "en": "engelska",
-    "es": "spanska",
-    "fr": "franska",
-    "it": "italienska",
-    "nl": "holländska",
-    "sv": "svenska",
-    "zh": "kinesiska",
-    "pl": "polska"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "Inga användare delas med",
     "not_shared_with": "Inte delad med",
diff --git a/frontend/src/locales/zh.json b/frontend/src/locales/zh.json
index 4444be9..f9ee907 100644
--- a/frontend/src/locales/zh.json
+++ b/frontend/src/locales/zh.json
@@ -455,17 +455,7 @@
     "show_visited_regions": "显示访问过的地区",
     "view_details": "查看详情"
   },
-  "languages": {
-    "de": "德语",
-    "en": "英语",
-    "es": "西班牙语",
-    "fr": "法语",
-    "it": "意大利语",
-    "nl": "荷兰语",
-    "sv": "瑞典",
-    "zh": "中国人",
-    "pl": "波兰语"
-  },
+  "languages": {},
   "share": {
     "no_users_shared": "没有与之共享的用户",
     "not_shared_with": "不与共享",