diff --git a/frontend/src/components/LoginPage.vue b/frontend/src/components/LoginPage.vue
index 1682841..8bfadac 100644
--- a/frontend/src/components/LoginPage.vue
+++ b/frontend/src/components/LoginPage.vue
@@ -1,6 +1,6 @@
 <script setup>
 // --- Render icon helper for dropdown items ---
-import { computed, h, onMounted, ref } from 'vue'
+import { computed, h, onMounted, ref, watch } from 'vue'
 import { NIcon, useThemeVars } from 'naive-ui'
 import iconUrl from '@/assets/images/icon.png'
 import usePreferencesStore from '@/stores/preferences.js'
@@ -8,9 +8,11 @@ import LangIcon from '@/components/icons/Lang.vue'
 
 import { Login } from '@/utils/api.js'
 import { lang } from '@/langs/index.js'
+import { useI18n } from 'vue-i18n'
 
 const themeVars = useThemeVars()
 const prefStore = usePreferencesStore()
+const i18n = useI18n()
 const emit = defineEmits(['login'])
 
 // --- Theme ---
@@ -46,7 +48,9 @@ const currentThemeLabel = computed(() => {
 })
 
 const onThemeSelect = (key) => {
-    if (!['auto', 'light', 'dark'].includes(key)) return
+    if (!['auto', 'light', 'dark'].includes(key)) {
+        return
+    }
     themeMode.value = key
     prefStore.general.theme = key
     localStorage.setItem(THEME_KEY, key)
@@ -84,7 +88,9 @@ const currentLangLabel = computed(() => {
 
 const onLangSelect = (key) => {
     const valid = ['auto', ...Object.keys(langNames)]
-    if (!valid.includes(key)) return
+    if (!valid.includes(key)) {
+        return
+    }
     langSetting.value = key
     localStorage.setItem(LANG_KEY, key)
 }
@@ -148,150 +154,18 @@ const AutoSvg = {
             [h('circle', { cx: '12', cy: '12', r: '10' }), h('path', { d: 'M12 2a10 10 0 0 1 0 20V2' })],
         ),
 }
-const LangSvg = {
-    render: () =>
-        h(
-            'svg',
-            {
-                xmlns: 'http://www.w3.org/2000/svg',
-                viewBox: '0 0 24 24',
-                width: '1em',
-                height: '1em',
-                fill: 'none',
-                stroke: 'currentColor',
-                'stroke-width': '2',
-                'stroke-linecap': 'round',
-                'stroke-linejoin': 'round',
-            },
-            [
-                h('path', { d: 'M5 8l6 6' }),
-                h('path', { d: 'M4 14l6-6 2-3' }),
-                h('path', { d: 'M2 5h12' }),
-                h('path', { d: 'M7 2h1' }),
-                h('path', { d: 'M22 22l-5-10-5 10' }),
-                h('path', { d: 'M14 18h6' }),
-            ],
-        ),
-}
 
-const iconMap = { sun: SunSvg, moon: MoonSvg, auto: AutoSvg, lang: LangSvg }
+const iconMap = { sun: SunSvg, moon: MoonSvg, auto: AutoSvg }
 const renderIcon = (name) => () => h(NIcon, null, { default: () => h(iconMap[name]) })
 
-// --- i18n texts ---
-const langTexts = {
-    zh: {
-        title: '登录',
-        username: '用户名',
-        password: '密码',
-        usernamePh: '请输入用户名',
-        passwordPh: '请输入密码',
-        submit: '登 录',
-        tooMany: '尝试次数过多，请稍后再试',
-        failed: '用户名或密码错误',
-        network: '网络错误',
+// --- i18n ---
+watch(
+    currentLang,
+    (val) => {
+        i18n.locale.value = val
     },
-    tw: {
-        title: '登入',
-        username: '使用者名稱',
-        password: '密碼',
-        usernamePh: '請輸入使用者名稱',
-        passwordPh: '請輸入密碼',
-        submit: '登 入',
-        tooMany: '嘗試次數過多，請稍後再試',
-        failed: '使用者名稱或密碼錯誤',
-        network: '網路錯誤',
-    },
-    ja: {
-        title: 'ログイン',
-        username: 'ユーザー名',
-        password: 'パスワード',
-        usernamePh: 'ユーザー名を入力',
-        passwordPh: 'パスワードを入力',
-        submit: 'ログイン',
-        tooMany: '試行回数が多すぎます',
-        failed: 'ユーザー名またはパスワードが正しくありません',
-        network: 'ネットワークエラー',
-    },
-    ko: {
-        title: '로그인',
-        username: '사용자 이름',
-        password: '비밀번호',
-        usernamePh: '사용자 이름 입력',
-        passwordPh: '비밀번호 입력',
-        submit: '로그인',
-        tooMany: '시도 횟수 초과, 잠시 후 다시 시도하세요',
-        failed: '사용자 이름 또는 비밀번호가 올바르지 않습니다',
-        network: '네트워크 오류',
-    },
-    es: {
-        title: 'Iniciar sesión',
-        username: 'Usuario',
-        password: 'Contraseña',
-        usernamePh: 'Ingrese usuario',
-        passwordPh: 'Ingrese contraseña',
-        submit: 'Entrar',
-        tooMany: 'Demasiados intentos, intente más tarde',
-        failed: 'Credenciales inválidas',
-        network: 'Error de red',
-    },
-    fr: {
-        title: 'Connexion',
-        username: "Nom d'utilisateur",
-        password: 'Mot de passe',
-        usernamePh: "Entrez le nom d'utilisateur",
-        passwordPh: 'Entrez le mot de passe',
-        submit: 'Se connecter',
-        tooMany: 'Trop de tentatives, réessayez plus tard',
-        failed: 'Identifiants invalides',
-        network: 'Erreur réseau',
-    },
-    ru: {
-        title: 'Вход',
-        username: 'Имя пользователя',
-        password: 'Пароль',
-        usernamePh: 'Введите имя пользователя',
-        passwordPh: 'Введите пароль',
-        submit: 'Войти',
-        tooMany: 'Слишком много попыток, попробуйте позже',
-        failed: 'Неверные учётные данные',
-        network: 'Ошибка сети',
-    },
-    pt: {
-        title: 'Entrar',
-        username: 'Usuário',
-        password: 'Senha',
-        usernamePh: 'Digite o usuário',
-        passwordPh: 'Digite a senha',
-        submit: 'Entrar',
-        tooMany: 'Muitas tentativas, tente novamente mais tarde',
-        failed: 'Credenciais inválidas',
-        network: 'Erro de rede',
-    },
-    tr: {
-        title: 'Giriş',
-        username: 'Kullanıcı adı',
-        password: 'Şifre',
-        usernamePh: 'Kullanıcı adını girin',
-        passwordPh: 'Şifreyi girin',
-        submit: 'Giriş Yap',
-        tooMany: 'Çok fazla deneme, lütfen daha sonra tekrar deneyin',
-        failed: 'Geçersiz kimlik bilgileri',
-        network: 'Ağ hatası',
-    },
-    en: {
-        title: 'Sign In',
-        username: 'Username',
-        password: 'Password',
-        usernamePh: 'Enter username',
-        passwordPh: 'Enter password',
-        submit: 'Sign In',
-        tooMany: 'Too many attempts, please try later',
-        failed: 'Invalid credentials',
-        network: 'Network error',
-    },
-}
-
-const t = computed(() => langTexts[currentLang.value] || langTexts.en)
+    { immediate: true },
+)
 
 // --- Form ---
 const username = ref('')
@@ -309,16 +183,16 @@ const handleLogin = async () => {
     try {
         const { msg, success = false } = await Login(username.value, password.value)
         if (msg === 'too_many_attempts') {
-            errorMsg.value = t.value.tooMany
+            errorMsg.value = $t('login.too_many_attempts')
             return
         }
         if (!success) {
-            errorMsg.value = t.value.failed
+            errorMsg.value = $t('login.invalid_credentials')
             return
         }
         emit('login')
     } catch (e) {
-        errorMsg.value = t.value.network
+        errorMsg.value = $t('login.network_error')
     } finally {
         loading.value = false
     }
@@ -331,22 +205,22 @@ const handleLogin = async () => {
             <div class="login-header">
                 <n-avatar :size="64" :src="iconUrl" color="#0000" />
                 <div class="login-title">Tiny RDM</div>
-                <n-text depth="3" style="font-size: 13px">Redis Web Manager</n-text>
+                <!--                <n-text depth="3" style="font-size: 13px">Redis Web Manager</n-text>-->
             </div>
 
             <n-form class="login-form" @submit.prevent="handleLogin">
-                <n-form-item :label="t.username">
+                <n-form-item :label="$t('dialogue.connection.usr')">
                     <n-input
                         v-model:value="username"
-                        :placeholder="t.usernamePh"
+                        :placeholder="$t('login.username_placeholder')"
                         autofocus
                         size="large"
                         @keydown.enter="handleLogin" />
                 </n-form-item>
-                <n-form-item :label="t.password">
+                <n-form-item :label="$t('dialogue.connection.pwd')">
                     <n-input
                         v-model:value="password"
-                        :placeholder="t.passwordPh"
+                        :placeholder="$t('login.password_placeholder')"
                         show-password-on="click"
                         size="large"
                         type="password"
@@ -366,7 +240,7 @@ const handleLogin = async () => {
                     style="margin-top: 8px"
                     type="primary"
                     @click="handleLogin">
-                    {{ t.submit }}
+                    {{ $t('login.submit') }}
                 </n-button>
             </n-form>
 
diff --git a/frontend/src/langs/en-us.json b/frontend/src/langs/en-us.json
index caf9dfb..794c9a9 100644
--- a/frontend/src/langs/en-us.json
+++ b/frontend/src/langs/en-us.json
@@ -403,6 +403,14 @@
       "website": "Official Website"
     }
   },
+  "login": {
+    "username_placeholder": "Enter username",
+    "password_placeholder": "Enter password",
+    "submit": "Sign In",
+    "too_many_attempts": "Too many attempts, please try later",
+    "invalid_credentials": "Invalid credentials",
+    "network_error": "Network error"
+  },
   "menu": {
     "minimise": "Minimise",
     "maximise": "Maximise",
diff --git a/frontend/src/langs/es-es.json b/frontend/src/langs/es-es.json
index af2143a..372a3f5 100644
--- a/frontend/src/langs/es-es.json
+++ b/frontend/src/langs/es-es.json
@@ -403,6 +403,14 @@
       "website": "Sitio web oficial"
     }
   },
+  "login": {
+    "username_placeholder": "Ingrese usuario",
+    "password_placeholder": "Ingrese contraseña",
+    "submit": "Entrar",
+    "too_many_attempts": "Demasiados intentos, intente más tarde",
+    "invalid_credentials": "Credenciales inválidas",
+    "network_error": "Error de red"
+  },
   "menu": {
     "minimise": "Minimizar",
     "maximise": "Maximizar",
diff --git a/frontend/src/langs/fr-fr.json b/frontend/src/langs/fr-fr.json
index 80798e1..5499d2a 100644
--- a/frontend/src/langs/fr-fr.json
+++ b/frontend/src/langs/fr-fr.json
@@ -403,6 +403,14 @@
       "website": "Site officiel"
     }
   },
+  "login": {
+    "username_placeholder": "Entrez le nom d'utilisateur",
+    "password_placeholder": "Entrez le mot de passe",
+    "submit": "Se connecter",
+    "too_many_attempts": "Trop de tentatives, réessayez plus tard",
+    "invalid_credentials": "Identifiants invalides",
+    "network_error": "Erreur réseau"
+  },
   "menu": {
     "minimise": "Minimiser",
     "maximise": "Maximiser",
diff --git a/frontend/src/langs/ja-jp.json b/frontend/src/langs/ja-jp.json
index fd40d73..c0dc765 100644
--- a/frontend/src/langs/ja-jp.json
+++ b/frontend/src/langs/ja-jp.json
@@ -403,6 +403,14 @@
       "website": "公式ウェブサイト"
     }
   },
+  "login": {
+    "username_placeholder": "ユーザー名を入力",
+    "password_placeholder": "パスワードを入力",
+    "submit": "ログイン",
+    "too_many_attempts": "試行回数が多すぎます",
+    "invalid_credentials": "ユーザー名またはパスワードが正しくありません",
+    "network_error": "ネットワークエラー"
+  },
   "menu": {
     "minimise": "最小化",
     "maximise": "最大化",
diff --git a/frontend/src/langs/ko-kr.json b/frontend/src/langs/ko-kr.json
index acc917d..a4b2e59 100644
--- a/frontend/src/langs/ko-kr.json
+++ b/frontend/src/langs/ko-kr.json
@@ -403,6 +403,14 @@
       "website": "공식 웹사이트"
     }
   },
+  "login": {
+    "username_placeholder": "사용자 이름 입력",
+    "password_placeholder": "비밀번호 입력",
+    "submit": "로그인",
+    "too_many_attempts": "시도 횟수 초과, 잠시 후 다시 시도하세요",
+    "invalid_credentials": "사용자 이름 또는 비밀번호가 올바르지 않습니다",
+    "network_error": "네트워크 오류"
+  },
   "menu": {
     "minimise": "최소화",
     "maximise": "최대화",
diff --git a/frontend/src/langs/pt-br.json b/frontend/src/langs/pt-br.json
index 2d65a81..62b1763 100644
--- a/frontend/src/langs/pt-br.json
+++ b/frontend/src/langs/pt-br.json
@@ -403,6 +403,14 @@
       "website": "Site Oficial"
     }
   },
+  "login": {
+    "username_placeholder": "Digite o usuário",
+    "password_placeholder": "Digite a senha",
+    "submit": "Entrar",
+    "too_many_attempts": "Muitas tentativas, tente novamente mais tarde",
+    "invalid_credentials": "Credenciais inválidas",
+    "network_error": "Erro de rede"
+  },
   "menu": {
     "minimise": "Minimizar",
     "maximise": "Maximizar",
diff --git a/frontend/src/langs/ru-ru.json b/frontend/src/langs/ru-ru.json
index c041b52..7b77542 100644
--- a/frontend/src/langs/ru-ru.json
+++ b/frontend/src/langs/ru-ru.json
@@ -403,6 +403,14 @@
       "website": "Официальный сайт"
     }
   },
+  "login": {
+    "username_placeholder": "Введите имя пользователя",
+    "password_placeholder": "Введите пароль",
+    "submit": "Войти",
+    "too_many_attempts": "Слишком много попыток, попробуйте позже",
+    "invalid_credentials": "Неверные учётные данные",
+    "network_error": "Ошибка сети"
+  },
   "menu": {
     "minimise": "Свернуть",
     "maximise": "Развернуть",
diff --git a/frontend/src/langs/tr-tr.json b/frontend/src/langs/tr-tr.json
index e0297f1..486729d 100644
--- a/frontend/src/langs/tr-tr.json
+++ b/frontend/src/langs/tr-tr.json
@@ -403,6 +403,14 @@
       "website": "Resmi Web Sitesi"
     }
   },
+  "login": {
+    "username_placeholder": "Kullanıcı adını girin",
+    "password_placeholder": "Şifreyi girin",
+    "submit": "Giriş Yap",
+    "too_many_attempts": "Çok fazla deneme, lütfen daha sonra tekrar deneyin",
+    "invalid_credentials": "Geçersiz kimlik bilgileri",
+    "network_error": "Ağ hatası"
+  },
   "menu": {
     "minimise": "Küçült",
     "maximise": "Büyüt",
diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json
index a452161..9dc8f51 100644
--- a/frontend/src/langs/zh-cn.json
+++ b/frontend/src/langs/zh-cn.json
@@ -403,6 +403,14 @@
       "website": "官方网站"
     }
   },
+  "login": {
+    "username_placeholder": "请输入用户名",
+    "password_placeholder": "请输入密码",
+    "submit": "登录",
+    "too_many_attempts": "尝试次数过多，请稍后再试",
+    "invalid_credentials": "用户名或密码错误",
+    "network_error": "网络错误"
+  },
   "menu": {
     "minimise": "最小化",
     "maximise": "最大化",
diff --git a/frontend/src/langs/zh-tw.json b/frontend/src/langs/zh-tw.json
index bad4535..a477569 100644
--- a/frontend/src/langs/zh-tw.json
+++ b/frontend/src/langs/zh-tw.json
@@ -403,6 +403,14 @@
       "website": "官方網站"
     }
   },
+  "login": {
+    "username_placeholder": "請輸入使用者名稱",
+    "password_placeholder": "請輸入密碼",
+    "submit": "登入",
+    "too_many_attempts": "嘗試次數過多，請稍後再試",
+    "invalid_credentials": "使用者名稱或密碼錯誤",
+    "network_error": "網路錯誤"
+  },
   "menu": {
     "minimise": "最小化",
     "maximise": "最大化",