From cf5e6ed5b5da9ee311c0b5dcc7db06dbd1c32dc3 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Tue, 27 Dec 2022 18:49:15 +0100
Subject: [PATCH] i18n: rename keys

---
 components/nav/NavBottomMoreMenu.vue  |  6 +++---
 components/nav/NavFooter.vue          | 24 ++++++++++++------------
 components/nav/NavSide.vue            | 16 ++++++++--------
 components/search/SearchWidget.vue    |  2 +-
 components/user/UserSignInEntry.vue   | 10 ++++++----
 components/user/UserSwitcher.vue      |  2 +-
 locales/ar-EG.json                    | 22 +++++++++-------------
 locales/cs-CZ.json                    | 22 +++++++++-------------
 locales/de-DE.json                    | 22 +++++++++-------------
 locales/en-US.json                    | 27 ++++++++++++---------------
 locales/es-ES.json                    | 24 ++++++++++--------------
 locales/fr-FR.json                    | 22 +++++++++-------------
 locales/ja-JP.json                    | 20 +++++++++-----------
 locales/zh-CN.json                    | 26 +++++++++++---------------
 pages/[[server]]/@[account]/index.vue |  2 +-
 pages/[[server]]/explore.vue          |  2 +-
 pages/[[server]]/explore/index.vue    |  2 +-
 pages/[[server]]/explore/links.vue    |  2 +-
 pages/[[server]]/explore/tags.vue     |  2 +-
 pages/[[server]]/explore/users.vue    |  2 +-
 pages/bookmarks.vue                   |  4 ++--
 pages/conversations.vue               |  4 ++--
 pages/favourites.vue                  |  4 ++--
 pages/home.vue                        |  4 ++--
 pages/notifications.vue               |  2 +-
 pages/notifications/index.vue         |  2 +-
 pages/notifications/mention.vue       |  2 +-
 pages/settings.vue                    |  2 +-
 28 files changed, 127 insertions(+), 154 deletions(-)

diff --git a/components/nav/NavBottomMoreMenu.vue b/components/nav/NavBottomMoreMenu.vue
index 187e213a..983182e6 100644
--- a/components/nav/NavBottomMoreMenu.vue
+++ b/components/nav/NavBottomMoreMenu.vue
@@ -92,7 +92,7 @@ onBeforeUnmount(() => {
                 @click.stop
               >
                 <span class="i-ri:earth-line flex-shrink-0 text-xl mr-4 !align-middle" />
-                {{ $t('nav_footer.select_language') }}
+                {{ $t('nav.select_language') }}
               </button>
             </NavSelectLanguage>
             <!-- Switch font size -->
@@ -106,7 +106,7 @@ onBeforeUnmount(() => {
                 @click.stop
               >
                 <span class="i-ri:font-size flex-shrink-0 text-xl mr-4 !align-middle" />
-                {{ $t('nav_footer.select_font_size') }}
+                {{ $t('nav.select_font_size') }}
               </button>
             </NavSelectFontSize>
             <!-- Toggle Feature Flags -->
@@ -120,7 +120,7 @@ onBeforeUnmount(() => {
                 @click.stop
               >
                 <span class="i-ri:flag-line flex-shrink-0 text-xl mr-4 !align-middle" />
-                {{ $t('nav_footer.select_feature_flags') }}
+                {{ $t('nav.select_feature_flags') }}
               </button>
             </NavSelectFeatureFlags>
           </div>
diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index 15bcccae..b31d786f 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -10,37 +10,37 @@ const buildTimeAgo = useTimeAgo(buildTimeDate, timeAgoOptions)
 <template>
   <footer p4 text-sm text-secondary-light flex="~ col">
     <div flex="~ gap2" items-center mb4>
-      <CommonTooltip :content="$t('nav_footer.toggle_theme')">
-        <button flex i-ri:sun-line dark:i-ri:moon-line text-lg :aria-label="$t('nav_footer.toggle_theme')" @click="toggleDark()" />
+      <CommonTooltip :content="$t('nav.toggle_theme')">
+        <button flex i-ri:sun-line dark:i-ri:moon-line text-lg :aria-label="$t('nav.toggle_theme')" @click="toggleDark()" />
       </CommonTooltip>
-      <CommonTooltip :content="$t('nav_footer.zen_mode')">
+      <CommonTooltip :content="$t('nav.zen_mode')">
         <button
           flex
           text-lg
           :class="isZenMode ? 'i-ri:layout-right-2-line' : 'i-ri:layout-right-line'"
-          :aria-label="$t('nav_footer.zen_mode')"
+          :aria-label="$t('nav.zen_mode')"
           @click="toggleZenMode()"
         />
       </CommonTooltip>
-      <CommonTooltip :content="$t('nav_side.settings')">
+      <CommonTooltip :content="$t('nav.settings')">
         <NuxtLink
           flex
           text-lg
           to="/settings"
           i-ri:settings-4-line
-          :aria-label="$t('nav_side.settings')"
+          :aria-label="$t('nav.settings')"
         />
       </CommonTooltip>
       <NavSelectLanguage>
-        <CommonTooltip :content="$t('nav_footer.select_language')">
-          <button flex :aria-label="$t('nav_footer.select_language')">
+        <CommonTooltip :content="$t('nav.select_language')">
+          <button flex :aria-label="$t('nav.select_language')">
             <div i-ri:earth-line text-lg />
           </button>
         </CommonTooltip>
       </NavSelectLanguage>
       <NavSelectFontSize>
-        <CommonTooltip :content="$t('nav_footer.select_font_size')">
-          <button flex :aria-label="$t('nav_footer.select_font_size')">
+        <CommonTooltip :content="$t('nav.select_font_size')">
+          <button flex :aria-label="$t('nav.select_font_size')">
             <div i-ri:font-size text-lg />
           </button>
         </CommonTooltip>
@@ -48,12 +48,12 @@ const buildTimeAgo = useTimeAgo(buildTimeDate, timeAgoOptions)
     </div>
     <div>
       <button cursor-pointer hover:underline @click="openPreviewHelp">
-        {{ $t('nav_footer.show_intro') }}
+        {{ $t('nav.show_intro') }}
       </button>
     </div>
     <div>{{ $t('app_desc_short') }}</div>
     <div>
-      <i18n-t keypath="nav_footer.built_at">
+      <i18n-t keypath="nav.built_at">
         <time :datetime="String(buildTimeDate)" :title="$d(buildTimeDate, 'long')">{{ buildTimeAgo }}</time>
       </i18n-t>
       <template v-if="buildInfo.version">
diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 133d23ac..48e58070 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -4,8 +4,8 @@ const { notifications } = useNotifications()
 
 <template>
   <nav sm:px3 sm:py4 flex="~ col gap2" text-size-base leading-normal md:text-lg>
-    <NavSideItem :text="$t('nav_side.home')" to="/home" icon="i-ri:home-5-line" user-only />
-    <NavSideItem :text="$t('nav_side.notifications')" to="/notifications" icon="i-ri:notification-4-line" user-only>
+    <NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only />
+    <NavSideItem :text="$t('nav.notifications')" to="/notifications" icon="i-ri:notification-4-line" user-only>
       <template #icon>
         <div flex relative>
           <div class="i-ri:notification-4-line" md:text-size-inherit text-xl />
@@ -15,11 +15,11 @@ const { notifications } = useNotifications()
         </div>
       </template>
     </NavSideItem>
-    <NavSideItem :text="$t('nav_side.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" />
-    <NavSideItem :text="$t('nav_side.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " />
-    <NavSideItem :text="$t('nav_side.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" />
-    <NavSideItem :text="$t('nav_side.conversations')" to="/conversations" icon="i-ri:at-line" user-only />
-    <NavSideItem :text="$t('nav_side.favourites')" to="/favourites" icon="i-ri:heart-3-line" user-only />
-    <NavSideItem :text="$t('nav_side.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line " user-only />
+    <NavSideItem :text="$t('nav.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" />
+    <NavSideItem :text="$t('nav.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " />
+    <NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" />
+    <NavSideItem :text="$t('nav.conversations')" to="/conversations" icon="i-ri:at-line" user-only />
+    <NavSideItem :text="$t('nav.favourites')" to="/favourites" icon="i-ri:heart-3-line" user-only />
+    <NavSideItem :text="$t('nav.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line " user-only />
   </nav>
 </template>
diff --git a/components/search/SearchWidget.vue b/components/search/SearchWidget.vue
index 29f986aa..53f7967c 100644
--- a/components/search/SearchWidget.vue
+++ b/components/search/SearchWidget.vue
@@ -66,7 +66,7 @@ const activate = () => {
         outline="focus:none"
         pr-4
         rtl-pl-4
-        :placeholder="t('nav_side.search', ['Elk'])"
+        :placeholder="t('nav.search', ['Elk'])"
         pb="1px"
         placeholder-text-secondary
         @keydown.down.prevent="shift(1)"
diff --git a/components/user/UserSignInEntry.vue b/components/user/UserSignInEntry.vue
index f210c2cc..7ea0d384 100644
--- a/components/user/UserSignInEntry.vue
+++ b/components/user/UserSignInEntry.vue
@@ -1,12 +1,14 @@
 <template>
-  <div p8 flex="~ col gap4" hidden lg:block>
+  <div p8 lg:flex="~ col gap2" hidden>
     <p v-if="isMastoInitialised" text-sm>
-      Viewing <strong>{{ currentServer }}</strong> public data
+      <i18n-t keypath="user.sign_in_notice_title">
+        <strong>{{ currentServer }}</strong>
+      </i18n-t>
     </p>
     <p text-sm text-secondary>
-      {{ $t('nav_user.sign_in_desc') }}
+      {{ $t('user.sign_in_desc') }}
     </p>
-    <button class="btn-solid text-center" @click="openSigninDialog()">
+    <button btn-solid text-center mt-2 @click="openSigninDialog()">
       {{ $t('action.sign_in') }}
     </button>
   </div>
diff --git a/components/user/UserSwitcher.vue b/components/user/UserSwitcher.vue
index 97107d04..68fa36c4 100644
--- a/components/user/UserSwitcher.vue
+++ b/components/user/UserSwitcher.vue
@@ -46,7 +46,7 @@ const switchUser = (user: UserLogin) => {
       />
       <NuxtLink to="/settings">
         <CommonDropdownItem
-          :text="$t('nav_side.settings')"
+          :text="$t('nav.settings')"
           icon="i-ri:settings-4-line"
         />
       </NuxtLink>
diff --git a/locales/ar-EG.json b/locales/ar-EG.json
index 72812cac..982c872a 100644
--- a/locales/ar-EG.json
+++ b/locales/ar-EG.json
@@ -113,16 +113,9 @@
     "unmute_account": "إلغاء كتم الحساب {0}",
     "unpin_on_profile": "إلغاء التثبيت من الملف الشخصي"
   },
-  "nav_footer": {
-    "built_at": "Built {0}",
-    "select_feature_flags": "تبديل علامات الميزات",
-    "select_language": "اختار اللغة",
-    "show_intro": "عرض المقدمة",
-    "toggle_theme": "تبديل المظهر",
-    "zen_mode": "الوضع الهادئ"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "الفواصل المرجعية",
+    "built_at": "Built {0}",
     "conversations": "المحادثات",
     "explore": "استكشف",
     "favourites": "المفضلة",
@@ -131,10 +124,12 @@
     "local": "المحلي",
     "notifications": "الإشعارات",
     "profile": "الصفحة التعريفية",
-    "search": "البحث"
-  },
-  "nav_user": {
-    "sign_in_desc": "قم بتسجيل الدخول لمتابعة الملفات الشخصية والمشاركة والرد على المنشورات أو التفاعل من حسابك على خادم مختلف"
+    "search": "البحث",
+    "select_feature_flags": "تبديل علامات الميزات",
+    "select_language": "اختار اللغة",
+    "show_intro": "عرض المقدمة",
+    "toggle_theme": "تبديل المظهر",
+    "zen_mode": "الوضع الهادئ"
   },
   "notification": {
     "favourited_post": "أُعجِب بمنشورك",
@@ -293,6 +288,7 @@
   "user": {
     "add_existing": "إضافة حساب قائم",
     "server_address_label": "عنوان خادم ماستودون",
+    "sign_in_desc": "قم بتسجيل الدخول لمتابعة الملفات الشخصية والمشاركة والرد على المنشورات أو التفاعل من حسابك على خادم مختلف",
     "sign_out_account": "تسجيل الخروج من {0}",
     "tip_no_account": "إذا ليس لديك حساب ماستودون ، {0}",
     "tip_register_account": "اختر خادم ماستودون الخاص بك وقم بتسجيل حساب"
diff --git a/locales/cs-CZ.json b/locales/cs-CZ.json
index 5be5b488..c4704a9c 100644
--- a/locales/cs-CZ.json
+++ b/locales/cs-CZ.json
@@ -109,16 +109,9 @@
     "unmute_account": "Odmlčet {0}",
     "unpin_on_profile": "Odepnout z profilu"
   },
-  "nav_footer": {
-    "built_at": "Zprovozněno {0}",
-    "select_feature_flags": "Zapnout funkce",
-    "select_language": "Vybrat jazyk",
-    "show_intro": "Zobrazit více informací o aplikaci",
-    "toggle_theme": "Přepnout vzhled",
-    "zen_mode": "Tichý režim"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "Záložky",
+    "built_at": "Zprovozněno {0}",
     "conversations": "Pošta",
     "explore": "Zajímavé",
     "favourites": "Oblíbené",
@@ -126,10 +119,12 @@
     "home": "Hlavní stránka",
     "local": "Lokální",
     "notifications": "Upozornění",
-    "profile": "Profil"
-  },
-  "nav_user": {
-    "sign_in_desc": "Přihlaste se, abyste mohli sledovat profily nebo hashtagy, psát a sdílet příspěvky a odpovídat na ně na tomto nebo jiných serverech."
+    "profile": "Profil",
+    "select_feature_flags": "Zapnout funkce",
+    "select_language": "Vybrat jazyk",
+    "show_intro": "Zobrazit více informací o aplikaci",
+    "toggle_theme": "Přepnout vzhled",
+    "zen_mode": "Tichý režim"
   },
   "notification": {
     "favourited_post": "si oblíbil váš příspěvek",
@@ -246,6 +241,7 @@
   "user": {
     "add_existing": "Přidat existující účet",
     "server_address_label": "Adresa Mastodon serveru:",
+    "sign_in_desc": "Přihlaste se, abyste mohli sledovat profily nebo hashtagy, psát a sdílet příspěvky a odpovídat na ně na tomto nebo jiných serverech.",
     "sign_out_account": "Odhlásit {0}",
     "tip_no_account": "Pokud nemáte účet na Mastodonu, {0}.",
     "tip_register_account": "vyberte server a zaregistrujte se"
diff --git a/locales/de-DE.json b/locales/de-DE.json
index c82217d8..64a3a2a4 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -109,16 +109,9 @@
     "unmute_account": "Stummschaltung von {0} aufheben",
     "unpin_on_profile": "Von Profil lösen"
   },
-  "nav_footer": {
-    "built_at": "Letzter Build: {0}",
-    "select_feature_flags": "Feature-Flags aktivieren",
-    "select_language": "Sprache auswählen",
-    "show_intro": "Intro anzeigen",
-    "toggle_theme": "Farbschema wechseln",
-    "zen_mode": "Zen-Modus"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "Lesezeichen",
+    "built_at": "Letzter Build: {0}",
     "conversations": "Direktnachrichten",
     "explore": "Entdecken",
     "favourites": "Favoriten",
@@ -127,10 +120,12 @@
     "local": "Lokal",
     "notifications": "Mitteilungen",
     "profile": "Profil",
-    "search": "Durchsuche {0}"
-  },
-  "nav_user": {
-    "sign_in_desc": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und zu beantworten oder von deinem Konto auf einem anderen Server aus zu interagieren."
+    "search": "Durchsuche {0}",
+    "select_feature_flags": "Feature-Flags aktivieren",
+    "select_language": "Sprache auswählen",
+    "show_intro": "Intro anzeigen",
+    "toggle_theme": "Farbschema wechseln",
+    "zen_mode": "Zen-Modus"
   },
   "notification": {
     "favourited_post": "hat deinen Beitrag favorisiert",
@@ -252,6 +247,7 @@
   "user": {
     "add_existing": "Bestehendes Konto hinzufügen",
     "server_address_label": "Mastodon Server Adresse",
+    "sign_in_desc": "Melde dich an, um Profilen oder Hashtags zu folgen, Beiträge zu favorisieren, zu teilen und zu beantworten oder von deinem Konto auf einem anderen Server aus zu interagieren.",
     "sign_out_account": "{0} abmelden",
     "tip_no_account": "Wenn du noch kein Mastodon-Konto hast, {0}.",
     "tip_register_account": "wähle einen Server aus und registriere eines"
diff --git a/locales/en-US.json b/locales/en-US.json
index c3aed523..af43d6dd 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -132,17 +132,9 @@
     "unmute_account": "Unmute {0}",
     "unpin_on_profile": "Unpin on profile"
   },
-  "nav_footer": {
-    "built_at": "Built {0}",
-    "select_feature_flags": "Toggle Feature Flags",
-    "select_font_size": "Select Font Size",
-    "select_language": "Select Language",
-    "show_intro": "Show intro",
-    "toggle_theme": "Toggle Theme",
-    "zen_mode": "Zen Mode"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "Bookmarks",
+    "built_at": "Built {0}",
     "conversations": "Conversations",
     "explore": "Explore",
     "favourites": "Favourites",
@@ -152,10 +144,13 @@
     "notifications": "Notifications",
     "profile": "Profile",
     "search": "Search {0}",
-    "settings": "Settings"
-  },
-  "nav_user": {
-    "sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server."
+    "select_feature_flags": "Toggle Feature Flags",
+    "select_font_size": "Select Font Size",
+    "select_language": "Select Language",
+    "settings": "Settings",
+    "show_intro": "Show intro",
+    "toggle_theme": "Toggle Theme",
+    "zen_mode": "Zen Mode"
   },
   "notification": {
     "favourited_post": "favourited your post",
@@ -225,7 +220,7 @@
     "feature_flags": {
       "avatar_on_avatar": "Avatar on Avatar",
       "github_cards": "GitHub Cards",
-      "title": "Experimental Feature Flags",
+      "title": "Experimental Features",
       "user_switcher_sidebar": "User Switcher Sidebar",
       "virtual_scroll": "Virtual Scrolling"
     },
@@ -348,6 +343,8 @@
   "user": {
     "add_existing": "Add an existing account",
     "server_address_label": "Mastodon Server Address",
+    "sign_in_desc": "Sign in to follow profiles or hashtags, favourite, share and reply to posts, or interact from your account on a different server.",
+    "sign_in_notice_title": "Viewing {0} public data",
     "sign_out_account": "Sign out {0}",
     "tip_no_account": "If you don't have a Mastodon account yet, {0}.",
     "tip_register_account": "pick your server and register one"
diff --git a/locales/es-ES.json b/locales/es-ES.json
index 49876348..526044ca 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -128,17 +128,9 @@
     "unmute_account": "Dejar de silenciar a {0}",
     "unpin_on_profile": "Desfijar del perfil"
   },
-  "nav_footer": {
-    "built_at": "Compilado {0}",
-    "select_feature_flags": "Cambiar marcadores de funcionalidades",
-    "select_font_size": "Cambiar tamaño de letra",
-    "select_language": "Cambiar idioma",
-    "show_intro": "Mostrar intro",
-    "toggle_theme": "Cambiar tema",
-    "zen_mode": "Modo Zen"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "Marcadores",
+    "built_at": "Compilado {0}",
     "conversations": "Conversaciones",
     "explore": "Explorar",
     "favourites": "Favoritos",
@@ -147,10 +139,13 @@
     "local": "Local",
     "notifications": "Notificaciones",
     "profile": "Perfil",
-    "search": "Buscar {0}"
-  },
-  "nav_user": {
-    "sign_in_desc": "Inicia sesión para seguir perfiles o hashtags, marcar como favorito, compartir and responder a publicaciones, o interactuar desde tu usuario con un servidor diferente."
+    "search": "Buscar {0}",
+    "select_feature_flags": "Cambiar marcadores de funcionalidades",
+    "select_font_size": "Cambiar tamaño de letra",
+    "select_language": "Cambiar idioma",
+    "show_intro": "Mostrar intro",
+    "toggle_theme": "Cambiar tema",
+    "zen_mode": "Modo Zen"
   },
   "notification": {
     "favourited_post": "marcó tu publicación como favorito",
@@ -311,6 +306,7 @@
   "user": {
     "add_existing": "Agregar una cuenta existente",
     "server_address_label": "Dirección de Servidor de Mastodon",
+    "sign_in_desc": "Inicia sesión para seguir perfiles o hashtags, marcar como favorito, compartir and responder a publicaciones, o interactuar desde tu usuario con un servidor diferente.",
     "sign_out_account": "Cerrar sesión {0}",
     "tip_no_account": "Si aún no tienes una cuenta Mastodon, {0}.",
     "tip_register_account": "selecciona tu servidor y registrate"
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index dff881fe..d378f945 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -127,16 +127,9 @@
     "unmute_account": "Enlever la sourdine à {0}",
     "unpin_on_profile": "Désépingler du profil"
   },
-  "nav_footer": {
-    "built_at": "Dernier build {0}",
-    "select_feature_flags": "Activer/Désactiver Feature Flags",
-    "select_language": "Selectionner langue",
-    "show_intro": "Ré-afficher l'introduction",
-    "toggle_theme": "Changer de thème",
-    "zen_mode": "Mode Zen"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "Marque-pages",
+    "built_at": "Dernier build {0}",
     "conversations": "Conversations",
     "explore": "Explorer",
     "favourites": "Favoris",
@@ -145,10 +138,12 @@
     "local": "Local",
     "notifications": "Notifications",
     "profile": "Profil",
-    "search": "Rechercher {0}"
-  },
-  "nav_user": {
-    "sign_in_desc": "Connectez-vous pour suivre des profils ou des hashtags, mettre en favoris, partager et répondre à des messages, ou interagir à partir de votre compte sur un autre serveur..."
+    "search": "Rechercher {0}",
+    "select_feature_flags": "Activer/Désactiver Feature Flags",
+    "select_language": "Selectionner langue",
+    "show_intro": "Ré-afficher l'introduction",
+    "toggle_theme": "Changer de thème",
+    "zen_mode": "Mode Zen"
   },
   "notification": {
     "favourited_post": "aime votre message",
@@ -311,6 +306,7 @@
   "user": {
     "add_existing": "Ajouter un compte existant",
     "server_address_label": "Adresse du serveur mastodon",
+    "sign_in_desc": "Connectez-vous pour suivre des profils ou des hashtags, mettre en favoris, partager et répondre à des messages, ou interagir à partir de votre compte sur un autre serveur...",
     "sign_out_account": "Se déconnecter de {0}",
     "tip_no_account": "Si vous n'avez pas encore de compte Mastodon, {0}.",
     "tip_register_account": "choisissez votre serveur et enregistrez-en un"
diff --git a/locales/ja-JP.json b/locales/ja-JP.json
index 6c12642d..4a153882 100644
--- a/locales/ja-JP.json
+++ b/locales/ja-JP.json
@@ -42,13 +42,7 @@
     "unblock_domain": "{0}のドメインブロックを解除",
     "unmute_account": "{0}さんのミュートを解除"
   },
-  "nav_footer": {
-    "select_feature_flags": "実験的機能を切り替え",
-    "select_language": "言語を選択",
-    "toggle_theme": "テーマを切り替え",
-    "zen_mode": "禅モード"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "ブックマーク",
     "conversations": "会話",
     "explore": "話題の投稿",
@@ -58,10 +52,11 @@
     "local": "ローカル",
     "notifications": "通知",
     "profile": "プロフィール",
-    "search": "検索 {0}"
-  },
-  "nav_user": {
-    "sign_in_desc": "サインインすると、アカウントやハッシュタグをフォローしたり、お気に入りしたり、投稿を共有したり返信するほか、異なるサーバー上のあなたのアカウントから交流できます。"
+    "search": "検索 {0}",
+    "select_feature_flags": "実験的機能を切り替え",
+    "select_language": "言語を選択",
+    "toggle_theme": "テーマを切り替え",
+    "zen_mode": "禅モード"
   },
   "notification": {
     "favourited_post": "さんがあなたの投稿お気に入り登録しました",
@@ -101,5 +96,8 @@
     "add_media": "画像、動画、音声ファイルを追加",
     "change_content_visibility": "公開範囲を変更",
     "toggle_code_block": "コードブロックを切り替え"
+  },
+  "user": {
+    "sign_in_desc": "サインインすると、アカウントやハッシュタグをフォローしたり、お気に入りしたり、投稿を共有したり返信するほか、異なるサーバー上のあなたのアカウントから交流できます。"
   }
 }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 4d9254cd..fa010d28 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -89,7 +89,6 @@
     "status_not_found": "未找到帖文",
     "unsupported_file_format": "不支持的文件格式"
   },
-
   "help": {
     "desc_highlight": "可能会在某些地方出现一些 bug 或缺失的功能。",
     "desc_para1": "感谢你有兴趣尝试鹿鸣，一个我们正在积极开发的通用 Mastodon 客户端。",
@@ -120,17 +119,9 @@
     "unmute_account": "解除屏蔽 {0}",
     "unpin_on_profile": "取消置顶"
   },
-  "nav_footer": {
-    "built_at": "于 {0} 构建",
-    "select_feature_flags": "功能开关",
-    "select_font_size": "字体大小",
-    "select_language": "选择语言",
-    "show_intro": "应用介绍",
-    "toggle_theme": "切换主题",
-    "zen_mode": "禅模式"
-  },
-  "nav_side": {
+  "nav": {
     "bookmarks": "书签",
+    "built_at": "于 {0} 构建",
     "conversations": "私信",
     "explore": "探索",
     "favourites": "喜欢",
@@ -140,10 +131,13 @@
     "notifications": "通知",
     "profile": "个人资料",
     "search": "搜索 {0}",
-    "settings": "设置"
-  },
-  "nav_user": {
-    "sign_in_desc": "登录后可关注其他人或标签、点赞、分享和回复帖文，或与不同服务器上的账号交互。"
+    "select_feature_flags": "功能开关",
+    "select_font_size": "字体大小",
+    "select_language": "选择语言",
+    "settings": "设置",
+    "show_intro": "应用介绍",
+    "toggle_theme": "切换主题",
+    "zen_mode": "禅模式"
   },
   "notification": {
     "favourited_post": "点赞了你的帖文",
@@ -320,6 +314,8 @@
   "user": {
     "add_existing": "添加现有帐户",
     "server_address_label": "Mastodon 服务器地址",
+    "sign_in_desc": "登录后可关注其他人或标签、点赞、分享和回复帖文，或与不同服务器上的账号交互。",
+    "sign_in_notice_title": "正在查看 {0} 的公共数据",
     "sign_out_account": "登出 {0}",
     "tip_no_account": "如果您还没有 Mastodon 账户，{0}。",
     "tip_register_account": "选择您的服务器并注册一个"
diff --git a/pages/[[server]]/@[account]/index.vue b/pages/[[server]]/@[account]/index.vue
index 626172aa..1cea03aa 100644
--- a/pages/[[server]]/@[account]/index.vue
+++ b/pages/[[server]]/@[account]/index.vue
@@ -21,7 +21,7 @@ onReactivated(() => {
 <template>
   <MainContent back>
     <template #title>
-      <span text-lg font-bold>{{ account ? getDisplayName(account) : t('nav_side.profile') }}</span>
+      <span text-lg font-bold>{{ account ? getDisplayName(account) : t('nav.profile') }}</span>
     </template>
 
     <template v-if="pending" />
diff --git a/pages/[[server]]/explore.vue b/pages/[[server]]/explore.vue
index ca3446a7..894a4304 100644
--- a/pages/[[server]]/explore.vue
+++ b/pages/[[server]]/explore.vue
@@ -30,7 +30,7 @@ const tabs = $computed(() => [
     <template #title>
       <span text-lg font-bold flex items-center gap-2 cursor-pointer @click="$scrollToTop">
         <div i-ri:hashtag />
-        <span>{{ t('nav_side.explore') }}</span>
+        <span>{{ t('nav.explore') }}</span>
       </span>
     </template>
 
diff --git a/pages/[[server]]/explore/index.vue b/pages/[[server]]/explore/index.vue
index 32247959..826ae4ca 100644
--- a/pages/[[server]]/explore/index.vue
+++ b/pages/[[server]]/explore/index.vue
@@ -8,7 +8,7 @@ const paginator = useMasto().trends.iterateStatuses()
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS, false)
 
 useHeadFixed({
-  title: () => `${t('tab.posts')} | ${t('nav_side.explore')}`,
+  title: () => `${t('tab.posts')} | ${t('nav.explore')}`,
 })
 </script>
 
diff --git a/pages/[[server]]/explore/links.vue b/pages/[[server]]/explore/links.vue
index a81f05bc..9184ef56 100644
--- a/pages/[[server]]/explore/links.vue
+++ b/pages/[[server]]/explore/links.vue
@@ -10,7 +10,7 @@ const paginator = useMasto().trends.links
 const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS, false)
 
 useHeadFixed({
-  title: () => `${t('tab.news')} | ${t('nav_side.explore')}`,
+  title: () => `${t('tab.news')} | ${t('nav.explore')}`,
 })
 </script>
 
diff --git a/pages/[[server]]/explore/tags.vue b/pages/[[server]]/explore/tags.vue
index 1f3d406c..b76614dd 100644
--- a/pages/[[server]]/explore/tags.vue
+++ b/pages/[[server]]/explore/tags.vue
@@ -17,7 +17,7 @@ function getTagUrl(tag: Tag) {
 }
 
 useHeadFixed({
-  title: () => `${t('tab.hashtags')} | ${t('nav_side.explore')}`,
+  title: () => `${t('tab.hashtags')} | ${t('nav.explore')}`,
 })
 </script>
 
diff --git a/pages/[[server]]/explore/users.vue b/pages/[[server]]/explore/users.vue
index cb2b0166..251b7ce3 100644
--- a/pages/[[server]]/explore/users.vue
+++ b/pages/[[server]]/explore/users.vue
@@ -9,7 +9,7 @@ const { data, pending, error } = useLazyAsyncData(
 )
 
 useHeadFixed({
-  title: () => `${t('tab.for_you')} | ${t('nav_side.explore')}`,
+  title: () => `${t('tab.for_you')} | ${t('nav.explore')}`,
 })
 </script>
 
diff --git a/pages/bookmarks.vue b/pages/bookmarks.vue
index c1921a5c..8f0b7143 100644
--- a/pages/bookmarks.vue
+++ b/pages/bookmarks.vue
@@ -6,7 +6,7 @@ definePageMeta({
 const { t } = useI18n()
 
 useHeadFixed({
-  title: () => t('nav_side.bookmarks'),
+  title: () => t('nav.bookmarks'),
 })
 </script>
 
@@ -15,7 +15,7 @@ useHeadFixed({
     <template #title>
       <NuxtLink to="/bookmarks" text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
         <div i-ri:bookmark-line />
-        <span>{{ t('nav_side.bookmarks') }}</span>
+        <span>{{ t('nav.bookmarks') }}</span>
       </NuxtLink>
     </template>
 
diff --git a/pages/conversations.vue b/pages/conversations.vue
index 13654581..0ae51fbe 100644
--- a/pages/conversations.vue
+++ b/pages/conversations.vue
@@ -6,7 +6,7 @@ definePageMeta({
 const { t } = useI18n()
 
 useHeadFixed({
-  title: () => t('nav_side.conversations'),
+  title: () => t('nav.conversations'),
 })
 </script>
 
@@ -15,7 +15,7 @@ useHeadFixed({
     <template #title>
       <NuxtLink to="/conversations" text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
         <div i-ri:at-line />
-        <span>{{ t('nav_side.conversations') }}</span>
+        <span>{{ t('nav.conversations') }}</span>
       </NuxtLink>
     </template>
 
diff --git a/pages/favourites.vue b/pages/favourites.vue
index 23685701..1dc5c77e 100644
--- a/pages/favourites.vue
+++ b/pages/favourites.vue
@@ -6,7 +6,7 @@ definePageMeta({
 const { t } = useI18n()
 
 useHeadFixed({
-  title: () => t('nav_side.favourites'),
+  title: () => t('nav.favourites'),
 })
 </script>
 
@@ -15,7 +15,7 @@ useHeadFixed({
     <template #title>
       <NuxtLink to="/favourites" text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
         <div i-ri:heart-3-line />
-        <span>{{ t('nav_side.favourites') }}</span>
+        <span>{{ t('nav.favourites') }}</span>
       </NuxtLink>
     </template>
 
diff --git a/pages/home.vue b/pages/home.vue
index 22c0fcd4..d9318643 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -8,7 +8,7 @@ definePageMeta({
 
 const { t } = useI18n()
 useHeadFixed({
-  title: () => t('nav_side.home'),
+  title: () => t('nav.home'),
 })
 </script>
 
@@ -17,7 +17,7 @@ useHeadFixed({
     <template #title>
       <NuxtLink to="/home" text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
         <div i-ri:home-5-line />
-        <span>{{ $t('nav_side.home') }}</span>
+        <span>{{ $t('nav.home') }}</span>
       </NuxtLink>
     </template>
 
diff --git a/pages/notifications.vue b/pages/notifications.vue
index 795b4577..db4c6a63 100644
--- a/pages/notifications.vue
+++ b/pages/notifications.vue
@@ -30,7 +30,7 @@ onActivated(() => {
     <template #title>
       <NuxtLink to="/notifications" text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
         <div i-ri:notification-4-line />
-        <span>{{ t('nav_side.notifications') }}</span>
+        <span>{{ t('nav.notifications') }}</span>
       </NuxtLink>
     </template>
 
diff --git a/pages/notifications/index.vue b/pages/notifications/index.vue
index ce586d62..392f9bad 100644
--- a/pages/notifications/index.vue
+++ b/pages/notifications/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const { t } = useI18n()
 useHeadFixed({
-  title: () => `${t('tab.notifications_all')} | ${t('nav_side.notifications')}`,
+  title: () => `${t('tab.notifications_all')} | ${t('nav.notifications')}`,
 })
 </script>
 
diff --git a/pages/notifications/mention.vue b/pages/notifications/mention.vue
index a85c87c8..fb74b0d8 100644
--- a/pages/notifications/mention.vue
+++ b/pages/notifications/mention.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 const { t } = useI18n()
 useHeadFixed({
-  title: () => `${t('tab.notifications_mention')} | ${t('nav_side.notifications')}`,
+  title: () => `${t('tab.notifications_mention')} | ${t('nav.notifications')}`,
 })
 </script>
 
diff --git a/pages/settings.vue b/pages/settings.vue
index 71ced0c8..aae8b419 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -15,7 +15,7 @@ const isRootPath = computedEager(() => route.name === 'settings')
         <template #title>
           <div text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
             <div i-ri:settings-4-line />
-            <span>{{ $t('nav_side.settings') }}</span>
+            <span>{{ $t('nav.settings') }}</span>
           </div>
         </template>
         <div xl:w-97 lg:w-78 w-full>