diff --git a/components/command/Key.vue b/components/command/CommandKey.vue
similarity index 100%
rename from components/command/Key.vue
rename to components/command/CommandKey.vue
diff --git a/components/command/Panel.vue b/components/command/CommandPanel.vue
similarity index 98%
rename from components/command/Panel.vue
rename to components/command/CommandPanel.vue
index 614818fb..7a049016 100644
--- a/components/command/Panel.vue
+++ b/components/command/CommandPanel.vue
@@ -220,7 +220,7 @@ const onKeyDown = (e: KeyboardEvent) => {
                   :class="active === cmd.index ? 'opacity-100' : 'opacity-0'"
                 >
                   <div class="text-xs text-secondary">
-                    Complete
+                    {{ $t('command.complete') }}
                   </div>
                   <CommandKey name="Tab" />
                 </div>
@@ -230,7 +230,7 @@ const onKeyDown = (e: KeyboardEvent) => {
                   :class="active === cmd.index ? 'opacity-100' : 'opacity-0'"
                 >
                   <div class="text-xs text-secondary">
-                    Activate
+                    {{ $t('command.activate') }}
                   </div>
                   <CommandKey name="Enter" />
                 </div>
diff --git a/components/command/Root.vue b/components/command/CommandRoot.vue
similarity index 100%
rename from components/command/Root.vue
rename to components/command/CommandRoot.vue
diff --git a/locales/en-US.json b/locales/en-US.json
index f36a54d2..731bfae9 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -21,11 +21,18 @@
     "save_changes": "Save changes",
     "sign_in": "Sign in"
   },
+  "command": {
+    "activate": "Activate",
+    "complete": "Complete"
+  },
   "common": {
     "end_of_list": "End of the list",
     "error": "ERROR",
     "not_found": "404 Not Found"
   },
+  "error": {
+    "account_not_found": "Account {0} not found"
+  },
   "feature_flag": {
     "virtual_scroll": "Virtual Scrolling"
   },
diff --git a/pages/@[account]/index.vue b/pages/@[account]/index.vue
index b914a834..aac1d6b2 100644
--- a/pages/@[account]/index.vue
+++ b/pages/@[account]/index.vue
@@ -31,7 +31,7 @@ onReactivated(() => {
     </template>
 
     <CommonNotFound v-else>
-      Account @{{ accountName }} not found
+      {{ $t('error.account_not_found', [`@${accountName}`]) }}
     </CommonNotFound>
   </MainContent>
 </template>
diff --git a/pages/blocks.vue b/pages/blocks.vue
index 24ce4857..c96cc266 100644
--- a/pages/blocks.vue
+++ b/pages/blocks.vue
@@ -13,7 +13,7 @@ useHead({
 <template>
   <MainContent back>
     <template #title>
-      <span text-lg font-bold>Blocked users</span>
+      <span text-lg font-bold>{{ $t('account.blocked_users') }}</span>
     </template>
     <AccountPaginator :paginator="paginator" />
   </MainContent>
diff --git a/pages/domain_blocks.vue b/pages/domain_blocks.vue
index 40d4b9a5..5f7f64b7 100644
--- a/pages/domain_blocks.vue
+++ b/pages/domain_blocks.vue
@@ -17,7 +17,7 @@ const unblock = async (domain: string) => {
 <template>
   <MainContent back>
     <template #title>
-      <span text-lg font-bold>Blocked domains</span>
+      <span text-lg font-bold>{{ $t('account.blocked_domains') }}</span>
     </template>
 
     <CommonPaginator :paginator="paginator">
diff --git a/pages/mutes.vue b/pages/mutes.vue
index 3b0c3b31..78be5b03 100644
--- a/pages/mutes.vue
+++ b/pages/mutes.vue
@@ -13,7 +13,7 @@ useHead({
 <template>
   <MainContent back>
     <template #title>
-      <span text-lg font-bold>Muted users</span>
+      <span text-lg font-bold>{{ $t('account.muted_users') }}</span>
     </template>
     <AccountPaginator :paginator="paginator" />
   </MainContent>
diff --git a/pages/pinned.vue b/pages/pinned.vue
index b8ea606e..5e34924e 100644
--- a/pages/pinned.vue
+++ b/pages/pinned.vue
@@ -4,9 +4,10 @@ definePageMeta({
 })
 
 const paginator = useMasto().accounts.getStatusesIterable(currentUser.value!.account.id, { pinned: true })
+const { t } = useI18n()
 
 useHead({
-  title: 'Pinned',
+  title: () => t('account.pinned'),
 })
 </script>
 
@@ -14,7 +15,7 @@ useHead({
   <MainContent>
     <template #title>
       <div i-ri:pushpin-line h-6 mr-1 />
-      <span>Pinned</span>
+      <span>{{ t('account.pinned') }}</span>
     </template>
 
     <TimelinePaginator :paginator="paginator" />
diff --git a/pages/public/index.vue b/pages/public/index.vue
index c491cf0c..84df1619 100644
--- a/pages/public/index.vue
+++ b/pages/public/index.vue
@@ -6,7 +6,7 @@ onBeforeUnmount(() => stream.disconnect())
 const { t } = useI18n()
 
 useHead({
-  title: () => t('nav_side.federated'),
+  title: () => t('title.federated_timeline'),
 })
 </script>
 
diff --git a/pages/public/local.vue b/pages/public/local.vue
index 13ec4daa..93d09119 100644
--- a/pages/public/local.vue
+++ b/pages/public/local.vue
@@ -6,7 +6,7 @@ onBeforeUnmount(() => stream.disconnect())
 const { t } = useI18n()
 
 useHead({
-  title: () => t('nav_side.local'),
+  title: () => t('title.local_timeline'),
 })
 </script>