diff --git a/src/components/common/ComfyImage.vue b/src/components/common/ComfyImage.vue
index db727b959..4f7aab145 100644
--- a/src/components/common/ComfyImage.vue
+++ b/src/components/common/ComfyImage.vue
@@ -22,7 +22,7 @@
   </span>
   <div v-if="imageBroken" class="broken-image-placeholder">
     <i class="pi pi-image"></i>
-    <span>{{ $t('imageFailedToLoad') }}</span>
+    <span>{{ $t('g.imageFailedToLoad') }}</span>
   </div>
 </template>
 
diff --git a/src/components/common/CustomizationDialog.vue b/src/components/common/CustomizationDialog.vue
index e7eab57c4..6808b993f 100644
--- a/src/components/common/CustomizationDialog.vue
+++ b/src/components/common/CustomizationDialog.vue
@@ -1,8 +1,8 @@
 <template>
-  <Dialog v-model:visible="visible" :header="$t('customizeFolder')">
+  <Dialog v-model:visible="visible" :header="$t('g.customizeFolder')">
     <div class="p-fluid">
       <div class="field icon-field">
-        <label for="icon">{{ $t('icon') }}</label>
+        <label for="icon">{{ $t('g.icon') }}</label>
         <SelectButton
           v-model="selectedIcon"
           :options="iconOptions"
@@ -19,7 +19,7 @@
       </div>
       <Divider />
       <div class="field color-field">
-        <label for="color">{{ $t('color') }}</label>
+        <label for="color">{{ $t('g.color') }}</label>
         <div class="color-picker-container">
           <SelectButton
             v-model="selectedColor"
@@ -41,7 +41,7 @@
                 v-else
                 class="pi pi-palette"
                 :style="{ fontSize: '1.2rem' }"
-                v-tooltip="$t('customColor')"
+                v-tooltip="$t('g.customColor')"
               ></i>
             </template>
           </SelectButton>
@@ -54,13 +54,13 @@
     </div>
     <template #footer>
       <Button
-        :label="$t('reset')"
+        :label="$t('g.reset')"
         icon="pi pi-refresh"
         @click="resetCustomization"
         class="p-button-text"
       />
       <Button
-        :label="$t('confirm')"
+        :label="$t('g.confirm')"
         icon="pi pi-check"
         @click="confirmCustomization"
         autofocus
@@ -100,24 +100,24 @@ const visible = computed({
 const nodeBookmarkStore = useNodeBookmarkStore()
 
 const iconOptions = [
-  { name: t('bookmark'), value: nodeBookmarkStore.defaultBookmarkIcon },
-  { name: t('folder'), value: 'pi-folder' },
-  { name: t('star'), value: 'pi-star' },
-  { name: t('heart'), value: 'pi-heart' },
-  { name: t('file'), value: 'pi-file' },
-  { name: t('inbox'), value: 'pi-inbox' },
-  { name: t('box'), value: 'pi-box' },
-  { name: t('briefcase'), value: 'pi-briefcase' }
+  { name: t('icon.bookmark'), value: nodeBookmarkStore.defaultBookmarkIcon },
+  { name: t('icon.folder'), value: 'pi-folder' },
+  { name: t('icon.star'), value: 'pi-star' },
+  { name: t('icon.heart'), value: 'pi-heart' },
+  { name: t('icon.file'), value: 'pi-file' },
+  { name: t('icon.inbox'), value: 'pi-inbox' },
+  { name: t('icon.box'), value: 'pi-box' },
+  { name: t('icon.briefcase'), value: 'pi-briefcase' }
 ]
 
 const colorOptions = [
-  { name: t('default'), value: nodeBookmarkStore.defaultBookmarkColor },
-  { name: t('blue'), value: '#007bff' },
-  { name: t('green'), value: '#28a745' },
-  { name: t('red'), value: '#dc3545' },
-  { name: t('pink'), value: '#e83e8c' },
-  { name: t('yellow'), value: '#ffc107' },
-  { name: t('custom'), value: 'custom' }
+  { name: t('color.default'), value: nodeBookmarkStore.defaultBookmarkColor },
+  { name: t('color.blue'), value: '#007bff' },
+  { name: t('color.green'), value: '#28a745' },
+  { name: t('color.red'), value: '#dc3545' },
+  { name: t('color.pink'), value: '#e83e8c' },
+  { name: t('color.yellow'), value: '#ffc107' },
+  { name: t('color.custom'), value: 'custom' }
 ]
 
 const defaultIcon = iconOptions.find(
@@ -157,7 +157,7 @@ const resetCustomization = () => {
     selectedColor.value = defaultColor
   } else if (!colorOption) {
     customColor.value = props.initialColor.replace('#', '')
-    selectedColor.value = { name: 'Custom', value: 'custom' }
+    selectedColor.value = { name: t('color.custom'), value: 'custom' }
   } else {
     selectedColor.value = colorOption
   }
diff --git a/src/components/common/ElectronFileDownload.vue b/src/components/common/ElectronFileDownload.vue
index 5e58c146c..07c73eccb 100644
--- a/src/components/common/ElectronFileDownload.vue
+++ b/src/components/common/ElectronFileDownload.vue
@@ -14,7 +14,7 @@
       <div class="file-action">
         <Button
           class="file-action-button"
-          :label="$t('download') + ' (' + fileSize + ')'"
+          :label="$t('g.download') + ' (' + fileSize + ')'"
           size="small"
           outlined
           :disabled="props.error"
diff --git a/src/components/common/FileDownload.vue b/src/components/common/FileDownload.vue
index 197ecc3e0..8ceb37590 100644
--- a/src/components/common/FileDownload.vue
+++ b/src/components/common/FileDownload.vue
@@ -12,7 +12,7 @@
     <div class="file-action">
       <Button
         class="file-action-button"
-        :label="$t('download') + ' (' + fileSize + ')'"
+        :label="$t('g.download') + ' (' + fileSize + ')'"
         size="small"
         outlined
         :disabled="props.error"
diff --git a/src/components/common/SystemStatsPanel.vue b/src/components/common/SystemStatsPanel.vue
index ee615f205..3915686e1 100644
--- a/src/components/common/SystemStatsPanel.vue
+++ b/src/components/common/SystemStatsPanel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="system-stats">
     <div class="mb-6">
-      <h2 class="text-2xl font-semibold mb-4">{{ $t('systemInfo') }}</h2>
+      <h2 class="text-2xl font-semibold mb-4">{{ $t('g.systemInfo') }}</h2>
       <div class="grid grid-cols-2 gap-2">
         <template v-for="col in systemColumns" :key="col.field">
           <div class="font-medium">{{ col.header }}</div>
@@ -13,7 +13,7 @@
     <Divider />
 
     <div>
-      <h2 class="text-2xl font-semibold mb-4">{{ $t('devices') }}</h2>
+      <h2 class="text-2xl font-semibold mb-4">{{ $t('g.devices') }}</h2>
       <TabView v-if="props.stats.devices.length > 1">
         <TabPanel
           v-for="device in props.stats.devices"
diff --git a/src/components/common/TreeExplorer.vue b/src/components/common/TreeExplorer.vue
index 0d1e97b67..c1ff99d2a 100644
--- a/src/components/common/TreeExplorer.vue
+++ b/src/components/common/TreeExplorer.vue
@@ -130,13 +130,13 @@ const deleteCommand = async (node: RenderedTreeExplorerNode) => {
 const menuItems = computed<MenuItem[]>(() =>
   [
     {
-      label: t('rename'),
+      label: t('g.rename'),
       icon: 'pi pi-file-edit',
       command: () => renameCommand(menuTargetNode.value),
       visible: menuTargetNode.value?.handleRename !== undefined
     },
     {
-      label: t('delete'),
+      label: t('g.delete'),
       icon: 'pi pi-trash',
       command: () => deleteCommand(menuTargetNode.value),
       visible: menuTargetNode.value?.handleDelete !== undefined,
diff --git a/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts b/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
index 669b71071..82dc913be 100644
--- a/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
+++ b/src/components/common/__tests__/TreeExplorerTreeNode.spec.ts
@@ -128,7 +128,7 @@ describe('TreeExplorerTreeNode', () => {
     expect(handleRenameMock).toHaveBeenCalledOnce()
     expect(addToastSpy).toHaveBeenCalledWith({
       severity: 'error',
-      summary: 'error',
+      summary: 'g.error',
       detail: 'Rename failed',
       life: 3000
     })
diff --git a/src/components/dialog/content/ConfirmationDialogContent.vue b/src/components/dialog/content/ConfirmationDialogContent.vue
index b1108288f..6e4eb79b6 100644
--- a/src/components/dialog/content/ConfirmationDialogContent.vue
+++ b/src/components/dialog/content/ConfirmationDialogContent.vue
@@ -6,7 +6,7 @@
     </ul>
     <div class="flex gap-4 justify-end">
       <Button
-        :label="$t('cancel')"
+        :label="$t('g.cancel')"
         icon="pi pi-undo"
         severity="secondary"
         @click="onCancel"
@@ -14,26 +14,26 @@
       />
       <Button
         v-if="type === 'delete'"
-        :label="$t('delete')"
+        :label="$t('g.delete')"
         severity="danger"
         @click="onConfirm"
         icon="pi pi-trash"
       />
       <Button
         v-else-if="type === 'overwrite'"
-        :label="$t('overwrite')"
+        :label="$t('g.overwrite')"
         severity="warn"
         @click="onConfirm"
         icon="pi pi-save"
       />
       <template v-else-if="type === 'dirtyClose'">
         <Button
-          :label="$t('no')"
+          :label="$t('g.no')"
           severity="secondary"
           @click="onDeny"
           icon="pi pi-times"
         />
-        <Button :label="$t('save')" @click="onConfirm" icon="pi pi-save" />
+        <Button :label="$t('g.save')" @click="onConfirm" icon="pi pi-save" />
       </template>
       <Button
         v-else-if="type === 'reinstall'"
@@ -45,7 +45,7 @@
       <!-- Invalid - just show a close button. -->
       <Button
         v-else
-        :label="$t('close')"
+        :label="$t('g.close')"
         severity="primary"
         @click="onCancel"
         icon="pi pi-times"
diff --git a/src/components/dialog/content/ExecutionErrorDialogContent.vue b/src/components/dialog/content/ExecutionErrorDialogContent.vue
index 7cee141ed..707bad262 100644
--- a/src/components/dialog/content/ExecutionErrorDialogContent.vue
+++ b/src/components/dialog/content/ExecutionErrorDialogContent.vue
@@ -7,7 +7,7 @@
   <div class="comfy-error-report">
     <Button
       v-show="!reportOpen"
-      :label="$t('showReport')"
+      :label="$t('g.showReport')"
       @click="showReport"
       text
     />
@@ -28,7 +28,7 @@
       />
       <Button
         v-if="reportOpen"
-        :label="$t('copyToClipboard')"
+        :label="$t('g.copyToClipboard')"
         icon="pi pi-copy"
         @click="copyReportToClipboard"
       />
diff --git a/src/components/dialog/content/PromptDialogContent.vue b/src/components/dialog/content/PromptDialogContent.vue
index c014ada69..4380b144a 100644
--- a/src/components/dialog/content/PromptDialogContent.vue
+++ b/src/components/dialog/content/PromptDialogContent.vue
@@ -10,7 +10,7 @@
       />
       <label>{{ message }}</label>
     </FloatLabel>
-    <Button @click="onConfirm">{{ $t('confirm') }}</Button>
+    <Button @click="onConfirm">{{ $t('g.confirm') }}</Button>
   </div>
 </template>
 
diff --git a/src/components/dialog/content/SettingDialogContent.vue b/src/components/dialog/content/SettingDialogContent.vue
index 1526657f7..60be14410 100644
--- a/src/components/dialog/content/SettingDialogContent.vue
+++ b/src/components/dialog/content/SettingDialogContent.vue
@@ -5,7 +5,7 @@
         class="settings-search-box w-full mb-2"
         v-model:modelValue="searchQuery"
         @search="handleSearch"
-        :placeholder="$t('searchSettings') + '...'"
+        :placeholder="$t('g.searchSettings') + '...'"
       />
       <Listbox
         v-model="activeCategory"
diff --git a/src/components/dialog/content/error/FindIssueButton.vue b/src/components/dialog/content/error/FindIssueButton.vue
index a7878a767..dccc6d5bc 100644
--- a/src/components/dialog/content/error/FindIssueButton.vue
+++ b/src/components/dialog/content/error/FindIssueButton.vue
@@ -1,7 +1,7 @@
 <template>
   <Button
     @click="openGitHubIssues"
-    :label="$t('findIssues')"
+    :label="$t('g.findIssues')"
     severity="secondary"
     icon="pi pi-github"
   >
diff --git a/src/components/dialog/content/error/ReportIssueButton.vue b/src/components/dialog/content/error/ReportIssueButton.vue
index f87cab9c1..1d7a24bfa 100644
--- a/src/components/dialog/content/error/ReportIssueButton.vue
+++ b/src/components/dialog/content/error/ReportIssueButton.vue
@@ -1,11 +1,11 @@
 <template>
   <Button
     @click="reportIssue"
-    :label="$t('reportIssue')"
+    :label="$t('g.reportIssue')"
     :severity="submitted ? 'success' : 'secondary'"
     :icon="icon"
     :disabled="submitted"
-    v-tooltip="$t('reportIssueTooltip')"
+    v-tooltip="$t('g.reportIssueTooltip')"
   >
   </Button>
 </template>
@@ -41,7 +41,7 @@ const reportIssue = async () => {
     submitted.value = true
     toast.add({
       severity: 'success',
-      summary: t('reportSent'),
+      summary: t('g.reportSent'),
       life: 3000
     })
   } finally {
diff --git a/src/components/dialog/content/setting/AboutPanel.vue b/src/components/dialog/content/setting/AboutPanel.vue
index f72e22191..ea4c8c063 100644
--- a/src/components/dialog/content/setting/AboutPanel.vue
+++ b/src/components/dialog/content/setting/AboutPanel.vue
@@ -1,6 +1,6 @@
 <template>
   <PanelTemplate value="About" class="about-container">
-    <h2 class="text-2xl font-bold mb-2">{{ $t('about') }}</h2>
+    <h2 class="text-2xl font-bold mb-2">{{ $t('g.about') }}</h2>
     <div class="space-y-2">
       <a
         v-for="badge in aboutPanelStore.badges"
diff --git a/src/components/dialog/content/setting/CurrentUserMessage.vue b/src/components/dialog/content/setting/CurrentUserMessage.vue
index 0e4a71450..dd317ad4d 100644
--- a/src/components/dialog/content/setting/CurrentUserMessage.vue
+++ b/src/components/dialog/content/setting/CurrentUserMessage.vue
@@ -7,7 +7,9 @@
     pt:text="w-full"
   >
     <div class="flex items-center justify-between">
-      <div>{{ $t('currentUser') }}: {{ userStore.currentUser?.username }}</div>
+      <div>
+        {{ $t('g.currentUser') }}: {{ userStore.currentUser?.username }}
+      </div>
       <Button icon="pi pi-sign-out" @click="logout" text />
     </div>
   </Message>
diff --git a/src/components/dialog/content/setting/ExtensionPanel.vue b/src/components/dialog/content/setting/ExtensionPanel.vue
index 90ab298e0..fedf068b7 100644
--- a/src/components/dialog/content/setting/ExtensionPanel.vue
+++ b/src/components/dialog/content/setting/ExtensionPanel.vue
@@ -3,7 +3,7 @@
     <template #header>
       <SearchBox
         v-model="filters['global'].value"
-        :placeholder="$t('searchExtensions') + '...'"
+        :placeholder="$t('g.searchExtensions') + '...'"
       />
       <Message v-if="hasChanges" severity="info" pt:text="w-full">
         <ul>
@@ -16,7 +16,7 @@
         </ul>
         <div class="flex justify-end">
           <Button
-            :label="$t('reloadToApplyChanges')"
+            :label="$t('g.reloadToApplyChanges')"
             @click="applyChanges"
             outlined
             severity="danger"
@@ -30,7 +30,7 @@
       size="small"
       :filters="filters"
     >
-      <Column field="name" :header="$t('extensionName')" sortable></Column>
+      <Column field="name" :header="$t('g.extensionName')" sortable></Column>
       <Column
         :pt="{
           bodyCell: 'flex items-center justify-end'
diff --git a/src/components/dialog/content/setting/FirstTimeUIMessage.vue b/src/components/dialog/content/setting/FirstTimeUIMessage.vue
index 031431a7e..5daee0d73 100644
--- a/src/components/dialog/content/setting/FirstTimeUIMessage.vue
+++ b/src/components/dialog/content/setting/FirstTimeUIMessage.vue
@@ -6,7 +6,7 @@
     :closable="true"
     @close="handleClose"
   >
-    {{ $t('firstTimeUIMessage') }}
+    {{ $t('g.firstTimeUIMessage') }}
   </Message>
 </template>
 
diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue
index 94ee1f868..6b3ebb8f1 100644
--- a/src/components/dialog/content/setting/KeybindingPanel.vue
+++ b/src/components/dialog/content/setting/KeybindingPanel.vue
@@ -3,7 +3,7 @@
     <template #header>
       <SearchBox
         v-model="filters['global'].value"
-        :placeholder="$t('searchKeybindings') + '...'"
+        :placeholder="$t('g.searchKeybindings') + '...'"
       />
     </template>
 
@@ -102,8 +102,8 @@
     </Dialog>
     <Button
       class="mt-4"
-      :label="$t('reset')"
-      v-tooltip="$t('resetKeybindingsTooltip')"
+      :label="$t('g.reset')"
+      v-tooltip="$t('g.resetKeybindingsTooltip')"
       icon="pi pi-trash"
       severity="danger"
       fluid
diff --git a/src/components/dialog/content/setting/SettingItem.vue b/src/components/dialog/content/setting/SettingItem.vue
index 03df2f427..53a52a99e 100644
--- a/src/components/dialog/content/setting/SettingItem.vue
+++ b/src/components/dialog/content/setting/SettingItem.vue
@@ -6,10 +6,10 @@
     @update:formValue="updateSettingValue"
   >
     <template #name-prefix>
-      <Tag v-if="setting.experimental" :value="$t('experimental')" />
+      <Tag v-if="setting.experimental" :value="$t('g.experimental')" />
       <Tag
         v-if="setting.deprecated"
-        :value="$t('deprecated')"
+        :value="$t('g.deprecated')"
         severity="danger"
       />
     </template>
diff --git a/src/components/dialog/content/setting/SettingsPanel.vue b/src/components/dialog/content/setting/SettingsPanel.vue
index b0d99c65d..269e9f136 100644
--- a/src/components/dialog/content/setting/SettingsPanel.vue
+++ b/src/components/dialog/content/setting/SettingsPanel.vue
@@ -10,8 +10,8 @@
   <NoResultsPlaceholder
     v-else
     icon="pi pi-search"
-    :title="$t('noResultsFound')"
-    :message="$t('searchFailedMessage')"
+    :title="$t('g.noResultsFound')"
+    :message="$t('g.searchFailedMessage')"
   />
 </template>
 
diff --git a/src/components/dialog/header/SettingDialogHeader.vue b/src/components/dialog/header/SettingDialogHeader.vue
index c272d563c..65fe45834 100644
--- a/src/components/dialog/header/SettingDialogHeader.vue
+++ b/src/components/dialog/header/SettingDialogHeader.vue
@@ -2,7 +2,7 @@
   <div>
     <h2 class="px-4">
       <i class="pi pi-cog"></i>
-      <span>{{ $t('settings') }}</span>
+      <span>{{ $t('g.settings') }}</span>
     </h2>
   </div>
 </template>
diff --git a/src/components/install/MigrationPicker.vue b/src/components/install/MigrationPicker.vue
index f193c6ac1..5a7d053f3 100644
--- a/src/components/install/MigrationPicker.vue
+++ b/src/components/install/MigrationPicker.vue
@@ -62,7 +62,7 @@
           <div>
             <label class="text-neutral-200 font-medium">
               {{ $t('install.customNodes') }}
-              <Tag severity="secondary"> {{ $t('comingSoon') }}... </Tag>
+              <Tag severity="secondary"> {{ $t('g.comingSoon') }}... </Tag>
             </label>
             <p class="text-sm text-neutral-400 my-1">
               {{ $t('install.customNodesDescription') }}
diff --git a/src/components/searchbox/NodeSearchBox.vue b/src/components/searchbox/NodeSearchBox.vue
index a54648628..cd47d5880 100644
--- a/src/components/searchbox/NodeSearchBox.vue
+++ b/src/components/searchbox/NodeSearchBox.vue
@@ -105,7 +105,7 @@ const suggestions = ref<ComfyNodeDefImpl[]>([])
 const hoveredSuggestion = ref<ComfyNodeDefImpl | null>(null)
 const currentQuery = ref('')
 const placeholder = computed(() => {
-  return props.filters.length === 0 ? t('searchNodes') + '...' : ''
+  return props.filters.length === 0 ? t('g.searchNodes') + '...' : ''
 })
 
 const nodeDefStore = useNodeDefStore()
diff --git a/src/components/searchbox/NodeSearchFilter.vue b/src/components/searchbox/NodeSearchFilter.vue
index c2168f04c..29aa6b5fe 100644
--- a/src/components/searchbox/NodeSearchFilter.vue
+++ b/src/components/searchbox/NodeSearchFilter.vue
@@ -16,7 +16,7 @@
     />
   </div>
   <div class="_footer">
-    <Button type="button" :label="$t('add')" @click="submit"></Button>
+    <Button type="button" :label="$t('g.add')" @click="submit"></Button>
   </div>
 </template>
 
diff --git a/src/components/searchbox/NodeSearchItem.vue b/src/components/searchbox/NodeSearchItem.vue
index 81ff2ccd4..21ebc1d1a 100644
--- a/src/components/searchbox/NodeSearchItem.vue
+++ b/src/components/searchbox/NodeSearchItem.vue
@@ -25,12 +25,12 @@
     <div class="option-badges">
       <Tag
         v-if="nodeDef.experimental"
-        :value="$t('experimental')"
+        :value="$t('g.experimental')"
         severity="primary"
       />
       <Tag
         v-if="nodeDef.deprecated"
-        :value="$t('deprecated')"
+        :value="$t('g.deprecated')"
         severity="danger"
       />
       <Tag
diff --git a/src/components/sidebar/SidebarSettingsToggleIcon.vue b/src/components/sidebar/SidebarSettingsToggleIcon.vue
index 80f557567..cf5904273 100644
--- a/src/components/sidebar/SidebarSettingsToggleIcon.vue
+++ b/src/components/sidebar/SidebarSettingsToggleIcon.vue
@@ -3,7 +3,7 @@
     icon="pi pi-cog"
     class="comfy-settings-btn"
     @click="showSetting"
-    :tooltip="$t('settings')"
+    :tooltip="$t('g.settings')"
   />
 </template>
 
diff --git a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
index cb5b9c311..36a95d55d 100644
--- a/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/ModelLibrarySidebarTab.vue
@@ -9,21 +9,21 @@
         @click="modelStore.loadModelFolders"
         severity="secondary"
         text
-        v-tooltip.bottom="$t('refresh')"
+        v-tooltip.bottom="$t('g.refresh')"
       />
       <Button
         icon="pi pi-cloud-download"
         @click="modelStore.loadModels"
         severity="secondary"
         text
-        v-tooltip.bottom="$t('loadAllFolders')"
+        v-tooltip.bottom="$t('g.loadAllFolders')"
       />
     </template>
     <template #header>
       <SearchBox
         class="model-lib-search-box p-2 2xl:p-4"
         v-model:modelValue="searchQuery"
-        :placeholder="$t('searchModels') + '...'"
+        :placeholder="$t('g.searchModels') + '...'"
         @search="handleSearch"
       />
     </template>
diff --git a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
index 5f3c29fc3..1ba452937 100644
--- a/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
+++ b/src/components/sidebar/tabs/NodeLibrarySidebarTab.vue
@@ -10,7 +10,7 @@
         text
         severity="secondary"
         @click="nodeBookmarkTreeExplorerRef?.addNewBookmarkFolder()"
-        v-tooltip.bottom="$t('newFolder')"
+        v-tooltip.bottom="$t('g.newFolder')"
       />
       <Button
         class="sort-button"
@@ -28,7 +28,7 @@
         @search="handleSearch"
         @show-filter="($event) => searchFilter.toggle($event)"
         @remove-filter="onRemoveFilter"
-        :placeholder="$t('searchNodes') + '...'"
+        :placeholder="$t('g.searchNodes') + '...'"
         filter-icon="pi pi-filter"
         :filters
       />
diff --git a/src/components/sidebar/tabs/QueueSidebarTab.vue b/src/components/sidebar/tabs/QueueSidebarTab.vue
index 71ec514e9..561cfdfe3 100644
--- a/src/components/sidebar/tabs/QueueSidebarTab.vue
+++ b/src/components/sidebar/tabs/QueueSidebarTab.vue
@@ -75,8 +75,8 @@
       <div v-else>
         <NoResultsPlaceholder
           icon="pi pi-info-circle"
-          :title="$t('noTasksFound')"
-          :message="$t('noTasksFoundMessage')"
+          :title="$t('g.noTasksFound')"
+          :message="$t('g.noTasksFoundMessage')"
         />
       </div>
     </template>
@@ -241,19 +241,19 @@ const menuTargetTask = ref<TaskItemImpl | null>(null)
 const menuTargetNode = ref<ComfyNode | null>(null)
 const menuItems = computed<MenuItem[]>(() => [
   {
-    label: t('delete'),
+    label: t('g.delete'),
     icon: 'pi pi-trash',
     command: () => menuTargetTask.value && removeTask(menuTargetTask.value),
     disabled: isExpanded.value || isInFolderView.value
   },
   {
-    label: t('loadWorkflow'),
+    label: t('g.loadWorkflow'),
     icon: 'pi pi-file-export',
     command: () => menuTargetTask.value?.loadWorkflow(app),
     disabled: !menuTargetTask.value?.workflow
   },
   {
-    label: t('goToNode'),
+    label: t('g.goToNode'),
     icon: 'pi pi-arrow-circle-right',
     command: () => app.goToNode(menuTargetNode.value?.id),
     visible: !!menuTargetNode.value
diff --git a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
index c89b25221..61100f5d7 100644
--- a/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
+++ b/src/components/sidebar/tabs/WorkflowsSidebarTab.vue
@@ -31,7 +31,7 @@
         class="workflows-search-box p-2 2xl:p-4"
         v-model:modelValue="searchQuery"
         @search="handleSearch"
-        :placeholder="$t('searchWorkflows') + '...'"
+        :placeholder="$t('g.searchWorkflows') + '...'"
       />
     </template>
     <template #body>
@@ -116,8 +116,8 @@
           <NoResultsPlaceholder
             v-else
             icon="pi pi-folder"
-            :title="$t('empty')"
-            :message="$t('noWorkflowsFound')"
+            :title="$t('g.empty')"
+            :message="$t('g.noWorkflowsFound')"
           />
         </div>
       </div>
@@ -278,7 +278,7 @@ const renderTreeNode = (
         contextMenuItems: (node: TreeExplorerNode<ComfyWorkflow>) => {
           return [
             {
-              label: t('insert'),
+              label: t('g.insert'),
               icon: 'pi pi-file-export',
               command: () => {
                 const workflow = node.data
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
index 64472a089..fb2e82b2d 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeBookmarkTreeExplorer.vue
@@ -93,7 +93,7 @@ const extraMenuItems = (
   menuTargetNode: RenderedTreeExplorerNode<ComfyNodeDefImpl>
 ) => [
   {
-    label: t('newFolder'),
+    label: t('g.newFolder'),
     icon: 'pi pi-folder-plus',
     command: () => {
       addNewBookmarkFolder(menuTargetNode)
@@ -101,7 +101,7 @@ const extraMenuItems = (
     visible: !menuTargetNode?.leaf
   },
   {
-    label: t('customize'),
+    label: t('g.customize'),
     icon: 'pi pi-palette',
     command: () => {
       const customization =
diff --git a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
index a8e4e0c74..893c1ea48 100644
--- a/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
+++ b/src/components/sidebar/tabs/nodeLibrary/NodeTreeLeaf.vue
@@ -4,12 +4,12 @@
       <template #before-label>
         <Tag
           v-if="nodeDef.experimental"
-          :value="$t('experimental')"
+          :value="$t('g.experimental')"
           severity="primary"
         />
         <Tag
           v-if="nodeDef.deprecated"
-          :value="$t('deprecated')"
+          :value="$t('g.deprecated')"
           severity="danger"
         />
       </template>
diff --git a/src/components/sidebar/tabs/queue/ResultVideo.vue b/src/components/sidebar/tabs/queue/ResultVideo.vue
index c6d5e8430..2ef1b9cc7 100644
--- a/src/components/sidebar/tabs/queue/ResultVideo.vue
+++ b/src/components/sidebar/tabs/queue/ResultVideo.vue
@@ -1,7 +1,7 @@
 <template>
   <video controls width="100%" height="100%">
     <source :src="url" :type="htmlVideoType" />
-    {{ $t('videoFailedToLoad') }}
+    {{ $t('g.videoFailedToLoad') }}
   </video>
 </template>
 
diff --git a/src/hooks/bottomPanelTabs/terminalTabs.ts b/src/hooks/bottomPanelTabs/terminalTabs.ts
index 7357b5f3d..1a831c78d 100644
--- a/src/hooks/bottomPanelTabs/terminalTabs.ts
+++ b/src/hooks/bottomPanelTabs/terminalTabs.ts
@@ -8,7 +8,7 @@ export const useLogsTerminalTab = (): BottomPanelExtension => {
   const { t } = useI18n()
   return {
     id: 'logs-terminal',
-    title: t('logs'),
+    title: t('g.logs'),
     component: markRaw(LogsTerminal),
     type: 'vue'
   }
@@ -18,7 +18,7 @@ export const useCommandTerminalTab = (): BottomPanelExtension => {
   const { t } = useI18n()
   return {
     id: 'command-terminal',
-    title: t('terminal'),
+    title: t('g.terminal'),
     component: markRaw(CommandTerminal),
     type: 'vue'
   }
diff --git a/src/hooks/errorHooks.ts b/src/hooks/errorHooks.ts
index 50b2352ca..661d89be0 100644
--- a/src/hooks/errorHooks.ts
+++ b/src/hooks/errorHooks.ts
@@ -8,7 +8,7 @@ export function useErrorHandling() {
   const toastErrorHandler = (error: any) => {
     toast.add({
       severity: 'error',
-      summary: t('error'),
+      summary: t('g.error'),
       detail: error.message,
       life: 3000
     })
diff --git a/src/locales/en.json b/src/locales/en.json
index c82e85c49..adad4f8ad 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,85 @@
 {
+  "g": {
+    "currentUser": "Current user",
+    "empty": "Empty",
+    "noWorkflowsFound": "No workflows found.",
+    "comingSoon": "Coming Soon",
+    "firstTimeUIMessage": "This is the first time you use the new UI. Choose \"Menu > Use New Menu > Disabled\" to restore the old UI.",
+    "download": "Download",
+    "loadAllFolders": "Load All Folders",
+    "refresh": "Refresh",
+    "terminal": "Terminal",
+    "logs": "Logs",
+    "videoFailedToLoad": "Video failed to load",
+    "extensionName": "Extension Name",
+    "reloadToApplyChanges": "Reload to apply changes",
+    "insert": "Insert",
+    "systemInfo": "System Info",
+    "devices": "Devices",
+    "about": "About",
+    "add": "Add",
+    "confirm": "Confirm",
+    "reset": "Reset",
+    "resetKeybindingsTooltip": "Reset keybindings to default",
+    "customizeFolder": "Customize Folder",
+    "icon": "Icon",
+    "color": "Color",
+    "error": "Error",
+    "loading": "Loading",
+    "findIssues": "Find Issues",
+    "reportIssue": "Send Report",
+    "reportIssueTooltip": "Submit the error report to Comfy Org",
+    "reportSent": "Report Submitted",
+    "copyToClipboard": "Copy to Clipboard",
+    "openNewIssue": "Open New Issue",
+    "showReport": "Show Report",
+    "imageFailedToLoad": "Image failed to load",
+    "reconnecting": "Reconnecting",
+    "reconnected": "Reconnected",
+    "delete": "Delete",
+    "rename": "Rename",
+    "save": "Save",
+    "no": "No",
+    "cancel": "Cancel",
+    "close": "Close",
+    "overwrite": "Overwrite",
+    "customize": "Customize",
+    "experimental": "BETA",
+    "deprecated": "DEPR",
+    "loadWorkflow": "Load Workflow",
+    "goToNode": "Go to Node",
+    "settings": "Settings",
+    "searchWorkflows": "Search Workflows",
+    "searchSettings": "Search Settings",
+    "searchNodes": "Search Nodes",
+    "searchModels": "Search Models",
+    "searchKeybindings": "Search Keybindings",
+    "searchExtensions": "Search Extensions",
+    "noResultsFound": "No Results Found",
+    "searchFailedMessage": "We couldn't find any settings matching your search. Try adjusting your search terms.",
+    "noTasksFound": "No Tasks Found",
+    "noTasksFoundMessage": "There are no tasks in the queue.",
+    "newFolder": "New Folder"
+  },
+  "color": {
+    "default": "Default",
+    "blue": "Blue",
+    "green": "Green",
+    "red": "Red",
+    "pink": "Pink",
+    "yellow": "Yellow",
+    "custom": "Custom"
+  },
+  "icon": {
+    "bookmark": "Bookmark",
+    "folder": "Folder",
+    "star": "Star",
+    "heart": "Heart",
+    "file": "File",
+    "inbox": "Inbox",
+    "box": "Box",
+    "briefcase": "Briefcase"
+  },
   "welcome": {
     "title": "Welcome to ComfyUI",
     "getStarted": "Get Started"
@@ -87,63 +168,6 @@
     "revertChanges": "Revert Changes",
     "restart": "Restart"
   },
-  "currentUser": "Current user",
-  "empty": "Empty",
-  "noWorkflowsFound": "No workflows found.",
-  "comingSoon": "Coming Soon",
-  "firstTimeUIMessage": "This is the first time you use the new UI. Choose \"Menu > Use New Menu > Disabled\" to restore the old UI.",
-  "download": "Download",
-  "loadAllFolders": "Load All Folders",
-  "refresh": "Refresh",
-  "terminal": "Terminal",
-  "logs": "Logs",
-  "videoFailedToLoad": "Video failed to load",
-  "extensionName": "Extension Name",
-  "reloadToApplyChanges": "Reload to apply changes",
-  "insert": "Insert",
-  "systemInfo": "System Info",
-  "devices": "Devices",
-  "about": "About",
-  "add": "Add",
-  "confirm": "Confirm",
-  "reset": "Reset",
-  "resetKeybindingsTooltip": "Reset keybindings to default",
-  "customizeFolder": "Customize Folder",
-  "icon": "Icon",
-  "color": "Color",
-  "bookmark": "Bookmark",
-  "folder": "Folder",
-  "star": "Star",
-  "heart": "Heart",
-  "file": "File",
-  "inbox": "Inbox",
-  "box": "Box",
-  "briefcase": "Briefcase",
-  "error": "Error",
-  "loading": "Loading",
-  "findIssues": "Find Issues",
-  "reportIssue": "Send Report",
-  "reportIssueTooltip": "Submit the error report to Comfy Org",
-  "reportSent": "Report Submitted",
-  "copyToClipboard": "Copy to Clipboard",
-  "openNewIssue": "Open New Issue",
-  "showReport": "Show Report",
-  "imageFailedToLoad": "Image failed to load",
-  "reconnecting": "Reconnecting",
-  "reconnected": "Reconnected",
-  "delete": "Delete",
-  "rename": "Rename",
-  "save": "Save",
-  "no": "No",
-  "cancel": "Cancel",
-  "close": "Close",
-  "overwrite": "Overwrite",
-  "customize": "Customize",
-  "experimental": "BETA",
-  "deprecated": "DEPR",
-  "loadWorkflow": "Load Workflow",
-  "goToNode": "Go to Node",
-  "settings": "Settings",
   "settingsDialog": {
     "Comfy-Desktop_AutoUpdate": {
       "name": "Automatically check for updates"
@@ -428,17 +452,6 @@
       "name": "Always snap to grid"
     }
   },
-  "searchWorkflows": "Search Workflows",
-  "searchSettings": "Search Settings",
-  "searchNodes": "Search Nodes",
-  "searchModels": "Search Models",
-  "searchKeybindings": "Search Keybindings",
-  "searchExtensions": "Search Extensions",
-  "noResultsFound": "No Results Found",
-  "searchFailedMessage": "We couldn't find any settings matching your search. Try adjusting your search terms.",
-  "noTasksFound": "No Tasks Found",
-  "noTasksFoundMessage": "There are no tasks in the queue.",
-  "newFolder": "New Folder",
   "sideToolbar": {
     "themeToggle": "Toggle Theme",
     "logout": "Logout",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 70aa3f1f7..536124e6a 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1,26 +1,17 @@
 {
-  "about": "情報",
-  "add": "追加",
-  "bookmark": "ブックマーク",
-  "box": "ボックス",
-  "briefcase": "ブリーフケース",
-  "cancel": "キャンセル",
-  "close": "閉じる",
-  "color": "色",
-  "comingSoon": "近日公開",
-  "confirm": "確認",
-  "copyToClipboard": "クリップボードにコピー",
-  "currentUser": "現在のユーザー",
-  "customize": "カスタマイズ",
-  "customizeFolder": "フォルダーをカスタマイズ",
-  "delete": "削除",
-  "deprecated": "非推奨",
+  "color": {
+    "blue": "青",
+    "custom": "カスタム",
+    "default": "デフォルト",
+    "green": "緑",
+    "pink": "ピンク",
+    "red": "赤",
+    "yellow": "黄色"
+  },
   "desktopMenu": {
     "confirmReinstall": "これにより、extra_models_config.yamlファイルがクリアされ、再インストールが開始されます。本当によろしいですか？",
     "reinstall": "再インストール"
   },
-  "devices": "デバイス",
-  "download": "ダウンロード",
   "downloadGit": {
     "gitWebsite": "Gitをダウンロード",
     "instructions": "お使いのオペレーティングシステムに最新バージョンをダウンロードしてインストールしてください。以下の「Gitをダウンロード」ボタンをクリックすると、git-scm.comのダウンロードページが開きます。",
@@ -37,15 +28,68 @@
     "paused": "一時停止",
     "resume": "ダウンロードを再開"
   },
-  "empty": "表示する項目がありません",
-  "error": "エラー",
-  "experimental": "ベータ",
-  "extensionName": "拡張機能名",
-  "file": "ファイル",
-  "findIssues": "問題を探す",
-  "firstTimeUIMessage": "あなたはこの新しいUIを初めて使用します。もし以前のUIに戻したい場合は、\"メニュー > 新しいメニューを使用 > Disabled\"を選択してください。",
-  "folder": "フォルダー",
-  "goToNode": "ノードへ移動",
+  "g": {
+    "about": "情報",
+    "add": "追加",
+    "cancel": "キャンセル",
+    "close": "閉じる",
+    "color": "色",
+    "comingSoon": "近日公開",
+    "confirm": "確認",
+    "copyToClipboard": "クリップボードにコピー",
+    "currentUser": "現在のユーザー",
+    "customize": "カスタマイズ",
+    "customizeFolder": "フォルダーをカスタマイズ",
+    "delete": "削除",
+    "deprecated": "非推奨",
+    "devices": "デバイス",
+    "download": "ダウンロード",
+    "empty": "空",
+    "error": "エラー",
+    "experimental": "ベータ",
+    "extensionName": "拡張機能名",
+    "findIssues": "問題を見つける",
+    "firstTimeUIMessage": "新しいUIを初めて使用しています。「メニュー > 新しいメニューを使用 > 無効」を選択して古いUIに戻してください。",
+    "goToNode": "ノードに移動",
+    "icon": "アイコン",
+    "imageFailedToLoad": "画像の読み込みに失敗しました",
+    "insert": "挿入",
+    "loadAllFolders": "すべてのフォルダーを読み込む",
+    "loadWorkflow": "ワークフローを読み込む",
+    "loading": "読み込み中",
+    "logs": "ログ",
+    "newFolder": "新しいフォルダー",
+    "no": "いいえ",
+    "noResultsFound": "結果が見つかりません",
+    "noTasksFound": "タスクが見つかりません",
+    "noTasksFoundMessage": "キューにタスクがありません。",
+    "noWorkflowsFound": "ワークフローが見つかりません。",
+    "openNewIssue": "新しい問題を開く",
+    "overwrite": "上書き",
+    "reconnected": "再接続されました",
+    "reconnecting": "再接続中",
+    "refresh": "更新",
+    "reloadToApplyChanges": "変更を適用するには再読み込みしてください",
+    "rename": "名前を変更",
+    "reportIssue": "報告する",
+    "reportIssueTooltip": "エラーレポートをComfy Orgに送信",
+    "reportSent": "レポートが送信されました",
+    "reset": "リセット",
+    "resetKeybindingsTooltip": "キーバインディングをデフォルトにリセット",
+    "save": "保存",
+    "searchExtensions": "拡張機能を検索",
+    "searchFailedMessage": "検索に一致する設定が見つかりませんでした。検索用語を調整してみてください。",
+    "searchKeybindings": "キーバインディングを検索",
+    "searchModels": "モデルを検索",
+    "searchNodes": "ノードを検索",
+    "searchSettings": "設定を検索",
+    "searchWorkflows": "ワークフローを検索",
+    "settings": "設定",
+    "showReport": "レポートを表示",
+    "systemInfo": "システム情報",
+    "terminal": "ターミナル",
+    "videoFailedToLoad": "ビデオの読み込みに失敗しました"
+  },
   "graphCanvasMenu": {
     "fitView": "ビューに合わせる",
     "panMode": "パンモード",
@@ -55,11 +99,16 @@
     "zoomIn": "拡大",
     "zoomOut": "縮小"
   },
-  "heart": "ハート",
-  "icon": "アイコン",
-  "imageFailedToLoad": "画像の読み込みに失敗しました",
-  "inbox": "受信箱",
-  "insert": "挿入",
+  "icon": {
+    "bookmark": "ブックマーク",
+    "box": "ボックス",
+    "briefcase": "ブリーフケース",
+    "file": "ファイル",
+    "folder": "フォルダー",
+    "heart": "ハート",
+    "inbox": "受信トレイ",
+    "star": "星"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUIのアプリデータディレクトリ。保存内容:\n- ログ\n- サーバー設定",
     "appPathLocationTooltip": "ComfyUIのアプリ資産ディレクトリ。ComfyUIのコードとアセットを保存します",
@@ -100,10 +149,6 @@
     },
     "systemLocations": "システムの場所"
   },
-  "loadAllFolders": "すべてのフォルダーを読み込む",
-  "loadWorkflow": "ワークフローを読み込む",
-  "loading": "読み込み中",
-  "logs": "ログ",
   "menu": {
     "autoQueue": "自動キュー",
     "batchCount": "バッチ数",
@@ -191,12 +236,6 @@
     "Zoom In": "ズームイン",
     "Zoom Out": "ズームアウト"
   },
-  "newFolder": "新しいフォルダー",
-  "no": "いいえ",
-  "noResultsFound": "結果が見つかりませんでした",
-  "noTasksFound": "タスクが見つかりませんでした",
-  "noTasksFoundMessage": "キューにタスクがありません。",
-  "noWorkflowsFound": "ワークフローが見つかりませんでした。",
   "nodeCategories": {
     "3d_models": "3Dモデル",
     "DevTools": "デブツール",
@@ -1060,26 +1099,6 @@
     },
     "title": "お使いのデバイスはサポートされていません"
   },
-  "openNewIssue": "新しいIssueを開く",
-  "overwrite": "上書き",
-  "reconnected": "再接続しました",
-  "reconnecting": "再接続中",
-  "refresh": "更新",
-  "reloadToApplyChanges": "変更を適用するには再読み込みしてください",
-  "rename": "名前を変更",
-  "reportIssue": "レポートを送信",
-  "reportIssueTooltip": "エラーレポートをComfy Orgに送信",
-  "reportSent": "レポートを送信しました",
-  "reset": "リセット",
-  "resetKeybindingsTooltip": "キーバインドをデフォルトに戻す",
-  "save": "保存",
-  "searchExtensions": "拡張機能を検索",
-  "searchFailedMessage": "検索条件に一致する設定が見つかりませんでした。条件を変更して再試行してください。",
-  "searchKeybindings": "キーバインドを検索",
-  "searchModels": "モデルを検索",
-  "searchNodes": "ノードを検索",
-  "searchSettings": "設定を検索",
-  "searchWorkflows": "ワークフローを検索",
   "serverConfig": {
     "modifiedConfigs": "以下のサーバー設定を変更しました。変更を適用するには再起動してください。",
     "restart": "再起動",
@@ -1213,7 +1232,6 @@
     "reinstall": "再インストール",
     "reportIssue": "問題を報告"
   },
-  "settings": "設定",
   "settingsCategories": {
     "About": "情報",
     "Appearance": "外観",
@@ -1539,7 +1557,6 @@
       "name": "常にグリッドにスナップ"
     }
   },
-  "showReport": "レポートを表示",
   "sideToolbar": {
     "browseTemplates": "サンプルテンプレートを表示",
     "downloads": "ダウンロード",
@@ -1583,8 +1600,6 @@
     },
     "workflows": "ワークフロー"
   },
-  "star": "スター",
-  "systemInfo": "システム情報",
   "tabMenu": {
     "closeOtherTabs": "他のタブを閉じる",
     "closeTab": "タブを閉じる",
@@ -1601,7 +1616,6 @@
     },
     "title": "テンプレートを利用して開始"
   },
-  "terminal": "ターミナル",
   "userSelect": {
     "enterUsername": "ユーザー名を入力してください",
     "existingUser": "既存のユーザー",
@@ -1609,7 +1623,6 @@
     "next": "次へ",
     "selectUser": "ユーザーを選択"
   },
-  "videoFailedToLoad": "ビデオの読み込みに失敗しました",
   "welcome": {
     "getStarted": "はじめる",
     "title": "ComfyUIへようこそ"
diff --git a/src/locales/ru.json b/src/locales/ru.json
index deddf78ca..023dcdca1 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -1,26 +1,17 @@
 {
-  "about": "О",
-  "add": "Добавить",
-  "bookmark": "Закладка",
-  "box": "Ящик",
-  "briefcase": "Чемодан",
-  "cancel": "Отмена",
-  "close": "Закрыть",
-  "color": "Цвет",
-  "comingSoon": "Скоро",
-  "confirm": "Подтвердить",
-  "copyToClipboard": "Копировать в буфер обмена",
-  "currentUser": "Текущий пользователь",
-  "customize": "Настроить",
-  "customizeFolder": "Настроить папку",
-  "delete": "Удалить",
-  "deprecated": "УСТАР",
+  "color": {
+    "blue": "Синий",
+    "custom": "Пользовательский",
+    "default": "По умолчанию",
+    "green": "Зеленый",
+    "pink": "Розовый",
+    "red": "Красный",
+    "yellow": "Желтый"
+  },
   "desktopMenu": {
     "confirmReinstall": "Это очистит ваш файл extra_models_config.yaml и начнет установку заново. Вы уверены?",
     "reinstall": "Переустановить"
   },
-  "devices": "Устройства",
-  "download": "Скачать",
   "downloadGit": {
     "gitWebsite": "Скачать git",
     "instructions": "Пожалуйста, скачайте и установите последнюю версию для вашей операционной системы. Кнопка 'Скачать git' ниже открывает страницу загрузок git-scm.com.",
@@ -37,15 +28,68 @@
     "paused": "Приостановлено",
     "resume": "Возобновить загрузку"
   },
-  "empty": "Пусто",
-  "error": "Ошибка",
-  "experimental": "БЕТА",
-  "extensionName": "Название расширения",
-  "file": "Файл",
-  "findIssues": "Найти Issue",
-  "firstTimeUIMessage": "Это первый раз, когда вы используете новый интерфейс. Выберите \"Меню > Использовать новое меню > Disabled\", чтобы восстановить старый интерфейс.",
-  "folder": "Папка",
-  "goToNode": "Перейти к узлу",
+  "g": {
+    "about": "О программе",
+    "add": "Добавить",
+    "cancel": "Отмена",
+    "close": "Закрыть",
+    "color": "Цвет",
+    "comingSoon": "Скоро будет",
+    "confirm": "Подтвердить",
+    "copyToClipboard": "Скопировать в буфер обмена",
+    "currentUser": "Текущий пользователь",
+    "customize": "Настроить",
+    "customizeFolder": "Настроить папку",
+    "delete": "Удалить",
+    "deprecated": "УСТАРЕЛО",
+    "devices": "Устройства",
+    "download": "Скачать",
+    "empty": "Пусто",
+    "error": "Ошибка",
+    "experimental": "БЕТА",
+    "extensionName": "Имя расширения",
+    "findIssues": "Найти проблемы",
+    "firstTimeUIMessage": "Вы впервые используете новый интерфейс. Выберите \"Меню > Использовать новое меню > Отключено\", чтобы восстановить старый интерфейс.",
+    "goToNode": "Перейти к узлу",
+    "icon": "Иконка",
+    "imageFailedToLoad": "Не удалось загрузить изображение",
+    "insert": "Вставить",
+    "loadAllFolders": "Загрузить все папки",
+    "loadWorkflow": "Загрузить рабочий процесс",
+    "loading": "Загрузка",
+    "logs": "Журналы",
+    "newFolder": "Новая папка",
+    "no": "Нет",
+    "noResultsFound": "Результатов не найдено",
+    "noTasksFound": "Задачи не найдены",
+    "noTasksFoundMessage": "В очереди нет задач.",
+    "noWorkflowsFound": "Рабочие процессы не найдены.",
+    "openNewIssue": "Открыть новую проблему",
+    "overwrite": "Перезаписать",
+    "reconnected": "Переподключено",
+    "reconnecting": "Переподключение",
+    "refresh": "Обновить",
+    "reloadToApplyChanges": "Перезагрузите, чтобы применить изменения",
+    "rename": "Переименовать",
+    "reportIssue": "Отправить отчет",
+    "reportIssueTooltip": "Отправить отчет об ошибке в Comfy Org",
+    "reportSent": "Отчет отправлен",
+    "reset": "Сбросить",
+    "resetKeybindingsTooltip": "Сбросить сочетания клавиш к умолчанию",
+    "save": "Сохранить",
+    "searchExtensions": "Поиск расширений",
+    "searchFailedMessage": "Мы не смогли найти настройки, соответствующие вашему запросу. Попробуйте изменить поисковые термины.",
+    "searchKeybindings": "Поиск сочетаний клавиш",
+    "searchModels": "Поиск моделей",
+    "searchNodes": "Поиск узлов",
+    "searchSettings": "Поиск настроек",
+    "searchWorkflows": "Поиск рабочих процессов",
+    "settings": "Настройки",
+    "showReport": "Показать отчет",
+    "systemInfo": "Информация о системе",
+    "terminal": "Терминал",
+    "videoFailedToLoad": "Не удалось загрузить видео"
+  },
   "graphCanvasMenu": {
     "fitView": "Подгонять под выделенные",
     "panMode": "Режим панорамирования",
@@ -55,11 +99,16 @@
     "zoomIn": "Увеличить",
     "zoomOut": "Уменьшить"
   },
-  "heart": "Сердце",
-  "icon": "Иконка",
-  "imageFailedToLoad": "Изображение не удалось загрузить",
-  "inbox": "Входящие",
-  "insert": "Вставить",
+  "icon": {
+    "bookmark": "Закладка",
+    "box": "Коробка",
+    "briefcase": "Портфель",
+    "file": "Файл",
+    "folder": "Папка",
+    "heart": "Сердце",
+    "inbox": "Входящие",
+    "star": "Звезда"
+  },
   "install": {
     "appDataLocationTooltip": "Директория данных приложения ComfyUI. Хранит:\n- Логи\n- Конфигурации сервера",
     "appPathLocationTooltip": "Директория активов приложения ComfyUI. Хранит код и активы ComfyUI",
@@ -100,10 +149,6 @@
     },
     "systemLocations": "Системные места"
   },
-  "loadAllFolders": "Загрузить все папки",
-  "loadWorkflow": "Загрузить рабочий процесс",
-  "loading": "Загрузка",
-  "logs": "Логи",
   "menu": {
     "autoQueue": "Автоочередь",
     "batchCount": "Количество пакетов",
@@ -191,12 +236,6 @@
     "Zoom In": "Увеличить",
     "Zoom Out": "Уменьшить"
   },
-  "newFolder": "Новая папка",
-  "no": "Нет",
-  "noResultsFound": "Ничего не найдено",
-  "noTasksFound": "Задачи не найдены",
-  "noTasksFoundMessage": "В очереди нет задач.",
-  "noWorkflowsFound": "Рабочие процессы не найдены.",
   "nodeCategories": {
     "3d_models": "3d_модели",
     "DevTools": "Инструменты_разработчика",
@@ -1060,26 +1099,6 @@
     },
     "title": "Ваше устройство не поддерживается"
   },
-  "openNewIssue": "Открыть новый Issue",
-  "overwrite": "Перезаписать",
-  "reconnected": "Переподключено",
-  "reconnecting": "Переподключение",
-  "refresh": "Обновить",
-  "reloadToApplyChanges": "Перезагрузите, чтобы применить изменения",
-  "rename": "Переименовать",
-  "reportIssue": "Отправить отчет",
-  "reportIssueTooltip": "Отправить отчет об ошибке в Comfy Org",
-  "reportSent": "Отчет отправлен",
-  "reset": "Сбросить",
-  "resetKeybindingsTooltip": "Сбросить сочетания клавиш по умолчанию",
-  "save": "Сохранить",
-  "searchExtensions": "Поиск расширений",
-  "searchFailedMessage": "Не удалось найти ни одной настройки, соответствующей вашему запросу. Попробуйте скорректировать поисковый запрос.",
-  "searchKeybindings": "Поиск сочетаний клавиш",
-  "searchModels": "Поиск моделей",
-  "searchNodes": "Поиск узлов",
-  "searchSettings": "Поиск настроек",
-  "searchWorkflows": "Поиск рабочих процессов",
   "serverConfig": {
     "modifiedConfigs": "Вы изменили следующие конфигурации сервера. Перезапустите, чтобы применить изменения.",
     "restart": "Перезапустить",
@@ -1213,7 +1232,6 @@
     "reinstall": "Переустановить",
     "reportIssue": "Сообщить о проблеме"
   },
-  "settings": "Настройки",
   "settingsCategories": {
     "About": "О программе",
     "Appearance": "Внешний вид",
@@ -1539,7 +1557,6 @@
       "name": "Всегда привязываться к сетке"
     }
   },
-  "showReport": "Показать отчёт",
   "sideToolbar": {
     "browseTemplates": "Просмотреть примеры шаблонов",
     "downloads": "Загрузки",
@@ -1583,8 +1600,6 @@
     },
     "workflows": "Рабочие процессы"
   },
-  "star": "Звёздочка",
-  "systemInfo": "Информация о системе",
   "tabMenu": {
     "closeOtherTabs": "Закрыть другие вкладки",
     "closeTab": "Закрыть вкладку",
@@ -1601,7 +1616,6 @@
     },
     "title": "Начните работу с шаблона"
   },
-  "terminal": "Терминал",
   "userSelect": {
     "enterUsername": "Введите имя пользователя",
     "existingUser": "Существующий пользователь",
@@ -1609,7 +1623,6 @@
     "next": "Далее",
     "selectUser": "Выберите пользователя"
   },
-  "videoFailedToLoad": "Видео не удалось загрузить",
   "welcome": {
     "getStarted": "Начать",
     "title": "Добро пожаловать в ComfyUI"
diff --git a/src/locales/zh.json b/src/locales/zh.json
index b42e94652..f517214c1 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,26 +1,17 @@
 {
-  "about": "关于",
-  "add": "添加",
-  "bookmark": "书签",
-  "box": "盒子",
-  "briefcase": "公文包",
-  "cancel": "取消",
-  "close": "关闭",
-  "color": "颜色",
-  "comingSoon": "敬请期待",
-  "confirm": "确认",
-  "copyToClipboard": "复制到剪贴板",
-  "currentUser": "当前用户",
-  "customize": "定制",
-  "customizeFolder": "定制文件夹",
-  "delete": "删除",
-  "deprecated": "弃用",
+  "color": {
+    "blue": "蓝色",
+    "custom": "自定义",
+    "default": "默认",
+    "green": "绿色",
+    "pink": "粉色",
+    "red": "红色",
+    "yellow": "黄色"
+  },
   "desktopMenu": {
     "confirmReinstall": "这将清除您的 extra_models_config.yaml 文件，并重新开始安装。您确定吗？",
     "reinstall": "重新安装"
   },
-  "devices": "设备",
-  "download": "下载",
   "downloadGit": {
     "gitWebsite": "下载 git",
     "instructions": "请下载并安装适合您操作系统的最新版本。下面的下载 git 按钮将打开 git-scm.com 下载页面。",
@@ -37,15 +28,68 @@
     "paused": "已暂停",
     "resume": "恢复下载"
   },
-  "empty": "空",
-  "error": "错误",
-  "experimental": "BETA",
-  "extensionName": "扩展名称",
-  "file": "文件",
-  "findIssues": "查找 Issue",
-  "firstTimeUIMessage": "这是您第一次使用新界面。选择“菜单 > 使用新菜单 > Disabled”以恢复旧界面。",
-  "folder": "文件夹",
-  "goToNode": "前往节点",
+  "g": {
+    "about": "关于",
+    "add": "添加",
+    "cancel": "取消",
+    "close": "关闭",
+    "color": "颜色",
+    "comingSoon": "即将推出",
+    "confirm": "确认",
+    "copyToClipboard": "复制到剪贴板",
+    "currentUser": "当前用户",
+    "customize": "自定义",
+    "customizeFolder": "自定义文件夹",
+    "delete": "删除",
+    "deprecated": "已弃用",
+    "devices": "设备",
+    "download": "下载",
+    "empty": "空",
+    "error": "错误",
+    "experimental": "测试版",
+    "extensionName": "扩展名称",
+    "findIssues": "查找问题",
+    "firstTimeUIMessage": "这是您第一次使用新界面。选择 \"菜单 > 使用新菜单 > 禁用\" 来恢复旧界面。",
+    "goToNode": "转到节点",
+    "icon": "图标",
+    "imageFailedToLoad": "图像加载失败",
+    "insert": "插入",
+    "loadAllFolders": "加载所有文件夹",
+    "loadWorkflow": "加载工作流",
+    "loading": "加载中",
+    "logs": "日志",
+    "newFolder": "新文件夹",
+    "no": "否",
+    "noResultsFound": "未找到结果",
+    "noTasksFound": "未找到任务",
+    "noTasksFoundMessage": "队列中没有任务。",
+    "noWorkflowsFound": "未找到工作流。",
+    "openNewIssue": "打开新问题",
+    "overwrite": "覆盖",
+    "reconnected": "已重新连接",
+    "reconnecting": "重新连接中",
+    "refresh": "刷新",
+    "reloadToApplyChanges": "重新加载以应用更改",
+    "rename": "重命名",
+    "reportIssue": "发送报告",
+    "reportIssueTooltip": "向 Comfy Org 提交错误报告",
+    "reportSent": "报告已提交",
+    "reset": "重置",
+    "resetKeybindingsTooltip": "将快捷键重置为默认",
+    "save": "保存",
+    "searchExtensions": "搜索扩展",
+    "searchFailedMessage": "我们找不到任何与您的搜索匹配的设置。请尝试调整您的搜索词。",
+    "searchKeybindings": "搜索快捷键",
+    "searchModels": "搜索模型",
+    "searchNodes": "搜索节点",
+    "searchSettings": "搜索设置",
+    "searchWorkflows": "搜索工作流",
+    "settings": "设置",
+    "showReport": "显示报告",
+    "systemInfo": "系统信息",
+    "terminal": "终端",
+    "videoFailedToLoad": "视频加载失败"
+  },
   "graphCanvasMenu": {
     "fitView": "适应视图",
     "panMode": "平移模式",
@@ -55,11 +99,16 @@
     "zoomIn": "放大",
     "zoomOut": "缩小"
   },
-  "heart": "心",
-  "icon": "图标",
-  "imageFailedToLoad": "图像加载失败",
-  "inbox": "收件箱",
-  "insert": "插入",
+  "icon": {
+    "bookmark": "书签",
+    "box": "盒子",
+    "briefcase": "公文包",
+    "file": "文件",
+    "folder": "文件夹",
+    "heart": "心",
+    "inbox": "收件箱",
+    "star": "星星"
+  },
   "install": {
     "appDataLocationTooltip": "ComfyUI 的应用数据目录。存储：\n- 日志\n- 服务器配置",
     "appPathLocationTooltip": "ComfyUI 的应用资产目录。存储 ComfyUI 代码和资产",
@@ -100,10 +149,6 @@
     },
     "systemLocations": "系统位置"
   },
-  "loadAllFolders": "加载所有文件夹",
-  "loadWorkflow": "加载工作流",
-  "loading": "加载中",
-  "logs": "日志",
   "menu": {
     "autoQueue": "自动执行",
     "batchCount": "批次数量",
@@ -191,12 +236,6 @@
     "Zoom In": "放大",
     "Zoom Out": "缩小"
   },
-  "newFolder": "新建文件夹",
-  "no": "不",
-  "noResultsFound": "未找到结果",
-  "noTasksFound": "未找到任务",
-  "noTasksFoundMessage": "队列中没有任务。",
-  "noWorkflowsFound": "未找到工作流",
   "nodeCategories": {
     "3d_models": "3D模型",
     "DevTools": "开发工具",
@@ -1060,26 +1099,6 @@
     },
     "title": "您的设备不受支持"
   },
-  "openNewIssue": "开启新 Issue",
-  "overwrite": "覆盖",
-  "reconnected": "已重新连接",
-  "reconnecting": "重新连接中",
-  "refresh": "刷新",
-  "reloadToApplyChanges": "重新加载以应用更改",
-  "rename": "重命名",
-  "reportIssue": "发送报告",
-  "reportIssueTooltip": "将错误报告提交给 Comfy 组织",
-  "reportSent": "报告已提交",
-  "reset": "重置",
-  "resetKeybindingsTooltip": "重置键位",
-  "save": "保存",
-  "searchExtensions": "搜索插件",
-  "searchFailedMessage": "我们找不到与您的搜索匹配的任何设置。请尝试调整搜索条件。",
-  "searchKeybindings": "搜索键位",
-  "searchModels": "搜索模型",
-  "searchNodes": "搜索节点",
-  "searchSettings": "搜索设置",
-  "searchWorkflows": "搜索工作流",
   "serverConfig": {
     "modifiedConfigs": "您已修改以下服务器配置。重启以应用更改。",
     "restart": "重启",
@@ -1213,7 +1232,6 @@
     "reinstall": "重新安装",
     "reportIssue": "报告问题"
   },
-  "settings": "设置",
   "settingsCategories": {
     "About": "关于",
     "Appearance": "外观",
@@ -1539,7 +1557,6 @@
       "name": "始终吸附到网格"
     }
   },
-  "showReport": "显示报告",
   "sideToolbar": {
     "browseTemplates": "浏览示例模板",
     "downloads": "下载",
@@ -1583,8 +1600,6 @@
     },
     "workflows": "工作流"
   },
-  "star": "星星",
-  "systemInfo": "系统信息",
   "tabMenu": {
     "closeOtherTabs": "关闭其他标签",
     "closeTab": "关闭标签",
@@ -1601,7 +1616,6 @@
     },
     "title": "从模板开始"
   },
-  "terminal": "终端",
   "userSelect": {
     "enterUsername": "输入用户名",
     "existingUser": "已有用户",
@@ -1609,7 +1623,6 @@
     "next": "下一步",
     "selectUser": "选择用户"
   },
-  "videoFailedToLoad": "视频加载失败",
   "welcome": {
     "getStarted": "开始使用",
     "title": "欢迎使用 ComfyUI"
diff --git a/src/views/GraphView.vue b/src/views/GraphView.vue
index 9cfeae883..219f30b76 100644
--- a/src/views/GraphView.vue
+++ b/src/views/GraphView.vue
@@ -123,7 +123,7 @@ const onStatus = (e: CustomEvent<StatusWsMessageStatus>) => {
 
 const reconnectingMessage: ToastMessageOptions = {
   severity: 'error',
-  summary: t('reconnecting')
+  summary: t('g.reconnecting')
 }
 
 const onReconnecting = () => {
@@ -135,7 +135,7 @@ const onReconnected = () => {
   toast.remove(reconnectingMessage)
   toast.add({
     severity: 'success',
-    summary: t('reconnected'),
+    summary: t('g.reconnected'),
     life: 2000
   })
 }