style: login placeholder

Resource names are unique per owning principal, so different users
can legally create same-name GPU instances, templates, SSH public
keys, storage volumes and storage types — but the admin's
cross-tenant lists and the instance-create template picker rendered
them indistinguishably.

- Group the template picker by owning scope: Your Templates, Global
  Templates, then — admin cross-tenant view only — one group per
  owner. A single group renders flat without headers. A plugin can
  take over grouping via hooks.useTemplateOwnerGroups when its
  principal model scopes templates beyond USER owners; a plugin
  without the hook keeps the flat list.
- Add an admin-only Creator column to the Instances, SSH Public
  Keys, Storage and Storage Types tables, sitting right before
  Created (mirroring the API Keys page convention). Resolves
  creator_id to a username via the user directory, falling back to
  owner_principal_id for legacy rows — a personal-scope row's
  creator IS its owner.
- Tag template cards with their owner scope (Global / username) for
  admins.

The Creator column and the card tag defer to a plugin that registers
the page's list columns / the OwnerScopeTag slot. Requires the
gpustack server change that records creator_id on templates, SSH
public keys and storage types.

.prettierignore

@@ -3,7 +3,6 @@ node_modules
 .umi-production
 public/static/*.js
 public/static/*.css
-src/components/icon-font/iconfont/iconfont.js
-src/components/icon-font/iconfont/*.css
+src/components/iconfont/
 
 

.stylelintrc.js

@@ -3,5 +3,5 @@ module.exports = {
   rules: {
     'selector-class-pattern': null
   },
-  ignoreFiles: ['public/static/*.css']
+  ignoreFiles: ['public/static/*.css', 'src/components/iconfont/iconfont.css']
 };

config/proxy.ts

@@ -31,5 +31,6 @@ export default function createProxyTable(target?: string) {
     },
     {}
   );
+
   return proxyTable;
 }

config/routes.ts

@@ -140,15 +140,6 @@ const baseRoutes = [
         access: 'canSeeOrgAdmin',
         component: './model-routes/index'
       },
-      {
-        name: 'usage',
-        path: '/models/usage',
-        key: 'usage',
-        icon: 'icon-usage-outlined',
-        selectedIcon: 'icon-usage-filled',
-        defaultIcon: 'icon-usage-outlined',
-        component: './usage/index'
-      },
       {
         name: 'providers',
         path: '/models/providers',
@@ -179,6 +170,26 @@ const baseRoutes = [
         access: 'canSeeOrgAdmin',
         hideInMenu: true,
         component: './benchmark/details'
+      },
+      {
+        name: 'backendsList',
+        path: '/models/backends',
+        key: 'backendsList',
+        icon: 'icon-backend',
+        selectedIcon: 'icon-backend-filled',
+        defaultIcon: 'icon-backend',
+        access: 'canSeeOrgAdmin',
+        component: './backends/index'
+      },
+      {
+        name: 'modelfiles',
+        path: '/models/modelfiles',
+        key: 'modelfiles',
+        icon: 'icon-files',
+        selectedIcon: 'icon-files-filled',
+        defaultIcon: 'icon-files',
+        access: 'canSeeOrgAdmin',
+        component: './resources/components/model-files'
       }
     ]
   },
@@ -186,6 +197,7 @@ const baseRoutes = [
     name: 'gpuService',
     path: '/gpu-service',
     key: 'gpuService',
+    access: 'canSeeGpuService',
     routes: [
       {
         path: '/gpu-service',
@@ -223,7 +235,12 @@ const baseRoutes = [
         path: '/gpu-service/storage-types',
         key: 'gpuServiceStorageTypes',
         icon: 'icon-storage-outlined',
-        access: 'canSeeAdmin',
+        // Storage types are tenant-scoped on the backend (Org owners
+        // can create/list their own), so the menu shouldn't be
+        // platform-admin-only. ``canSeeOrgAdmin`` keeps the gate at
+        // "admin or current-org owner" — Org members still don't see
+        // it, which matches the read/write model in the route.
+        access: 'canSeeOrgAdmin',
         selectedIcon: 'icon-storage-filled',
         defaultIcon: 'icon-storage-outlined',
         component: './gpu-service/storage-types'
@@ -249,6 +266,16 @@ const baseRoutes = [
         path: '/resources',
         redirect: '/resources/workers'
       },
+      {
+        name: 'clusters',
+        path: '/resources/clusters/list',
+        key: 'clusters',
+        icon: 'icon-cluster2-outline',
+        selectedIcon: 'icon-cluster2-filled',
+        defaultIcon: 'icon-cluster2-outline',
+        component: './cluster-management/clusters',
+        subMenu: ['/resources/clusters/detail', '/resources/clusters/create']
+      },
       {
         name: 'workers',
         path: '/resources/workers',
@@ -268,67 +295,62 @@ const baseRoutes = [
         component: './resources/components/gpus'
       },
       {
-        name: 'backendsList',
-        path: '/resources/backends',
-        key: 'backendsList',
-        icon: 'icon-backend',
-        selectedIcon: 'icon-backend-filled',
-        defaultIcon: 'icon-backend',
-        access: 'canSeeOrgAdmin',
-        component: './backends/index'
-      },
-      {
-        name: 'modelfiles',
-        path: '/resources/modelfiles',
-        key: 'modelfiles',
-        icon: 'icon-files',
-        selectedIcon: 'icon-files-filled',
-        defaultIcon: 'icon-files',
-        component: './resources/components/model-files'
-      }
-    ]
-  },
-  {
-    name: 'clusterManagement',
-    path: '/cluster-management',
-    key: 'clusterManagement',
-    access: 'canSeeOrgAdmin',
-    routes: [
-      {
-        path: '/cluster-management',
-        redirect: '/cluster-management/clusters/list'
-      },
-      {
-        name: 'clusters',
-        path: '/cluster-management/clusters/list',
-        key: 'clusters',
-        icon: 'icon-cluster2-outline',
-        selectedIcon: 'icon-cluster2-filled',
-        defaultIcon: 'icon-cluster2-outline',
-        component: './cluster-management/clusters',
-        subMenu: [
-          '/cluster-management/clusters/detail',
-          '/cluster-management/clusters/create'
-        ]
+        name: 'credentials',
+        path: '/resources/credentials',
+        key: 'credentials',
+        icon: 'icon-credential-outline',
+        selectedIcon: 'icon-credential-filled',
+        defaultIcon: 'icon-credential-outline',
+        component: './cluster-management/credentials'
       },
       {
         name: 'clusterDetail',
-        path: '/cluster-management/clusters/detail',
+        path: '/resources/clusters/detail',
         key: 'clusterDetail',
         icon: 'icon-cluster2-outline',
         selectedIcon: 'icon-cluster2-filled',
         defaultIcon: 'icon-cluster2-outline',
         hideInMenu: true,
         component: './cluster-management/cluster-detail'
+      }
+    ]
+  },
+  {
+    // Cross-resource consumption (tokens + GPU/CPU instances + storage).
+    // A folder so it matches the other top-level groups; more usage views can
+    // graduate in here later.
+    name: 'billingAndUsage',
+    path: '/usage',
+    key: 'usageGroup',
+    icon: 'icon-usage-outlined',
+    selectedIcon: 'icon-usage-filled',
+    defaultIcon: 'icon-usage-outlined',
+    routes: [
+      {
+        path: '/usage',
+        redirect: '/usage/overview'
       },
       {
-        name: 'credentials',
-        path: '/cluster-management/credentials',
-        key: 'credentials',
-        icon: 'icon-credential-outline',
-        selectedIcon: 'icon-credential-filled',
-        defaultIcon: 'icon-credential-outline',
-        component: './cluster-management/credentials'
+        name: 'usage',
+        path: '/usage/overview',
+        key: 'usage',
+        icon: 'icon-usage-outlined',
+        selectedIcon: 'icon-usage-filled',
+        defaultIcon: 'icon-usage-outlined',
+        component: './usage/index'
+      },
+      {
+        name: 'billing',
+        path: '/usage/billing',
+        key: 'billing',
+        icon: 'icon-billing-outlined',
+        selectedIcon: 'icon-billing-filled',
+        defaultIcon: 'icon-billing-outlined',
+        // OSS exposes the menu as a teaser for the enterprise billing
+        // module. The page itself just renders an upsell notice — the real
+        // billing UI lives in the enterprise plugin and shadows this route
+        // via `routes.extensions.ts`.
+        component: './billing'
       }
     ]
   },
@@ -341,6 +363,20 @@ const baseRoutes = [
         path: '/access-control',
         redirect: '/access-control/users'
       },
+      {
+        name: 'organizations',
+        path: '/access-control/organizations',
+        key: 'organizations',
+        icon: 'icon-org-outlined',
+        selectedIcon: 'icon-org-filled',
+        defaultIcon: 'icon-org-outlined',
+        // OSS exposes the menu to platform admins as a teaser for the
+        // enterprise multi-tenancy module. The page itself just renders
+        // an upsell notice — the real CRUD UI lives in the enterprise
+        // plugin and shadows this route via `routes.extensions.ts`.
+        access: 'canSeeAdmin',
+        component: './organizations'
+      },
       {
         name: 'users',
         path: '/access-control/users',
@@ -374,8 +410,8 @@ const baseRoutes = [
   },
   {
     name: 'profile',
-    path: '/profile',
-    key: 'profile',
+    path: '/preferences',
+    key: 'preferences',
     hideInMenu: true,
     component: './profile',
     icon: 'User'

config/utils.ts

@@ -1,13 +1,27 @@
-const child_process = require('child_process');
+import { execSync } from 'child_process';
 
 export const getBranchInfo = () => {
-  const latestCommit = child_process
-    .execSync('git rev-parse HEAD')
-    .toString()
-    .trim();
-  const versionTag = child_process
-    .execSync(`git tag --contains ${latestCommit}`)
-    .toString()
-    .trim();
-  return { version: versionTag || '', commitId: latestCommit.slice(0, 7) };
+  // git may be absent (source archive, bare container) or this tree may
+  // not be a git checkout. Swallow the failure and fall back to the env
+  // overrides below — losing build info shouldn't fail the build.
+  let latestCommit = '';
+  let versionTag = '';
+  try {
+    latestCommit = execSync('git rev-parse HEAD').toString().trim();
+    versionTag = execSync(`git tag --contains ${latestCommit}`)
+      .toString()
+      .trim();
+  } catch {
+    // Not a git checkout / git unavailable; rely on env overrides.
+  }
+  // Respect explicit GPUSTACK_UI_* overrides so a wrapping build that
+  // checks this source tree out as a sub-package can stamp its own
+  // release tag and commit id onto the UI (otherwise the panel reports
+  // the host tree's git HEAD, which the wrapper doesn't control).
+  const overrideVersion = process.env.GPUSTACK_UI_VERSION?.trim();
+  const overrideCommitId = process.env.GPUSTACK_UI_COMMIT_ID?.trim();
+  return {
+    version: overrideVersion || versionTag || '',
+    commitId: overrideCommitId || latestCommit.slice(0, 7)
+  };
 };

eslint.config.js

@@ -14,7 +14,8 @@ export default defineConfig([
     'dist',
     'src/.umi/',
     'src/.umi-production/',
-    'src/.umi-test/'
+    'src/.umi-test/',
+    'src/components/iconfont/'
   ]),
   {
     files: ['**/*.{ts,tsx,js,jsx}'],

package.json

@@ -17,7 +17,7 @@
     "@ant-design/pro-components": "3.1.0-0",
     "@antv/g6": "^5.0.51",
     "@braintree/sanitize-url": "^7.1.1",
-    "@gpustack/core-ui": "^1.0.16",
+    "@gpustack/core-ui": "^1.0.27",
     "@huggingface/gguf": "^0.1.7",
     "@huggingface/hub": "^0.15.1",
     "@huggingface/tasks": "^0.11.6",

plugin.ts

@@ -5,6 +5,8 @@ export default (api: IApi) => {
     const info = JSON.parse(process.env.VERSION || '{}');
     const env = process.env.NODE_ENV;
 
+    $('html').attr('lang', 'en');
+
     $('html').attr('data-env', env);
 
     $('html').attr(

pnpm-lock.yaml

@@ -24,8 +24,8 @@ importers:
         specifier: ^7.1.1
         version: 7.1.2
       '@gpustack/core-ui':
-        specifier: ^1.0.16
-        version: 1.0.16(czdvzceysqw7iv6pct2ucnb23e)
+        specifier: ^1.0.27
+        version: 1.0.27(czdvzceysqw7iv6pct2ucnb23e)
       '@huggingface/gguf':
         specifier: ^0.1.7
         version: 0.1.18
@@ -1484,8 +1484,8 @@ packages:
     resolution: {integrity: sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==, tarball: https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz}
     deprecated: the package is rather renamed to @formatjs/ecma-abstract with some changes in functionality (primarily selectUnit is removed and we don't plan to make any further changes to this package
 
-  '@gpustack/core-ui@1.0.16':
-    resolution: {integrity: sha512-wFKDv7X0FXRmAmZPt4WKYV0+aGHcx82/3EZSJkrut/49XQd5XdrqKaimGtlFWFCNEWqsouwzs4uqaC7JFqfOkQ==, tarball: https://registry.npmjs.org/@gpustack/core-ui/-/core-ui-1.0.16.tgz}
+  '@gpustack/core-ui@1.0.27':
+    resolution: {integrity: sha512-m3ue0EHFKULla0mpnpxZwn9LVaGKS+HnuzQYSBECQa4vaP8MEEQsR7oFBtG8bhWUWYA9VzP6k7fjozDkP6TymA==, tarball: https://registry.npmjs.org/@gpustack/core-ui/-/core-ui-1.0.27.tgz}
     peerDependencies:
       '@ant-design/icons': '>=6.0.0'
       '@ant-design/pro-components': 3.1.0-0
@@ -10808,7 +10808,7 @@ snapshots:
 
   '@formatjs/intl-utils@2.3.0': {}
 
-  '@gpustack/core-ui@1.0.16(czdvzceysqw7iv6pct2ucnb23e)':
+  '@gpustack/core-ui@1.0.27(czdvzceysqw7iv6pct2ucnb23e)':
     dependencies:
       '@ant-design/icons': 6.2.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       '@ant-design/pro-components': 3.1.0-0(antd@6.3.7(date-fns@2.30.0)(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -11829,7 +11829,7 @@ snapshots:
 
   '@types/history@5.0.0':
     dependencies:
-      history: 4.10.1
+      history: 5.3.0
 
   '@types/hoist-non-react-statics@3.3.7(@types/react@18.3.28)':
     dependencies:
@@ -11915,7 +11915,7 @@ snapshots:
       '@types/history': 4.7.11
       '@types/react': 18.3.29
       '@types/react-router': 5.1.20
-      redux: 3.7.2
+      redux: 4.2.1
 
   '@types/react-router@5.1.20':
     dependencies:

src/access.ts

@@ -1,6 +1,10 @@
 import { applyAccessExtensions } from './access.extensions';
 
-export default (initialState: { currentUser?: Global.UserInfo }) => {
+export default (initialState: {
+  currentUser?: Global.UserInfo;
+  hasKubernetesCluster?: boolean;
+  hasResourceEvents?: boolean;
+}) => {
   const isPlatformAdmin = !!(
     initialState &&
     initialState.currentUser &&
@@ -11,6 +15,16 @@ export default (initialState: { currentUser?: Global.UserInfo }) => {
     initialState.currentUser &&
     !initialState.currentUser.is_admin
   );
+  // GPU Service is Kubernetes-only. We only gate visibility down when
+  // the probe in `getInitialState` came back with a definitive answer;
+  // `undefined` (probe failed / not yet ready) collapses to the
+  // role-based default so a transient network blip can't lock anyone
+  // out of the menu.
+  const hasKubernetesCluster = initialState?.hasKubernetesCluster;
+  // Having run GPU/CPU instances or storage (any resource_events) also unlocks
+  // GPU Service / the full Usage page — a user who used it keeps seeing it even
+  // without a current cluster. MaaS-only users (no cluster, no events) don't.
+  const hasResourceEvents = !!initialState?.hasResourceEvents;
 
   // Predicate roles, top-down by strictness:
   //   * `canSeeAdmin` — strictly platform admin (`users.is_admin`).
@@ -18,6 +32,11 @@ export default (initialState: { currentUser?: Global.UserInfo }) => {
   //   * `canSeeOrgAdmin` — admin-style menus that work cross-org
   //     (Dashboard, Resources, Models, Cluster Management). Defaults
   //     to platform admin; extensions widen to include org admins.
+  //   * `canSeeGpuService` — GPU Service menu. Anyone allowed to
+  //     manage clusters (admins, Org owners) sees it; non-admins fall
+  //     through to "show only if a Kubernetes cluster is actually
+  //     reachable" so Org members without scheduling access don't see
+  //     a dead-end menu item.
   //   * `canManageCurrentOrg` — pages that only make sense inside a
   //     specific org context (member / group management). Defaults to
   //     `false`; extensions widen when both an org is selected AND
@@ -27,6 +46,8 @@ export default (initialState: { currentUser?: Global.UserInfo }) => {
   return applyAccessExtensions({
     canSeeAdmin: isPlatformAdmin,
     canSeeOrgAdmin: isPlatformAdmin,
+    canSeeGpuService:
+      isPlatformAdmin || hasKubernetesCluster !== false || hasResourceEvents,
     canManageCurrentOrg: false,
     canSeeUser,
     canDelete: true,

src/app.tsx

@@ -1,8 +1,12 @@
 import { userSettingsHelperAtom } from '@/atoms/settings';
-import { GPUStackVersionAtom, UpdateCheckAtom } from '@/atoms/user';
+import { GPUStackVersionAtom, UpdateCheckAtom, userAtom } from '@/atoms/user';
 import { setAtomStorage } from '@/atoms/utils';
 import { DEFAULT_ENTER_PAGE, GPUSTACK_API_BASE_URL } from '@/config/settings';
 import { COLOR_PRIMARY } from '@/config/theme/constants';
+import { queryClusterList } from '@/pages/cluster-management/apis';
+import { ProviderValueMap } from '@/pages/cluster-management/config';
+import { queryResourceEvents } from '@/pages/usage/apis/resource';
+import { getGPUStackPlugin } from '@/plugins';
 import { enterprisePluginReady } from '@/plugins/enterprise-ready';
 import { GPUStackPluginManager } from '@/plugins/manager';
 import { requestConfig } from '@/request-config';
@@ -13,6 +17,7 @@ import {
 } from '@/services/profile/apis';
 import { fetchSystemConfig } from '@/services/system/query-system-config';
 import { isOnline } from '@/utils';
+import { installTenantFetch } from '@/utils/install-fetch';
 import {
   IS_FIRST_LOGIN,
   readState,
@@ -22,6 +27,8 @@ import '@gpustack/core-ui/style.css';
 import { RequestConfig, history, request as umiRequest } from '@umijs/max';
 import { message } from 'antd';
 
+installTenantFetch();
+
 // only for the first login and access from http://localhost
 
 const checkDefaultPage = async (userInfo: any) => {
@@ -34,11 +41,87 @@ const checkDefaultPage = async (userInfo: any) => {
   }
 };
 
+// Probes the caller's cluster list once so access predicates can gate
+// GPU Service (Kubernetes-only). Cheap (one list request) and never
+// blocks login — any failure just falls back to `undefined`, which
+// the predicate treats as "unknown / don't restrict beyond role".
+// The result is also mirrored into sessionStorage so access extensions
+// that run without the initialState argument can read it (e.g. to
+// override the admin shortcut in scopes where the menu shouldn't
+// show even for admins).
+const HAS_K8S_CLUSTER_KEY = 'hasKubernetesCluster';
+const probeHasKubernetesCluster = async (): Promise<boolean | undefined> => {
+  try {
+    const res = await queryClusterList(
+      { page: -1 },
+      {
+        skipErrorHandler: true
+      }
+    );
+    const value = (res?.items ?? []).some(
+      (c) => c?.provider === ProviderValueMap.Kubernetes
+    );
+    try {
+      window.sessionStorage.setItem(HAS_K8S_CLUSTER_KEY, JSON.stringify(value));
+    } catch {
+      // sessionStorage may be unavailable (Safari private mode); the
+      // access predicate already handles a missing value as "unknown".
+    }
+    return value;
+  } catch (error) {
+    console.error('probeHasKubernetesCluster error', error);
+    try {
+      window.sessionStorage.removeItem(HAS_K8S_CLUSTER_KEY);
+    } catch {
+      // ignore
+    }
+    return undefined;
+  }
+};
+
+// Probes whether the caller has ANY resource-usage events (GPU/CPU instance or
+// storage lifecycle). Used alongside the cluster probe so a user who has run
+// GPU instances still sees GPU Service / the full Usage page even if they
+// currently have no Kubernetes cluster. Mirrored into sessionStorage for the
+// access extensions; any failure → undefined ("unknown — don't restrict").
+const HAS_RESOURCE_EVENTS_KEY = 'hasResourceEvents';
+const probeHasResourceEvents = async (): Promise<boolean | undefined> => {
+  try {
+    // No date range = "ever"; scope is clamped to the caller server-side.
+    const res = await queryResourceEvents(
+      { perPage: 1 },
+      {
+        skipErrorHandler: true
+      }
+    );
+    const value = (res?.pagination?.total ?? 0) > 0;
+    try {
+      window.sessionStorage.setItem(
+        HAS_RESOURCE_EVENTS_KEY,
+        JSON.stringify(value)
+      );
+    } catch {
+      // sessionStorage may be unavailable; predicate treats missing as unknown.
+    }
+    return value;
+  } catch (error) {
+    console.error('probeHasResourceEvents error', error);
+    try {
+      window.sessionStorage.removeItem(HAS_RESOURCE_EVENTS_KEY);
+    } catch {
+      // ignore
+    }
+    return undefined;
+  }
+};
+
 // runtime configuration
 export async function getInitialState(): Promise<{
   fetchUserInfo: () => Promise<Global.UserInfo>;
   currentUser?: Global.UserInfo;
   pluginData?: Record<string, any>;
+  hasKubernetesCluster?: boolean;
+  hasResourceEvents?: boolean;
 }> {
   const { location } = history;
 
@@ -83,6 +166,36 @@ export async function getInitialState(): Promise<{
         getUpdateCheck();
         fetchSystemConfig();
       }
+      // Only commit a substantive user object. A truthy-but-empty
+      // `data` (e.g. server responded 200 with an empty body) would
+      // otherwise look like "logged in" to every `currentUser`
+      // reader and the access seam — break out instead and let the
+      // caller treat the request as failed.
+      if (data && typeof data === 'object' && Object.keys(data).length > 0) {
+        // Commit the identity to atom storage (and so to localStorage)
+        // before returning. The access function — memoized on
+        // `initialState` and run once per commit — reads identity from
+        // localStorage; without this preemptive write the predicate
+        // sees the prior session's identity on its first evaluation
+        // after login, and stays stale until the next identity change
+        // (which usually doesn't come without a manual refresh).
+        try {
+          setAtomStorage(userAtom, data);
+        } catch (err) {
+          console.error('userAtom commit error:', err);
+        }
+        // Fire `onUserFetched` so plugins maintaining identity-scoped
+        // caches can seed them under the new identity before any
+        // caller commits this user to `initialState`. Errors here are
+        // swallowed and logged — fetchUserInfo must still return.
+        try {
+          await getGPUStackPlugin()?.login?.onUserFetched?.(data, {
+            request: umiRequest
+          });
+        } catch (err) {
+          console.error('onUserFetched plugin hook error:', err);
+        }
+      }
       return data;
     } catch (error: any) {
       const data = error?.response?.data;
@@ -122,12 +235,19 @@ export async function getInitialState(): Promise<{
   getAppVersionInfo();
 
   if (![DEFAULT_ENTER_PAGE.login].includes(location.pathname)) {
-    const userInfo = await fetchUserInfo();
+    const [userInfo, hasKubernetesCluster, hasResourceEvents] =
+      await Promise.all([
+        fetchUserInfo(),
+        probeHasKubernetesCluster(),
+        probeHasResourceEvents()
+      ]);
     checkDefaultPage(userInfo);
     return {
       fetchUserInfo,
       currentUser: userInfo,
-      pluginData
+      pluginData,
+      hasKubernetesCluster,
+      hasResourceEvents
     };
   }
   return {

src/assets/styles/menu.less

@@ -3,6 +3,7 @@
     .ant-layout-sider-children {
       border-inline: none;
       border-radius: 0;
+      padding-inline-end: 0;
       padding-block-end: 8px;
     }
 

src/atoms/clusters.ts

@@ -63,6 +63,12 @@ export const fromClusterCreationAtom = atom(false);
 export const clusterSessionAtom = atom<{
   firstAddWorker: boolean;
   firstAddCluster: boolean;
+  // Provider to preselect when the create flow opens — set by the
+  // empty-state CTA on feature pages that need a specific provider
+  // (e.g. GPU Service can only schedule on Kubernetes, so its
+  // "Add Cluster" button skips provider catalog and lands on the
+  // K8s configure step). Consumed once by ClusterCreate on mount.
+  providerHint?: string;
 } | null>(null);
 
 export const clusterDetailAtom = atom<ClusterListItem | null>(null);

src/atoms/gpuservice.ts

@@ -1,10 +0,0 @@
-import { ClusterListItem } from '@/pages/cluster-management/config/types';
-import { atom } from 'jotai';
-
-export const currentClusterAtom = atom<
-  (Partial<ClusterListItem> & { label?: string; value?: number }) | null
->(null);
-
-export const addSSHKeyPageAtom = atom<{ create: boolean }>({
-  create: false
-});

src/atoms/settings.ts

@@ -55,3 +55,10 @@ export const userSettingsHelperAtom = atom(
   }
 );
 export const hideModalTemporarilyAtom = atom<boolean>(false);
+
+export const collapsedMenuGroupsAtom = atomWithStorage<string[]>(
+  'collapsedMenuGroups',
+  [],
+  undefined,
+  { getOnInit: true }
+);

src/atoms/user.ts

@@ -3,6 +3,15 @@ import { atomWithStorage } from 'jotai/utils';
 
 export const userAtom = atomWithStorage<any>('userInfo', null);
 
+// Backs the `currentOrganizationId` localStorage key. Stays null in
+// builds with no Org context (single-tenant), and is shared with any
+// extension that persists the same key so both sides stay in sync
+// without one side having to import from the other.
+export const currentOrganizationIdAtom = atomWithStorage<number | null>(
+  'currentOrganizationId',
+  null
+);
+
 export const GPUStackVersionAtom = atom<{
   version: string;
   git_commit: string;
@@ -23,10 +32,7 @@ export const UpdateCheckAtom = atom<{
   latest_version: ''
 });
 
-export const initialPasswordAtom = atomWithStorage<string>(
-  'initialPassword',
-  ''
-);
+export const initialPasswordAtom = atom<string>('');
 
 // Namespace the server creates for an Org's resources on each Kubernetes
 // cluster. The format must match the backend's ``get_namespace_name``
@@ -81,23 +87,57 @@ const getStoredCurrentOrgId = (): number | null => {
 // cluster-owner fallback.
 const ORG_CACHE_KEYS = ['organizationList', 'allOrganizations'] as const;
 
-const lookupOrgNamespace = (id: number | null): string | null => {
+export interface CachedOrg {
+  id: number;
+  name?: string;
+  // The platform Org (single global tenant). Its models are NOT
+  // namespaced in ``/v1/models`` — they appear under their bare name.
+  is_platform?: boolean;
+}
+
+// Resolve the cached Org record for an owner/principal id by scanning both
+// org caches. ``organizationList`` (the caller's member orgs) is checked
+// alongside the admin-only ``allOrganizations`` so member sessions resolve
+// too. Id types vary between localStorage payloads (some writers stringify,
+// others persist as a JSON number), so compare as strings — strict equality
+// would silently miss those cases.
+export const getOrgById = (
+  id: number | string | null | undefined
+): CachedOrg | null => {
   if (id == null) return null;
-  // Normalise both sides to strings — the stored id type varies between
-  // localStorage payloads (some writers stringify, others persist as a
-  // JSON number); strict equality would silently miss those cases.
   const target = String(id);
   for (const key of ORG_CACHE_KEYS) {
     try {
       const raw = localStorage.getItem(key);
       if (!raw) continue;
-      const list = JSON.parse(raw) as Array<{ id: number; name?: string }>;
+      const list = JSON.parse(raw) as CachedOrg[];
       if (!Array.isArray(list)) continue;
       const match = list.find((item) => String(item?.id) === target);
-      if (match?.name) return `gpustack-${match.name}`;
+      if (match) return match;
     } catch {
       // ignore malformed cache; continue checking other keys
     }
   }
   return null;
 };
+
+// Bare Org *name* (e.g. ``org1``) for an owner/principal id, or null.
+export const getOrgNameById = (
+  id: number | string | null | undefined
+): string | null => {
+  return getOrgById(id)?.name ?? null;
+};
+
+const lookupOrgNamespace = (id: number | null): string | null => {
+  const name = getOrgNameById(id);
+  return name ? `gpustack-${name}` : null;
+};
+
+// The Org the caller is currently acting under, or null in the admin-"All"
+// context. The org-switcher reloads the page on switch, so the list pages
+// always show this org's resources — which is how ``/v1/models`` namespaces
+// their model ids (``{org}/{name}``). Callers reconstructing that id use this
+// as the fallback owner when a row carries no explicit ``owner_principal_id``.
+export const getCurrentOrg = (): CachedOrg | null => {
+  return getOrgById(getStoredCurrentOrgId());
+};

src/config/global.d.ts

@@ -92,6 +92,12 @@ declare namespace Global {
   interface InitialStateType {
     fetchUserInfo: () => Promise<UserInfo>;
     currentUser?: UserInfo;
+    // Captured at app boot so access predicates can gate GPU Service —
+    // the feature is Kubernetes-only, and Org members without a K8s
+    // cluster they can schedule on shouldn't see the menu. Refreshed
+    // by full page reload (e.g. OrgSwitcher) which re-runs
+    // getInitialState.
+    hasKubernetesCluster?: boolean;
   }
 
   type SearchParams = Pagination & { search?: string; [key: string]: any };

src/config/theme/dark.ts

@@ -54,7 +54,8 @@ export default {
       itemHoverColor: 'rgba(0,0,0,1)',
       itemColor: 'rgba(0,0,0,1)',
       itemHoverBg: 'rgb(24 25 27)',
-      itemActiveBg: 'rgb(24 25 27)'
+      itemActiveBg: 'rgb(24 25 27)',
+      menuItemSelectedBg: '#292929'
     },
     Progress: {
       lineBorderRadius: 4
@@ -108,6 +109,7 @@ export default {
     fontSize: 14,
     motion: true,
     colorFill: '#0A0A0A',
-    colorBgBase: '#0A0A0A'
+    colorBgBase: '#0A0A0A',
+    menuItemSelectedBg: '#292929'
   }
 };

src/config/theme/light.ts

@@ -56,7 +56,8 @@ export default {
       itemHoverColor: 'rgba(0,0,0,1)',
       itemColor: 'rgba(0,0,0,1)',
       itemHoverBg: 'rgba(0,0,0,0.04)',
-      itemActiveBg: 'rgba(0,0,0,0.04)'
+      itemActiveBg: 'rgba(0,0,0,0.04)',
+      menuItemSelectedBg: '#e8eaed'
     },
     Progress: {
       lineBorderRadius: 3

src/global.less

@@ -171,8 +171,6 @@ body {
   }
 
   .ant-table .ant-table-container table {
-    // border-spacing: 0 20px;
-
     .ant-table-thead th.ant-table-column-sort {
       background-color: transparent;
 
@@ -241,8 +239,8 @@ body {
     height: 100%;
 
     .ant-pro-sider-footer {
-      padding-block: 2px 0;
-      padding-left: 6px;
+      padding-block: 4px 0;
+      padding-left: 8px;
     }
 
     .ant-pro-sider-actions-list-item {
@@ -259,46 +257,27 @@ body {
       border-block-end: none;
     }
 
-    .ant-pro-sider-logo-collapsed {
-      padding-left: 12px;
-      cursor: e-resize;
-
-      .collapse-wrap {
-        display: none;
-        position: absolute;
-        top: 12px;
-
-        &::after {
-          content: '';
-          position: absolute;
-          height: 48px;
-          width: 64px;
-          top: -16px;
-          left: -16px;
-        }
-      }
-
-      &:hover {
-        .collapse-wrap {
-          display: block;
+    .ant-pro-sider-logo {
+      .collapse-btn {
+        color: var(--ant-color-text-tertiary);
+        :hover {
+          color: var(--ant-color-text);
         }
       }
     }
 
-    .ant-pro-sider .ant-layout-sider-children {
-      // border-right: 1px solid var(--ant-color-split);
+    .ant-pro-sider-logo-collapsed {
+      padding-left: 6px;
     }
   }
 
-  .ant-table-content table {
-    .ant-table-tbody {
-      .ant-table-row {
-        border-radius: var(--table-td-radius);
+  .ant-table .ant-table-tbody {
+    .ant-table-row {
+      border-radius: var(--table-td-radius);
 
-        > td {
-          background-color: unset;
-          border-bottom: 1px solid var(--ant-color-split);
-        }
+      > td {
+        background-color: unset !important;
+        border-bottom: 1px solid var(--ant-color-split);
       }
     }
   }
@@ -347,7 +326,6 @@ body {
   .ant-pro-layout-container {
     overflow-x: auto;
     min-height: 100vh;
-    // background-color: var(--ant-color-bg-container);
   }
 
   .ant-pro-sider {
@@ -812,6 +790,8 @@ body {
 }
 
 .ant-pro-sider-logo + div {
+  display: flex;
+  overflow: hidden;
   &::-webkit-scrollbar {
     width: 0;
   }

src/hooks/use-submit-lock.ts

@@ -0,0 +1,46 @@
+import { useMemoizedFn } from 'ahooks';
+import { useRef, useState } from 'react';
+
+/**
+ * Centralizes the anti-double-submit + anti-deadlock logic shared by the
+ * "add/edit" modals.
+ *
+ * The lock has to straddle antd's async field validation, whose result comes
+ * back through two separate callbacks (`onFinish` / `onFinishFailed`). So the
+ * three wiring points below are intentional and map 1:1 to those anchors:
+ *
+ * - `guard`   wrap the submit trigger (button / ModalFooter onOk). Blocks
+ *             re-entry while a submit is already in flight, then fires submit.
+ * - `run`     wrap the `onFinish` handler. Holds the lock + loading until the
+ *             `onOk` request settles (success or error).
+ * - `release` pass as the form's `onFinishFailed`. Releases the lock when
+ *             validation fails, otherwise the button would dead-lock.
+ */
+export default function useSubmitLock() {
+  const [loading, setLoading] = useState<boolean>(false);
+  const lockRef = useRef<boolean>(false);
+
+  const release = useMemoizedFn(() => {
+    setLoading(false);
+    lockRef.current = false;
+  });
+
+  const guard = useMemoizedFn((submit: () => void) => {
+    if (lockRef.current) {
+      return;
+    }
+    lockRef.current = true;
+    submit();
+  });
+
+  const run = useMemoizedFn(async (task: () => void | Promise<void>) => {
+    setLoading(true);
+    try {
+      await task();
+    } finally {
+      release();
+    }
+  });
+
+  return { loading, guard, run, release };
+}

src/hooks/use-table-fetch.ts

@@ -37,6 +37,7 @@ export default function useTableFetch<T>(
     key?: (typeof PaginationKey)[keyof typeof PaginationKey];
     fetchAPI: (params: any, options?: any) => Promise<Global.PageResponse<T>>;
     deleteAPI?: (id: number, params?: any) => Promise<any>;
+    afterDelete?: (id?: number | number[]) => void;
     contentForDelete?: string;
     defaultData?: any[];
     events?: EventsType[];
@@ -48,6 +49,7 @@ export default function useTableFetch<T>(
   const {
     fetchAPI,
     deleteAPI,
+    afterDelete,
     contentForDelete,
     API,
     polling = false,
@@ -363,7 +365,7 @@ export default function useTableFetch<T>(
 
         // remove the deleted id from selected ids in row selection
         rowSelection.removeSelectedKeys([row.id]);
-
+        afterDelete?.(row.id);
         // ======== to avoid fetch data twice, because of debounceFetchData has been run =======
         if (!updateManually) {
           fetchData();
@@ -390,6 +392,7 @@ export default function useTableFetch<T>(
             successIds.push(id);
           }
         );
+        afterDelete?.(successIds);
         rowSelection.removeSelectedKeys(successIds);
         fetchData();
         return res;

src/hooks/use-update-chunk-list.ts

@@ -14,7 +14,6 @@ type EventsType = 'CREATE' | 'UPDATE' | 'DELETE' | 'INSERT';
 export function useUpdateChunkedList(options: {
   events?: EventsType[];
   dataList?: any[];
-  triggerAt?: React.MutableRefObject<number>;
   limit?: number;
   onCreate?: (args: any) => void;
   onUpdate?: (args: any) => void;
@@ -24,9 +23,9 @@ export function useUpdateChunkedList(options: {
   filterFun?: (args: any) => boolean;
   mapFun?: (args: any) => any;
   computedID?: (d: object) => string;
+  isNewItem?: (item: any) => boolean;
 }) {
-  const { events = ['CREATE', 'DELETE', 'UPDATE', 'INSERT'], triggerAt } =
-    options;
+  const { events = ['CREATE', 'DELETE', 'UPDATE', 'INSERT'] } = options;
   const deletedIdsRef = useRef<Set<number | string>>(new Set());
   const cacheDataListRef = useRef<any[]>(options.dataList || []);
   const timerRef = useRef<any>(null);
@@ -71,17 +70,14 @@ export function useUpdateChunkedList(options: {
           (sItem: any) => sItem.id === item.id
         );
         const updateItem = { ...item };
-        if (updateIndex === -1 && !triggerAt?.current) {
+        if (updateIndex === -1) {
           acc.push(updateItem);
-        } else if (!triggerAt?.current) {
+        } else {
           cacheDataListRef.current[updateIndex] = updateItem;
         }
+        // only push items created after the watch started
 
-        // TODO： only push items created after triggerAt
-        if (
-          triggerAt?.current &&
-          Date.parse(item.created_at) >= triggerAt.current
-        ) {
+        if (options.isNewItem?.(item)) {
           latestCreateList.push(updateItem);
         }
 
@@ -93,6 +89,10 @@ export function useUpdateChunkedList(options: {
         ...cacheDataListRef.current
       ].slice(0, limit);
 
+      options.setDataList?.([...cacheDataListRef.current], {
+        createdIds: newDataList.map((item) => item.id)
+      });
+
       options.onCreate?.(latestCreateList);
     }
 
@@ -103,10 +103,8 @@ export function useUpdateChunkedList(options: {
       cacheDataListRef.current = cacheDataListRef.current?.filter(
         (item: any) => {
           // collect deleted items
-          if (triggerAt?.current) {
-            if (ids?.includes(item.id)) {
-              deletedList.push(item);
-            }
+          if (ids?.includes(item.id) && !options.isNewItem?.(item)) {
+            deletedList.push(item);
           }
           return !ids?.includes(item.id);
         }
@@ -133,10 +131,8 @@ export function useUpdateChunkedList(options: {
             updateItem,
             ...cacheDataListRef.current.slice(0, limit - 1)
           ];
-          if (options.onUpdate && triggerAt?.current) {
-            if (Date.parse(item.created_at) >= triggerAt.current) {
-              options.onUpdate?.([updateItem]);
-            }
+          if (options.onUpdate && options.isNewItem?.(item)) {
+            options.onUpdate?.([updateItem]);
           }
         }
       });

src/hooks/use-watch-list.ts

@@ -63,8 +63,7 @@ export default function useWatchList<T = Record<string, any>>(API: string) {
       listRequestTokenRef.current?.cancel?.();
       listRequestTokenRef.current = createAxiosToken();
       const params = {
-        page: 1,
-        perPage: 100
+        page: -1
       };
       const res: any = await queryAllDataList(params, {
         token: listRequestTokenRef.current.token
@@ -86,6 +85,7 @@ export default function useWatchList<T = Record<string, any>>(API: string) {
 
   return {
     watchDataList,
+    setWatchDataList,
     deleteItemFromCache: handleDeleteItemFromCache
   };
 }

src/layouts/extraRender.tsx

@@ -18,6 +18,7 @@ import { useAtom } from 'jotai';
 import { useMemo } from 'react';
 import styled from 'styled-components';
 import { DEFAULT_ENTER_PAGE } from '../config/settings';
+import GithubStar from './github-star';
 
 const NewLabel = styled.span`
   position: relative;
@@ -210,14 +211,14 @@ export const ExtraContent = (props: { isDarkTheme?: boolean }) => {
         key: 'settings',
         label: (
           <span className="flex flex-center">
-            <IconFont type="icon-settings-02" />
+            <IconFont type="icon-preferences" />
             <span className="m-l-8" style={{ marginLeft: 8 }}>
-              {intl?.formatMessage?.({ id: 'common.button.settings' })}
+              {intl?.formatMessage?.({ id: 'common.preferences' })}
             </span>
           </span>
         ),
         onClick: () => {
-          history.push('/profile');
+          history.push('/preferences');
         }
       }
     ]
@@ -260,6 +261,7 @@ export const ExtraContent = (props: { isDarkTheme?: boolean }) => {
     <Wrapper>
       {contextHolder}
       <PluginExtraField name="OrgSwitcher" isDarkTheme={isDarkTheme} />
+      {process.env.ENABLE_ENTERPRISE !== 'true' && <GithubStar />}
       <div
         style={{
           display: 'flex',

src/layouts/github-star.tsx

@@ -0,0 +1,140 @@
+import externalLinks from '@/constants/external-links';
+import { GithubFilled } from '@ant-design/icons';
+import { useIntl } from '@umijs/max';
+import { Tooltip } from 'antd';
+import { useEffect, useState } from 'react';
+import styled from 'styled-components';
+
+const REPO = 'gpustack/gpustack';
+const CACHE_KEY = 'gpustack:github-stars';
+const CACHE_TTL = 24 * 60 * 60 * 1000;
+const FETCH_TIMEOUT = 4000;
+
+const StarLink = styled.a`
+  display: inline-flex;
+  align-items: stretch;
+  height: 24px;
+  border-radius: var(--ant-border-radius);
+  border: 1px solid var(--ant-color-border-secondary);
+  background-color: var(--ant-color-bg-container);
+  color: var(--ant-color-text-secondary);
+  font-size: 12px;
+  line-height: 1;
+  overflow: hidden;
+  transition:
+    border-color 0.2s,
+    color 0.2s;
+
+  &:hover {
+    border-color: var(--ant-color-border);
+    color: var(--ant-color-text);
+  }
+
+  .seg {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 0 8px;
+  }
+
+  .seg + .seg {
+    border-left: 1px solid var(--ant-color-border-secondary);
+    background-color: var(--ant-color-fill-quaternary);
+  }
+
+  .anticon {
+    font-size: 13px;
+  }
+
+  .count {
+    font-weight: 500;
+    font-variant-numeric: tabular-nums;
+    min-width: 1.5em;
+    text-align: center;
+  }
+`;
+
+const formatCount = (n: number): string => {
+  if (n >= 1000) {
+    const k = n / 1000;
+    return k >= 10 ? `${Math.round(k)}k` : `${k.toFixed(1)}k`;
+  }
+  return String(n);
+};
+
+type CacheEntry = { value: number; time: number };
+
+const readCache = (): CacheEntry | null => {
+  try {
+    const raw = localStorage.getItem(CACHE_KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw);
+    if (typeof parsed?.value !== 'number' || typeof parsed?.time !== 'number') {
+      return null;
+    }
+    return parsed;
+  } catch {
+    return null;
+  }
+};
+
+const writeCache = (value: number) => {
+  try {
+    localStorage.setItem(
+      CACHE_KEY,
+      JSON.stringify({ value, time: Date.now() })
+    );
+  } catch {
+    // ignore quota errors
+  }
+};
+
+const GithubStar = () => {
+  const intl = useIntl();
+  const [count, setCount] = useState<number | null>(
+    () => readCache()?.value ?? null
+  );
+
+  useEffect(() => {
+    const cached = readCache();
+    const fresh = cached && Date.now() - cached.time < CACHE_TTL;
+    if (fresh) return;
+
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), FETCH_TIMEOUT);
+
+    fetch(`https://api.github.com/repos/${REPO}`, { signal: controller.signal })
+      .then((r) => (r.ok ? r.json() : null))
+      .then((data) => {
+        if (!data || typeof data.stargazers_count !== 'number') return;
+        setCount(data.stargazers_count);
+        writeCache(data.stargazers_count);
+      })
+      .catch(() => {
+        // offline, blocked, rate-limited — stay hidden if no cache
+      })
+      .finally(() => clearTimeout(timer));
+
+    return () => {
+      clearTimeout(timer);
+      controller.abort();
+    };
+  }, []);
+
+  return (
+    <Tooltip title={intl.formatMessage({ id: 'common.github.star.tooltip' })}>
+      <StarLink href={externalLinks.github} target="_blank" rel="noreferrer">
+        <span className="seg">
+          <GithubFilled />
+        </span>
+        <span className="seg">
+          <span className="count">
+            {count != null ? formatCount(count) : 'Star'}
+          </span>
+        </span>
+      </StarLink>
+    </Tooltip>
+  );
+};
+
+export default GithubStar;

src/layouts/index.tsx

@@ -1,6 +1,7 @@
 import { routeCacheAtom, setRouteCache } from '@/atoms/route-cache';
 import { userAtom } from '@/atoms/user';
 import DarkMask from '@/components/dark-mask';
+import '@/components/iconfont/iconfont.js';
 import PluginExtraFields from '@/components/plugin-extra-fields';
 import routeCachekey from '@/config/route-cachekey';
 import { DEFAULT_ENTER_PAGE, GPUSTACK_API_BASE_URL } from '@/config/settings';
@@ -20,11 +21,7 @@ import {
 import { useAccessMarkedRoutes } from '@@/plugin-access';
 import { useModel } from '@@/plugin-model';
 import { ProLayout } from '@ant-design/pro-components';
-import {
-  CoreUIProvider,
-  IconFont,
-  useOverlayScroller
-} from '@gpustack/core-ui';
+import { CoreUIProvider, IconFont } from '@gpustack/core-ui';
 import {
   Access,
   Outlet,
@@ -71,9 +68,9 @@ const NO_CONTAINER_PAGES = [
 
 const CHECK_RESOURCE_PATH = [
   '/resources/workers',
-  '/cluster-management/clusters/list',
-  '/cluster-management/credentials',
-  '/cluster-management/clusters/create'
+  '/resources/clusters/list',
+  '/resources/credentials',
+  '/resources/clusters/create'
 ];
 
 type NewRoute = IRoute & {
@@ -134,9 +131,6 @@ const mapRoutes = (routes: IRoute[], role: string) => {
 };
 
 export default (props: any) => {
-  const { initialize: initialize } = useOverlayScroller({
-    defer: false
-  });
   const [, contextHolder] = Modal.useModal();
   const { themeData, setUserSettings, userSettings } = useUserSettings();
   const [userInfo] = useAtom(userAtom);
@@ -240,30 +234,7 @@ export default (props: any) => {
   }, [userSettings.collapsed]);
 
   const renderMenuHeader = (logo: React.ReactNode, title: React.ReactNode) => {
-    return (
-      <>
-        {logo}
-        <div className="collapse-wrap" onClick={handleToggleCollapse}>
-          <Button
-            style={{
-              marginRight: collapsed ? 0 : -14,
-              border: 'none',
-              cursor: 'w-resize'
-            }}
-            size="small"
-            type={collapsed ? 'default' : 'text'}
-          >
-            <IconFont
-              type={collapsed ? 'icon-expand-left' : 'icon-expand-right'}
-              className="font-size-18 text-secondary"
-              style={{
-                display: 'block'
-              }}
-            />
-          </Button>
-        </div>
-      </>
-    );
+    return <>{logo}</>;
   };
 
   const menuContentRender = (menuProps: any, defaultDom: React.ReactNode) => {
@@ -356,7 +327,7 @@ export default (props: any) => {
         config={{
           apiBaseUrl: GPUSTACK_API_BASE_URL,
           theme: userSettings.theme,
-          iconUrl: '//at.alicdn.com/t/c/font_4613488_jmdepcs90im.js',
+          iconUrl: '',
           isDarkTheme: userSettings.isDarkTheme,
           defaultColorPrimary: COLOR_PRIMARY
         }}
@@ -407,9 +378,23 @@ export default (props: any) => {
           openKeys={false}
           disableMobile={true}
           siderWidth={220}
+          menuFooterRender={() => (
+            <Button
+              style={{
+                border: 'none'
+              }}
+              size="small"
+              type={'text'}
+              onClick={handleToggleCollapse}
+            >
+              <IconFont
+                type={collapsed ? 'icon-expand-left' : 'icon-expand-right'}
+                className="font-size-18"
+              />
+            </Button>
+          )}
           onCollapse={onCollapse}
           onMenuHeaderClick={onMenuHeaderClick}
-          menuHeaderRender={renderMenuHeader}
           collapsed={userSettings.collapsed}
           onPageChange={onPageChange}
           formatMessage={formatMessage}

src/layouts/rightRender.tsx

@@ -256,7 +256,7 @@ export const getRightRenderContent = (opts: {
               </span>
             ),
             onClick: () => {
-              history.push('/profile');
+              history.push('/preferences');
             }
           },
           {

src/layouts/sider-menu.tsx

@@ -1,9 +1,11 @@
+import { collapsedMenuGroupsAtom } from '@/atoms/settings';
 import { CaretDownOutlined } from '@ant-design/icons';
-import { IconFont } from '@gpustack/core-ui';
+import { IconFont, OverlayScroller } from '@gpustack/core-ui';
 import { Link, useLocation } from '@umijs/max';
 import { Tooltip } from 'antd';
-import { createStyles } from 'antd-style';
-import React, { useMemo, useState } from 'react';
+import { createStyles, type FullToken } from 'antd-style';
+import { useAtom } from 'jotai';
+import React, { useMemo } from 'react';
 
 interface MenuItem {
   icon?: string;
@@ -20,124 +22,143 @@ interface SiderMenuProps {
   initialState: Global.InitialStateType;
 }
 
-const useStyles = createStyles(({ css, token }) => {
-  console.log('useStyles', token);
+const useStyles = createStyles(
+  ({ css, token }: { css: any; token: FullToken }) => {
+    console.log('useStyles', token);
 
-  // @ts-ignore
-  const { Menu } = token;
+    // @ts-ignore
+    const { Menu } = token;
 
-  return {
-    siderMenu: css`
-      &.sider-menu-collapsed {
-        .menu-item {
-          justify-content: center;
-          padding: 0;
-        }
-      }
-    `,
-    groupTitle: css`
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      cursor: pointer;
-      white-space: nowrap;
-      padding: var(--ant-padding-xs) var(--ant-padding);
-      font-size: 12px;
-      padding-bottom: 4px;
-      overflow: hidden;
-      height: 30px;
-      &:hover {
-        .group-title-text {
-          color: var(--ant-color-text);
-        }
-      }
-      .anticon {
-        transform: scale(0.8);
-      }
-      .group-title-text {
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        font-size: 12px;
-        color: var(--ant-color-text-tertiary);
-        font-weight: 400;
-      }
-
-      &.menu-item-group-title-collapsed {
-        position: relative;
-        height: 1px;
-        padding-block: 0;
-        padding-inline: 0;
-        justify-content: center;
-      }
-    `,
-    menuItemContent: css`
-      margin: 2px 0;
-      border-radius: 4px;
-      overflow: hidden;
-    `,
-    menuItemWrapper: css`
-      display: flex;
-      align-items: center;
-      justify-content: flex-start;
-      gap: 12px;
-      cursor: pointer;
-      position: relative;
-      padding-inline: calc(var(--ant-font-size) * 2) var(--ant-padding);
-      padding-left: 16px;
-      overflow: hidden;
-      white-space: nowrap;
-      height: ${Menu.itemHeight}px;
-      line-height: ${Menu.itemHeight}px;
-      color: var(--ant-color-text-tertiary);
-      &:hover {
-        background-color: ${Menu.itemHoverBg};
-        color: ${Menu.itemHoverColor};
-      }
-      &.menu-item-selected {
-        background-color: ${Menu.itemSelectedBg};
-        color: ${Menu.itemSelectedColor};
-        .anticon {
-          color: ${Menu.itemSelectedColor};
-        }
-      }
-      &:active {
-        background-color: ${Menu.itemActiveBg};
-        color: ${Menu.itemActiveColor};
-      }
-      .anticon {
-        font-size: 16px;
-      }
-      .icon-wrapper {
-        display: flex;
-        align-items: center;
-        justify-content: center;
+    return {
+      siderMenu: css`
         width: 100%;
-        height: 100%;
-      }
-    `,
-    menuItemGroup: css`
-      &.menu-item-group-hidden {
-        display: none;
-      }
-    `,
-    line: css`
-      height: 1px;
-      margin-block: 6px;
-      background-color: ${token.colorSplit};
-      position: absolute;
-      left: -2px;
-      right: -2px;
-    `
-  };
-});
+        &.sider-menu-collapsed {
+          .menu-item {
+            justify-content: center;
+            padding: 0;
+          }
+        }
+        .os-scrollbar-vertical .os-scrollbar-handle {
+          min-width: 4px;
+          max-width: 4px;
+        }
+      `,
+      groupTitle: css`
+        display: flex;
+        align-items: center;
+        gap: 8px;
+        cursor: pointer;
+        white-space: nowrap;
+        padding: var(--ant-padding-xs) var(--ant-padding);
+        font-size: 12px;
+        padding-bottom: 4px;
+        overflow: hidden;
+        height: 30px;
+        &:hover {
+          .group-title-text {
+            color: var(--ant-color-text);
+          }
+        }
+        .anticon {
+          transform: scale(0.8);
+        }
+        .group-title-text {
+          display: flex;
+          align-items: center;
+          gap: 4px;
+          font-size: 12px;
+          color: var(--ant-color-text);
+          font-weight: 400;
+        }
+
+        &.menu-item-group-title-collapsed {
+          position: relative;
+          height: 1px;
+          padding-block: 0;
+          padding-inline: 0;
+          justify-content: center;
+        }
+      `,
+      menuItemContent: css`
+        margin: 2px 0;
+        border-radius: 4px;
+        overflow: hidden;
+      `,
+      menuItemWrapper: css`
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        gap: 12px;
+        cursor: pointer;
+        position: relative;
+        padding-inline: calc(var(--ant-font-size) * 2) var(--ant-padding);
+        padding-left: 16px;
+        overflow: hidden;
+        white-space: nowrap;
+        height: ${Menu.itemHeight}px;
+        line-height: ${Menu.itemHeight}px;
+        color: var(--ant-color-text-tertiary);
+        &:hover {
+          background-color: ${Menu.itemHoverBg};
+          color: ${Menu.itemHoverColor};
+        }
+        &.menu-item-selected {
+          background-color: ${Menu.menuItemSelectedBg};
+          color: ${Menu.itemSelectedColor};
+
+          .anticon {
+            color: ${Menu.itemSelectedColor};
+          }
+        }
+        &:active {
+          background-color: ${Menu.itemActiveBg};
+          color: ${Menu.itemActiveColor};
+        }
+        .anticon {
+          font-size: 16px;
+        }
+        .icon-wrapper {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 100%;
+          height: 100%;
+        }
+      `,
+      menuItemGroup: css`
+        &.menu-item-group-hidden {
+          display: none;
+        }
+      `,
+      line: css`
+        height: 1px;
+        margin-block: 6px;
+        background-color: ${token.colorSplit};
+        position: absolute;
+        left: -2px;
+        right: -2px;
+      `
+    };
+  }
+);
 
 const SiderMenu: React.FC<SiderMenuProps> = (props) => {
   const { menuData, collapsed } = props;
   const { styles, cx } = useStyles();
   const location = useLocation();
-  const [collapseKeys, setCollapseKeys] = useState<Set<string>>(new Set());
-  console.log('SiderMenu', location.pathname);
+  const [storedCollapsedGroups, setCollapsedGroups] = useAtom(
+    collapsedMenuGroupsAtom
+  );
+  // atomWithStorage falls back to the initial value on JSON parse
+  // errors, but not when the stored value is valid JSON of another
+  // shape — normalize so array methods below can't throw.
+  const collapsedGroups = Array.isArray(storedCollapsedGroups)
+    ? storedCollapsedGroups
+    : [];
+  const collapseKeys = useMemo(
+    () => new Set(collapsedGroups),
+    [collapsedGroups]
+  );
 
   const dividerStyles = useMemo(() => {
     if (collapsed) {
@@ -156,14 +177,11 @@ const SiderMenu: React.FC<SiderMenuProps> = (props) => {
   const handleToggleGroup = (e: any, menuGroup: any) => {
     e.stopPropagation();
 
-    console.log('handleToggleGroup', menuGroup.key);
-
-    if (collapseKeys.has(menuGroup.key)) {
-      collapseKeys.delete(menuGroup.key);
-    } else {
-      collapseKeys.add(menuGroup.key);
-    }
-    setCollapseKeys(new Set(collapseKeys));
+    setCollapsedGroups(
+      collapsedGroups.includes(menuGroup.key)
+        ? collapsedGroups.filter((key) => key !== menuGroup.key)
+        : [...collapsedGroups, menuGroup.key]
+    );
   };
 
   const menuItemRender = (menuItem: MenuItem, key: string) => {
@@ -219,44 +237,55 @@ const SiderMenu: React.FC<SiderMenuProps> = (props) => {
         'sider-menu-collapsed': collapsed
       })}
     >
-      {menuData.map((item: MenuItem, index: number) => (
-        <div key={item.key}>
-          {item.children && item.children.length > 0 ? (
-            <>
-              <div
-                className={cx(styles.groupTitle, {
-                  'menu-item-group-title-collapsed': collapsed
-                })}
-                onClick={(e) => handleToggleGroup(e, item)}
-              >
-                {!collapsed ? (
-                  <span className="group-title-text">
-                    <span>{item.name}</span>
-                    <CaretDownOutlined
-                      rotate={collapseKeys.has(item.key) ? -90 : 0}
-                    ></CaretDownOutlined>
-                  </span>
-                ) : (
-                  <span className={styles.line}></span>
-                )}
-              </div>
-              <div
-                className={cx(styles.menuItemGroup, {
-                  'menu-item-group-collapsed': collapsed,
-                  'menu-item-group-hidden':
-                    !collapsed && collapseKeys.has(item.key)
-                })}
-              >
-                {item.children?.map((child: MenuItem) =>
-                  menuItemRender(child, child.key)
-                )}
-              </div>
-            </>
-          ) : (
-            menuItemRender(item, item.key)
-          )}
+      <OverlayScroller
+        styles={{
+          wrapper: {
+            paddingInline: 0,
+            maxHeight: '100%'
+          }
+        }}
+      >
+        <div style={{ paddingRight: 8 }}>
+          {menuData.map((item: MenuItem, index: number) => (
+            <div key={item.key}>
+              {item.children && item.children.length > 0 ? (
+                <>
+                  <div
+                    className={cx(styles.groupTitle, {
+                      'menu-item-group-title-collapsed': collapsed
+                    })}
+                    onClick={(e) => handleToggleGroup(e, item)}
+                  >
+                    {!collapsed ? (
+                      <span className="group-title-text">
+                        <span>{item.name}</span>
+                        <CaretDownOutlined
+                          rotate={collapseKeys.has(item.key) ? -90 : 0}
+                        ></CaretDownOutlined>
+                      </span>
+                    ) : (
+                      <span className={styles.line}></span>
+                    )}
+                  </div>
+                  <div
+                    className={cx(styles.menuItemGroup, {
+                      'menu-item-group-collapsed': collapsed,
+                      'menu-item-group-hidden':
+                        !collapsed && collapseKeys.has(item.key)
+                    })}
+                  >
+                    {item.children?.map((child: MenuItem) =>
+                      menuItemRender(child, child.key)
+                    )}
+                  </div>
+                </>
+              ) : (
+                menuItemRender(item, item.key)
+              )}
+            </div>
+          ))}
         </div>
-      ))}
+      </OverlayScroller>
     </div>
   );
 };

src/locales/en-US/apikeys.ts

@@ -23,5 +23,7 @@ export default {
   'apikeys.accessScope.inference': 'Inference APIs',
   'apikeys.access.permissions': 'Access Permissions',
   'apikeys.type.auto': 'Auto-generated',
-  'apikeys.type.custom': 'Custom'
+  'apikeys.type.custom': 'Custom',
+  'apikeys.button.ipConfig': 'IP Access Control',
+  'quotaLimits.button.title': 'Quota Limit'
 };

src/locales/en-US/backends.ts

@@ -23,11 +23,12 @@ export default {
   'backend.form.defaultExecuteCommand': 'Default Execution Command',
   'backend.form.defaultExecuteCommand.tips': `'{{'model_path'}}', '{{'port'}}', '{{'worker_ip'}}' and '{{'model_name'}}' are placeholders that will be substituted with the actual values during deployment.`,
   'backend.form.defaultBackendParameters': 'Default Backend Parameters',
-  'backend.form.parameterFormat': 'Parameter Format',
-  'backend.form.parameterFormat.default': 'Backend Default',
-  'backend.form.parameterFormat.space': 'Space (--key value)',
-  'backend.form.parameterFormat.equal': 'Equal (--key=value)',
-  'backend.form.commonParameters': 'Common Parameters',
+  'backend.form.flagFormat': 'Flag Format',
+  'backend.form.flagFormat.tips':
+    'The format applied between an option and its value. Leave empty to keep each parameter as entered, without normalizing it.',
+  'backend.form.flagFormat.space': 'Space Separated (--key value)',
+  'backend.form.flagFormat.equal': 'Equal Sign (--key=value)',
+  'backend.form.commonParameters': 'Common Backend Parameters',
   'backend.form.commonParameters.tips':
     'Shown as suggestions in the backend parameters input during deployment.',
   'backend.form.versionConfig': 'Versions Config',

src/locales/en-US/benchmark.ts

@@ -37,10 +37,10 @@ export default {
     'Stress test for long-context handling. Evaluates KV cache behavior, memory usage, and backend stability.',
   'benchmark.form.profile.heavy.tips':
     'Decode-heavy generation benchmark. Measures sustained decoding speed and output token throughput.',
-  'benchmark.table.filter.bygpu': 'Filter by GPU',
-  'benchmark.table.filter.bymodel': 'Filter by Model',
+  'benchmark.table.filter.bygpu': 'Search by GPU',
+  'benchmark.table.filter.bymodel': 'Search by model',
   'benchmark.table.filter.bydataset': 'Filter by Dataset',
-  'benchmark.table.filter.byProfile': 'Filter by Profile',
+  'benchmark.table.filter.byProfile': 'Filter by profile',
   'benchmark.table.avg': 'Avg',
   'benchmark.table.columnSettings': 'Column Settings',
   'benchmark.detail.summary.results': 'Test Results',

src/locales/en-US/billing.ts

@@ -0,0 +1,15 @@
+export default {
+  'billing.upsell.title': 'Billing is an Enterprise feature',
+  'billing.upsell.subtitle':
+    'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.',
+  'billing.upsell.featuresTitle': 'What you get in Enterprise',
+  'billing.upsell.feature.usage':
+    'See cost breakdowns by organization, user, and model',
+  'billing.upsell.feature.invoices':
+    'Generate invoices and export billing reports',
+  'billing.upsell.feature.budgets':
+    'Set budgets and spending limits with alerts',
+  'billing.upsell.feature.chargeback':
+    'Attribute and charge back usage to teams and projects',
+  'billing.upsell.cta': 'Learn about Enterprise'
+};

src/locales/en-US/clusters.ts

@@ -39,7 +39,7 @@ export default {
   'clusters.workerpool.batchSize.desc':
     'Number of workers created simultaneously in the Worker pool',
   'clusters.create.addworker.tips':
-    'Please make sure the <a href={link} target="_blank">prerequisites</a> for {label} are met before executing the following command.',
+    'Please make sure the <a href={link} target="_blank">prerequisites</a> are met before executing the following command.',
   'clusters.create.addCommand.tips':
     'On the Worker that needs to be added, run the following command to join it to the cluster.',
   'clusters.create.addCommand.k8s.tips':
@@ -70,10 +70,13 @@ export default {
     'For <span class="bold-text">non-Docker</span> clusters, please register clusters or manage worker pools from the Clusters page.',
   'clusters.addworker.selectGPU': 'Select GPU Vendor',
   'clusters.addworker.selectGPU.multiTag': 'Multi-select',
-  'clusters.addworker.selectGPU.singleOnly':
-    'The selected vendor is not in this cluster’s GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
+  'clusters.addworker.selectGPU.subtitle':
+    'You can select multiple GPU Vendors or none for CPU-only clusters',
   'clusters.addworker.checkEnv': 'Check Environment',
+  'clusters.addworker.checkEnv.cpuOnlyTips':
+    'Use the following command to verify that the Kubernetes cluster has at least one ready node. You are registering a CPU-only cluster.',
   'clusters.addworker.specifyArgs': 'Specify Arguments',
+  'clusters.addworker.dtkVersion': 'DTK Version',
   'clusters.addworker.runCommand': 'Run Command',
   'clusters.addworker.specifyWorkerIP': 'Worker IP',
   'clusters.addworker.detectWorkerIP': 'Auto-detect Worker IP',
@@ -112,6 +115,8 @@ export default {
     '{count} new workers have been added to the cluster.',
   'clusters.create.serverUrl': 'GPUStack Server URL',
   'clusters.create.workerConfig': 'Worker Configuration',
+  'clusters.edit.k8sOptions.changed.tip':
+    'You have changed the Kubernetes options. Re-run the registration command on the target cluster for the changes to take effect.',
   'clusters.addworker.containerName': 'Worker Container Name',
   'clusters.addworker.containerName.tips':
     'Specify a name for the worker container.',
@@ -164,6 +169,10 @@ export default {
   'clusters.volume.configMap.name': 'ConfigMap Name',
   'clusters.volume.configMap.optional': 'Optional',
   'clusters.volume.add': 'Add Volume Mount',
+  'clusters.systemDefaultContainerRegistry.title': 'Default Container Registry',
+  'clusters.systemDefaultContainerRegistry.tip':
+    'Default registry used to resolve GPUStack images for this cluster. Falls back to the server default when unset.',
+  'clusters.k8sOptions.title': 'Kubernetes Deployment Options',
   'clusters.imageCredentials.title': 'Image Credentials',
   'clusters.imageCredentials.add': 'Add Credential',
   'clusters.imageCredentials.registry': 'Registry',
@@ -172,16 +181,20 @@ export default {
   'clusters.nodeSelector.title': 'Node Selector',
   'clusters.nodeSelector.tip':
     'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
-  'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
-  'clusters.gpuVendorOverrides.validate.emptySelector':
-    'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
-  'clusters.gpuVendorOverrides.validate.duplicate':
-    'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
-  'clusters.gpuVendorOverrides.validate.keyConflict':
-    'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
-  'clusters.gpuVendorOverrides.tip':
-    'Required when running multiple GPU vendors in one cluster. Each entry pins that vendor’s worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
-  'clusters.gpuVendorOverrides.add': 'Add Override',
-  'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
-  'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
+  'clusters.operatorImage.title': 'Operator Image',
+  'clusters.operatorImage.tip':
+    'Override for the GPUStack Operator container image. Leave empty to use the server default.',
+  'clusters.namespace.title': 'Namespace',
+  'clusters.namespace.tip':
+    'Kubernetes namespace the cluster’s manifests render into. Leave empty to use gpustack-system.',
+  'clusters.clusterType.title': 'Cluster Type',
+  'clusters.modelService.title': 'Model Service',
+  'clusters.modelService.tip':
+    'For LLM inference and API serving — e.g. exposing model APIs and token-based services.',
+  'clusters.gpuInstances.title': 'GPU Service',
+  'clusters.gpuInstances.tip':
+    'For on-demand GPU compute — e.g. interactive development, training jobs, or custom environments.',
+  'clusters.gpuInstances.staticAddress': 'GPU Service Static Access Address',
+  'clusters.gpuInstances.staticAddress.tip':
+    'Static address the operator uses to access GPU instances in this cluster (e.g. a LoadBalancer VIP). Optional.'
 };

src/locales/en-US/common.ts

@@ -46,6 +46,7 @@ export default {
   'common.button.enabled': 'Enabled',
   'common.button.disabled': 'Disabled',
   'common.button.upgrade': 'Upgrade',
+  'common.enterprise.feature': 'Available in GPUStack Enterprise',
   'common.input.holder': 'Please enter',
   'common.validate.value': '{name} value is required',
   'common.button.edit': 'Edit',
@@ -55,6 +56,7 @@ export default {
   'common.button.viewevent': 'View Events',
   'common.button.recreate': 'Recreate',
   'common.table.operation': 'Operations',
+  'common.table.creator': 'Creator',
   'common.table.createTime': 'Created',
   'common.table.updateTime': 'Updated',
   'common.table.description': 'Description',
@@ -65,6 +67,7 @@ export default {
   'common.search.name.placeholder': 'filter by name',
   'common.search.id.placeholder': 'filter by ID',
   'common.filter.byId': 'filter by ID',
+  'common.filter.byCreator': 'Filter by creator',
   'common.table.type': 'Type',
   'common.table.default': 'Default Value',
   'common.copy.success': 'Copied success!',
@@ -166,6 +169,7 @@ export default {
   'common.time.hour': 'hour',
   'common.time.minute': 'minutes',
   'common.issue.report': 'Report an issue',
+  'common.github.star.tooltip': 'Star us on GitHub',
   'common.social.discord': 'Join Our Discord',
   'common.table.mark': 'Comment',
   'common.table.rollback.mark': 'Rollback Comment',
@@ -257,6 +261,10 @@ export default {
   'common.login.auth': 'Authenticating...',
   'common.login.auth.failed': 'Authentication failed',
   'common.login.password': 'Log in with Password',
+  'common.login.username.holder': 'Please enter username',
+  'common.login.password.holder': 'Please enter password',
+  'common.login.newpassword.holder': 'Please enter new password',
+  'common.login.confirm.holder': 'Please enter password again',
   'common.external.login': 'Log in with {type}',
   'common.sso.noConfig':
     'Single sign-on is not enabled on this system. Please contact your administrator.',
@@ -285,5 +293,7 @@ export default {
   'common.image.limit.height': 'Image height must be {height}.',
   'common.remaining': 'Remaining {count}',
   'common.max': 'Max {count}',
-  'common.validate.group': 'Please complete the {group} configuration'
+  'common.max.count': '{label} Count',
+  'common.validate.group': 'Please complete the {group} configuration',
+  'common.preferences': 'Preferences'
 };

src/locales/en-US/gpuservice.ts

@@ -13,7 +13,11 @@ export default {
   'gpuservice.template.command.placeholder':
     'Separate arguments with spaces; wrap arguments containing spaces in quotes, e.g.: /bin/bash -c "echo hello world"',
   'gpuservice.template.mountPath': 'Mount Path',
+  'gpuservice.template.mountPath.tips':
+    'The default mount path for the storage volume when creating an instance from this template. Useful for persisting data that needs to be retained while the instance is running.',
   'gpuservice.template.containerDisk': 'Container Disk (GB)',
+  'gpuservice.template.containerDisk.tips':
+    'The size of the container system disk.',
   'gpuservice.template.memory': 'Memory (GB)',
   'gpuservice.instance.containerDisk.remaining':
     'Container Disk (Max {count} GB)',
@@ -97,21 +101,32 @@ export default {
   'gpuservice.instance.templates': 'Instance Templates',
   'gpuservice.instance.section.storage': 'Storage',
   'gpuservice.instance.type.required': 'Please select an instance type',
+  'gpuservice.instance.type.noAvailable': 'No instance type available',
   'gpuservice.instance.gpuCount': 'GPU Count',
   'gpuservice.instance.gpuCount.required': 'Please enter the GPU count',
   'gpuservice.instance.gpuCount.max':
     'Please select at most {count} GPU card(s)',
   'gpuservice.instance.gpuCount.min':
     'Please select at least {count} GPU card(s)',
+  'gpuservice.instance.cpuCount.max':
+    'Please select at most {count} CPU core(s)',
+  'gpuservice.instance.cpuCount.min':
+    'Please select at least {count} CPU core(s)',
   'gpuservice.instance.gpuCount.noAvailable':
     'No available GPU resources, please choose another instance type.',
   'gpuservice.instance.gpuCount.zero':
     'CPU-only setup for environment preparation.',
   'gpuservice.instance.stock': 'Stock',
   'gpuservice.instance.sliced': 'Sliced',
-  'gpuservice.instance.memory': 'Memory',
+  'gpuservice.instance.memory': 'VRAM',
   'gpuservice.instance.ram': 'RAM',
+  'gpuservice.instance.os': 'OS',
+  'gpuservice.instance.arch': 'Arch',
   'gpuservice.instance.disk': 'Disk',
+  'gpuservice.table.count': 'Count',
+  'gpuservice.instance.disk.system': 'System Disk',
+  'gpuservice.instance.disk.ephemeral': 'Ephemeral Storage',
+  'gpuservice.instance.disk.persistent': 'Persistent Storage',
   'gpuservice.instance.search.type.placeholder': 'Search by name',
   'gpuservice.instance.search.template.placeholder':
     'Search by template name, image or mount path',
@@ -142,14 +157,13 @@ export default {
   'gpuservice.storage.capacity': 'Capacity',
   'gpuservice.storage.accessMode': 'Access Mode',
   'gpuservice.storage.persistent': 'Persistent',
-  'gpuservice.storage.temporary': 'Temporary',
-  'gpuservice.storage.persistentVolume': 'Persistent Volume',
+  'gpuservice.storage.temporary': 'Ephemeral',
+  'gpuservice.storage.persistentVolume': 'Persistent',
   'gpuservice.storage.temporary.tips':
     'Data is cleared when the instance stops.',
   'gpuservice.storage.persistentVolume.tips':
-    'Data persists across restarts and is deleted only when the instance is terminated. Cannot be shared with other instances.',
-  'gpuservice.storage.persistentVolume.required':
-    'Please select a persistent volume',
+    'Data persists across instance restarts. Persistent volumes remain intact after instance termination and can be shared by multiple instances.',
+  'gpuservice.storage.persistentVolume.required': 'Please select a storage',
   'gpuservice.storage.persistentVolume.capacity': 'Capacity (GB)',
   'gpuservice.storage.persistentVolume.capacity.required':
     'Please enter capacity',
@@ -159,5 +173,10 @@ export default {
   'gpuservice.storage.tempCapacity.required':
     'Please enter the temporary storage capacity',
   'gpuservice.form.rule.name':
-    "Lowercase letters, numbers, and '-'. Start and end with a letter or number, no consecutive '-', max 63 characters."
+    "Lowercase letters, numbers, and '-'. Start and end with a letter or number, no consecutive '-', max 63 characters.",
+  'gpuservice.form.storage.select': 'Select Storage',
+  'gpuservice.creator': 'Creator',
+  'gpuservice.owner.global': 'Global',
+  'gpuservice.template.group.yours': 'Your Templates',
+  'gpuservice.template.group.global': 'Global Templates'
 };

src/locales/en-US/menu.ts

@@ -8,7 +8,7 @@ export default {
   'menu.playground.text2images': 'Image',
   'menu.playground.video': 'Video',
   'menu.compare': 'Compare',
-  'menu.models': 'Models',
+  'menu.models': 'Model Service',
   'menu.models.modelList': 'Deploy & Manage',
   'menu.models.modelCatalog': 'Catalog',
   'menu.models.catalog': 'Model Catalog',
@@ -27,20 +27,24 @@ export default {
   'menu.users': 'Users',
   'menu.resources.workers': 'Workers',
   'menu.resources.gpus': 'GPUs',
-  'menu.resources.modelfiles': 'Model Files',
+  'menu.models.modelfiles': 'Model Files',
   'menu.accessControl': 'Access Control',
   'menu.accessControl.apikeys': 'API Keys',
   'menu.accessControl.users': 'Users',
-  'menu.profile': 'Profile',
+  'menu.accessControl.organizations': 'Organizations',
+  'menu.profile': 'Preferences',
   'menu.login': 'Login',
   'menu.usage': 'Usage',
+  'menu.usage.usage': 'Usage',
+  'menu.billingAndUsage': 'Usage & Billing',
+  'menu.billingAndUsage.usage': 'Usage',
+  'menu.billingAndUsage.billing': 'Billing',
   'menu.404': '404',
-  'menu.clusterManagement': 'Cluster Management',
-  'menu.clusterManagement.clusters': 'Clusters',
-  'menu.clusterManagement.credentials': 'Cloud Credentials',
-  'menu.clusterManagement.clusterDetail': 'Cluster Detail',
-  'menu.clusterManagement.clusterCreate': 'Create Cluster',
-  'menu.resources.backendsList': 'Inference Backends',
+  'menu.resources.clusters': 'Clusters',
+  'menu.resources.credentials': 'Cloud Credentials',
+  'menu.resources.clusterDetail': 'Cluster Detail',
+  'menu.resources.clusterCreate': 'Create Cluster',
+  'menu.models.backendsList': 'Inference Backends',
   'menu.gpuService': 'GPU Service',
   'menu.gpuService.instances': 'GPU Instances',
   'menu.gpuService.templates': 'Instance Templates',

src/locales/en-US/models.ts

@@ -291,7 +291,7 @@ export default {
   'models.instance.startHistory': 'Run History',
   'models.instance.startHistory.tips':
     'Shows logs from the run before the last error-triggered restart.',
-  'models.form.lora.label': 'LoRA Adapter',
+  'models.form.lora.label': 'LoRA Adapters',
   'models.form.lora.add': 'Add LoRA Adapter',
   'models.form.lora.select': 'Select LoRA',
   'models.form.lora.name': 'LoRA name',

src/locales/en-US/no-result.ts

@@ -36,9 +36,12 @@ export default {
   'noresult.catalog.nofound': 'No matching models found.',
   'noresult.resources.cluster':
     'No clusters available. Add a cluster to get started.',
+  'noresult.resources.k8sCluster':
+    'No clusters available. Add a Kubernetes cluster to get started.',
   'noresult.resources.worker':
     'No workers available. Add a worker to get started.',
   'noresult.resources.gotocluster': 'Create Your First Cluster',
+  'noresult.resources.addk8scluster': 'Add a Kubernetes Cluster',
   'noresult.resources.gotoworker': 'Add Worker',
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',

src/locales/en-US/organizations.ts

@@ -0,0 +1,15 @@
+export default {
+  'organizations.upsell.title': 'Organizations are an Enterprise feature',
+  'organizations.upsell.subtitle':
+    'Multi-tenancy lets you isolate users, resources, and quotas across teams. Upgrade to GPUStack Enterprise to manage organizations.',
+  'organizations.upsell.featuresTitle': 'What you get in Enterprise',
+  'organizations.upsell.feature.orgs':
+    'Create organizations to group users and isolate workloads',
+  'organizations.upsell.feature.members':
+    'Manage members and roles per organization',
+  'organizations.upsell.feature.quotas':
+    'Set resource and token quotas per organization',
+  'organizations.upsell.feature.isolation':
+    'Scope API keys, model deployments, and resources per organization',
+  'organizations.upsell.cta': 'Learn about Enterprise'
+};

src/locales/en-US/usage.ts

@@ -17,9 +17,15 @@ export default {
   'usage.table.user.apiKeysUsed': 'API Keys Used',
   'usage.table.lastActive': 'Last Active',
   'usage.filter.granularity': 'Granularity',
+  'usage.filter.granularity.hour': 'Hour',
   'usage.filter.granularity.day': 'Day',
   'usage.filter.granularity.week': 'Week',
   'usage.filter.granularity.month': 'Month',
+  'usage.tabs.summary': 'Summary',
+  'usage.tabs.tokens': 'Tokens',
+  'usage.tabs.gpuInstances': 'GPU Instances',
+  'usage.tabs.storage': 'Storage',
+  'usage.tabs.resourceEvents': 'Resource Events',
   'usage.tabs.models': 'Models',
   'usage.tabs.apikeys': 'API Keys',
   'usage.tabs.users': 'User',
@@ -32,5 +38,70 @@ export default {
   'usage.chart.cached': 'Cached',
   'usage.chart.uncached': 'Uncached',
   'usage.chart.inputTokensCached': 'Input Tokens (Cached/Uncached)',
-  'usage.table.inputTokensCached': 'Input Tokens Cached'
+  'usage.table.inputTokensCached': 'Input Tokens Cached',
+
+  // --- Resource usage: shared metrics & units ---
+  'usage.metric.tokens': 'Tokens',
+  'usage.metric.input': 'Input',
+  'usage.metric.output': 'Output',
+  'usage.metric.gpuHours': 'GPU Hours',
+  'usage.metric.instanceHours': 'Instance Hours',
+  'usage.metric.gbDays': 'GB-Days',
+  'usage.metric.gbHours': 'GB-Hours',
+  'usage.metric.activeUsers': 'Active Users',
+  'usage.metric.activeInstances': 'Active Instances',
+  'usage.metric.activeStorage': 'Active Storage',
+  'usage.metric.activeVolumes': 'Active Volumes',
+  'usage.metric.storageTypes': 'Storage Types',
+  'usage.metric.gpuHours.tip':
+    'Instance running time weighted by GPU count: an instance with N GPUs running for H hours counts as N × H GPU-hours. Equal to Instance Hours when every instance uses a single GPU.',
+  'usage.metric.instanceHours.tip':
+    'Total running time summed across all instances, regardless of how many GPUs each uses. One instance running for 2 hours = 2 instance-hours.',
+  'usage.metric.gbDays.tip':
+    'Storage capacity integrated over time, in GB × days: 10 GB kept for 5 days = 50 GB-days. (= GB-Hours ÷ 24)',
+  'usage.metric.gbHours.tip':
+    'Storage capacity integrated over time, in GB × hours: 10 GB kept for 5 hours = 50 GB-hours.',
+
+  // --- Resource usage: common table / labels ---
+  'usage.common.noData': 'No data',
+  'usage.common.unknown': 'unknown',
+  'usage.table.date': 'Date',
+  'usage.table.name': 'Name',
+  'usage.table.user': 'User',
+  'usage.table.users': 'Users',
+  'usage.table.type': 'Type',
+  'usage.table.instance': 'Instance',
+  'usage.table.instanceType': 'Instance Type',
+  'usage.table.instanceTypes': 'Instance Types',
+  'usage.table.instances': 'Instances',
+  'usage.table.capacity': 'Capacity',
+  'usage.export.tableNamed': 'Export Table Data — {name}',
+
+  // --- Summary tab ---
+  'usage.summary.compute': 'Compute',
+  'usage.summary.tokensOverTime': 'Tokens over time',
+  'usage.summary.gpuHoursOverTime': 'GPU Hours over time',
+  'usage.summary.gbDaysOverTime': 'GB-Days over time',
+
+  // --- GPU Instances / Storage filters ---
+  'usage.filter.instance': 'Filter by instance',
+  'usage.filter.storage': 'Filter by storage',
+
+  // --- Resource events ---
+  'usage.events.resourceType': 'Resource type',
+  'usage.events.eventType': 'Event type',
+  'usage.events.resourceName': 'Filter by name',
+  'usage.events.col.time': 'Time',
+  'usage.events.col.resource': 'Resource',
+  'usage.events.col.event': 'Event',
+  'usage.events.col.message': 'Message',
+  'usage.events.resource.gpuInstance': 'GPU Instance',
+  'usage.events.resource.cpuInstance': 'CPU Instance',
+  'usage.events.type.created': 'Created',
+  'usage.events.type.deleted': 'Deleted',
+  'usage.events.type.started': 'Started',
+  'usage.events.type.stopped': 'Stopped',
+  'usage.events.type.updated': 'Updated',
+  'usage.events.type.attached': 'Attached',
+  'usage.events.type.detached': 'Detached'
 };

src/locales/en-US/vendor.ts

@@ -4,7 +4,7 @@ export default {
   'vendor.hygon': 'Hygon',
   'vendor.moorthreads': 'Moore Threads',
   'vendor.iluvatar': 'Iluvatar',
-  'vendor.metax': 'Metax',
+  'vendor.metax': 'MetaX',
   'vendor.cambricon': 'Cambricon',
   'vendor.thead': 'T-Head PPU'
 };

src/locales/ja-JP/apikeys.ts

@@ -23,7 +23,9 @@ export default {
   'apikeys.accessScope.inference': 'Inference APIs',
   'apikeys.access.permissions': 'Access Permissions',
   'apikeys.type.auto': 'Auto-generated',
-  'apikeys.type.custom': 'Custom'
+  'apikeys.type.custom': 'Custom',
+  'apikeys.button.ipConfig': 'IP Access Control',
+  'quotaLimits.button.title': 'Quota Limit'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ja-JP/backends.ts

@@ -23,11 +23,12 @@ export default {
   'backend.form.defaultExecuteCommand': 'Default Execution Command',
   'backend.form.defaultExecuteCommand.tips': `'{{'model_path'}}', '{{'port'}}', '{{'worker_ip'}}' and '{{'model_name'}}' are placeholders that will be substituted with the actual values during deployment.`,
   'backend.form.defaultBackendParameters': 'Default Backend Parameters',
-  'backend.form.parameterFormat': 'パラメータ形式',
-  'backend.form.parameterFormat.default': 'バックエンドのデフォルト',
-  'backend.form.parameterFormat.space': 'スペース区切り (--key value)',
-  'backend.form.parameterFormat.equal': 'イコール連結 (--key=value)',
-  'backend.form.commonParameters': 'よく使うパラメータ',
+  'backend.form.flagFormat': 'フラグ形式',
+  'backend.form.flagFormat.tips':
+    'オプションとその値を連結する形式。空欄の場合は各パラメータを入力されたまま保持し、形式を統一しません。',
+  'backend.form.flagFormat.space': 'スペース区切り (--key value)',
+  'backend.form.flagFormat.equal': 'イコール記号 (--key=value)',
+  'backend.form.commonParameters': 'よく使うバックエンドパラメータ',
   'backend.form.commonParameters.tips':
     'モデルのデプロイ時にバックエンドパラメータ入力欄の候補として表示されます。',
   'backend.form.versionConfig': 'Versions Config',

src/locales/ja-JP/benchmark.ts

@@ -37,8 +37,8 @@ export default {
     'Stress test for long-context handling. Evaluates KV cache behavior, memory usage, and backend stability.',
   'benchmark.form.profile.heavy.tips':
     'Decode-heavy generation benchmark. Measures sustained decoding speed and output token throughput.',
-  'benchmark.table.filter.bygpu': 'Filter by GPU',
-  'benchmark.table.filter.bymodel': 'Filter by Model',
+  'benchmark.table.filter.bygpu': 'GPU 検索',
+  'benchmark.table.filter.bymodel': 'モデル検索',
   'benchmark.table.filter.bydataset': 'Filter by Dataset',
   'benchmark.table.filter.byProfile': 'Filter by Profile',
   'benchmark.table.avg': 'Avg',

src/locales/ja-JP/billing.ts

@@ -0,0 +1,15 @@
+export default {
+  'billing.upsell.title': 'Billing is an Enterprise feature',
+  'billing.upsell.subtitle':
+    'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.',
+  'billing.upsell.featuresTitle': 'What you get in Enterprise',
+  'billing.upsell.feature.usage':
+    'See cost breakdowns by organization, user, and model',
+  'billing.upsell.feature.invoices':
+    'Generate invoices and export billing reports',
+  'billing.upsell.feature.budgets':
+    'Set budgets and spending limits with alerts',
+  'billing.upsell.feature.chargeback':
+    'Attribute and charge back usage to teams and projects',
+  'billing.upsell.cta': 'Learn about Enterprise'
+};

src/locales/ja-JP/clusters.ts

@@ -39,7 +39,7 @@ export default {
   'clusters.workerpool.batchSize.desc':
     'Number of workers created simultaneously in the Worker pool',
   'clusters.create.addworker.tips':
-    'Please make sure the <a href={link} target="_blank">prerequisites</a> for {label} are met before executing the following command.',
+    'Please make sure the <a href={link} target="_blank">prerequisites</a> are met before executing the following command.',
   'clusters.create.addCommand.tips':
     'On the Worker that needs to be added, run the following command to join it to the cluster.',
   'clusters.create.addCommand.k8s.tips':
@@ -70,10 +70,13 @@ export default {
     'For <span class="bold-text">non-Docker</span> clusters, please register clusters or manage worker pools from the Clusters page.',
   'clusters.addworker.selectGPU': 'Select GPU Vendor',
   'clusters.addworker.selectGPU.multiTag': 'Multi-select',
-  'clusters.addworker.selectGPU.singleOnly':
-    'The selected vendor is not in this cluster’s GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
+  'clusters.addworker.selectGPU.subtitle':
+    '複数の GPU ベンダーを選択するか、CPU クラスター専用の場合は選択不要です',
   'clusters.addworker.checkEnv': 'Check Environment',
+  'clusters.addworker.checkEnv.cpuOnlyTips':
+    '以下のコマンドを使用して、Kubernetes クラスターに少なくとも 1 つのレディーノードがあることを確認してください。CPU クラスターを登録しています。',
   'clusters.addworker.specifyArgs': 'Specify Arguments',
+  'clusters.addworker.dtkVersion': 'DTK バージョン',
   'clusters.addworker.runCommand': 'Run Command',
   'clusters.addworker.specifyWorkerIP': 'Worker IP',
   'clusters.addworker.detectWorkerIP': 'Worker IP を自動検出',
@@ -112,6 +115,8 @@ export default {
     '{count} new workers have been added to the cluster.',
   'clusters.create.serverUrl': 'GPUStack Server URL',
   'clusters.create.workerConfig': 'Worker Configuration',
+  'clusters.edit.k8sOptions.changed.tip':
+    'Kubernetes オプションを変更しました。変更を有効にするには、対象クラスターで登録コマンドを再実行してください。',
   'clusters.addworker.containerName': 'Worker Container Name',
   'clusters.addworker.containerName.tips':
     'Specify a name for the worker container.',
@@ -164,6 +169,10 @@ export default {
   'clusters.volume.configMap.name': 'ConfigMap Name',
   'clusters.volume.configMap.optional': 'Optional',
   'clusters.volume.add': 'Add Volume Mount',
+  'clusters.systemDefaultContainerRegistry.title': 'Default Container Registry',
+  'clusters.systemDefaultContainerRegistry.tip':
+    'Default registry used to resolve GPUStack images for this cluster. Falls back to the server default when unset.',
+  'clusters.k8sOptions.title': 'Kubernetes Deployment Options',
   'clusters.imageCredentials.title': 'Image Credentials',
   'clusters.imageCredentials.add': 'Add Credential',
   'clusters.imageCredentials.registry': 'Registry',
@@ -172,18 +181,22 @@ export default {
   'clusters.nodeSelector.title': 'Node Selector',
   'clusters.nodeSelector.tip':
     'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
-  'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
-  'clusters.gpuVendorOverrides.validate.emptySelector':
-    'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
-  'clusters.gpuVendorOverrides.validate.duplicate':
-    'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
-  'clusters.gpuVendorOverrides.validate.keyConflict':
-    'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
-  'clusters.gpuVendorOverrides.tip':
-    'Required when running multiple GPU vendors in one cluster. Each entry pins that vendor’s worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
-  'clusters.gpuVendorOverrides.add': 'Add Override',
-  'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
-  'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
+  'clusters.operatorImage.title': 'Operator Image',
+  'clusters.operatorImage.tip':
+    'Override for the GPUStack Operator container image. Leave empty to use the server default.',
+  'clusters.namespace.title': 'Namespace',
+  'clusters.namespace.tip':
+    'Kubernetes namespace the cluster’s manifests render into. Leave empty to use gpustack-system.',
+  'clusters.clusterType.title': 'Cluster Type',
+  'clusters.modelService.title': 'Model Service',
+  'clusters.modelService.tip':
+    'For LLM inference and API serving — e.g. exposing model APIs and token-based services.',
+  'clusters.gpuInstances.title': 'GPU Service',
+  'clusters.gpuInstances.tip':
+    'For on-demand GPU compute — e.g. interactive development, training jobs, or custom environments.',
+  'clusters.gpuInstances.staticAddress': 'GPU Service Static Access Address',
+  'clusters.gpuInstances.staticAddress.tip':
+    'Static address the operator uses to access GPU instances in this cluster (e.g. a LoadBalancer VIP). Optional.'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ja-JP/common.ts

@@ -46,6 +46,7 @@ export default {
   'common.button.enabled': '有効',
   'common.button.disabled': '無効',
   'common.button.upgrade': 'アップグレード',
+  'common.enterprise.feature': 'Available in GPUStack Enterprise',
   'common.input.holder': '入力してください',
   'common.validate.value': '{name} の値は必須です',
   'common.button.edit': '編集',
@@ -55,6 +56,7 @@ export default {
   'common.button.viewevent': 'イベントを表示',
   'common.button.recreate': '再作成',
   'common.table.operation': '操作',
+  'common.table.creator': '作成者',
   'common.table.createTime': '作成日時',
   'common.table.updateTime': '更新日時',
   'common.table.description': '説明',
@@ -65,6 +67,7 @@ export default {
   'common.search.name.placeholder': '名前でフィルタ',
   'common.search.id.placeholder': 'IDでフィルタ',
   'common.filter.byId': 'IDでフィルタ',
+  'common.filter.byCreator': '作成者でフィルタ',
   'common.table.type': 'タイプ',
   'common.table.default': 'デフォルト値',
   'common.copy.success': 'コピー成功！',
@@ -167,6 +170,7 @@ export default {
   'common.time.hour': '時間',
   'common.time.minute': '分',
   'common.issue.report': '問題を報告',
+  'common.github.star.tooltip': 'GitHub でスターをつける',
   'common.social.discord': 'Discordに参加',
   'common.table.mark': 'コメント',
   'common.table.rollback.mark': 'ロールバックコメント',
@@ -257,6 +261,10 @@ export default {
   'common.login.auth': 'Authenticating...',
   'common.login.auth.failed': 'Authentication failed',
   'common.login.password': 'Log in with Password',
+  'common.login.username.holder': 'Please enter username',
+  'common.login.password.holder': 'Please enter password',
+  'common.login.newpassword.holder': 'Please enter new password',
+  'common.login.confirm.holder': 'Please enter password again',
   'common.external.login': 'Log in with {type}',
   'common.sso.noConfig':
     'Single sign-on is not enabled on this system. Please contact your administrator.',
@@ -285,7 +293,9 @@ export default {
   'common.image.limit.height': 'Image height must be {height}.',
   'common.remaining': '残り {count}',
   'common.max': '最大 {count}',
-  'common.validate.group': 'Please complete the {group} configuration'
+  'common.max.count': '{label} 数',
+  'common.validate.group': 'Please complete the {group} configuration',
+  'common.preferences': 'Preferences'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ja-JP/gpuservice.ts

@@ -13,7 +13,11 @@ export default {
   'gpuservice.template.command.placeholder':
     '引数はスペースで区切り、スペースを含む引数は引用符で囲んでください。例：/bin/bash -c "echo hello world"',
   'gpuservice.template.mountPath': 'マウントパス',
+  'gpuservice.template.mountPath.tips':
+    'このテンプレートからインスタンスを作成する際に、ストレージボリュームがデフォルトでマウントされるパスです。インスタンスの実行中に保持する必要があるデータの永続化に使用できます。',
   'gpuservice.template.containerDisk': 'コンテナディスク (GB)',
+  'gpuservice.template.containerDisk.tips':
+    'コンテナシステムディスクのサイズです。',
   'gpuservice.template.memory': 'メモリ (GB)',
   'gpuservice.instance.containerDisk.remaining':
     'コンテナディスク (最大 {count} GB)',
@@ -96,20 +100,32 @@ export default {
   'gpuservice.instance.templates': 'インスタンステンプレート',
   'gpuservice.instance.section.storage': 'ストレージボリューム',
   'gpuservice.instance.type.required': 'インスタンスタイプを選択してください',
+  'gpuservice.instance.type.noAvailable':
+    '利用可能なインスタンスタイプがありません',
   'gpuservice.instance.gpuCount': 'GPU 数',
   'gpuservice.instance.gpuCount.required': 'GPU 数を入力してください',
   'gpuservice.instance.gpuCount.max':
     '最大 {count} 枚の GPU カードを選択してください',
   'gpuservice.instance.gpuCount.min':
     '少なくとも {count} 枚の GPU カードを選択してください',
+  'gpuservice.instance.cpuCount.max':
+    '最大 {count} 個の CPU コアを選択してください',
+  'gpuservice.instance.cpuCount.min':
+    '少なくとも {count} 個の CPU コアを選択してください',
   'gpuservice.instance.gpuCount.noAvailable':
     '利用可能な GPU リソースがありません。別のインスタンスタイプを選択してください。',
   'gpuservice.instance.gpuCount.zero': 'CPU のみを使用し、環境準備用です。',
   'gpuservice.instance.stock': '在庫',
   'gpuservice.instance.sliced': '分割',
-  'gpuservice.instance.memory': 'Memory',
+  'gpuservice.instance.memory': 'VRAM',
   'gpuservice.instance.ram': 'RAM',
+  'gpuservice.instance.os': 'OS',
+  'gpuservice.instance.arch': 'アーキテクチャ',
   'gpuservice.instance.disk': 'ディスク',
+  'gpuservice.table.count': '数量',
+  'gpuservice.instance.disk.system': 'システムディスク',
+  'gpuservice.instance.disk.ephemeral': '一時ストレージ',
+  'gpuservice.instance.disk.persistent': '永続ストレージ',
   'gpuservice.instance.search.type.placeholder': '名前で検索',
   'gpuservice.instance.search.template.placeholder':
     'テンプレート名、イメージまたはマウントパスで検索',
@@ -141,9 +157,9 @@ export default {
   'gpuservice.storage.accessMode': 'アクセスモード',
   'gpuservice.storage.persistent': '永続',
   'gpuservice.storage.temporary': '一時',
-  'gpuservice.storage.persistentVolume': '永続ボリューム',
+  'gpuservice.storage.persistentVolume': '永続',
   'gpuservice.storage.persistentVolume.required':
-    '永続ボリュームを選択してください',
+    'ストレージを選択してください',
   'gpuservice.storage.persistentVolume.capacity': '容量 (GB)',
   'gpuservice.storage.persistentVolume.capacity.required':
     '容量を入力してください',
@@ -157,5 +173,10 @@ export default {
   'gpuservice.storage.temporary.tips':
     'Data is cleared when the instance stops.',
   'gpuservice.storage.persistentVolume.tips':
-    'Data persists across restarts and is deleted only when the instance is terminated. Cannot be shared with other instances.'
+    'Data persists across instance restarts. Persistent volumes remain intact after instance termination and can be shared by multiple instances.',
+  'gpuservice.form.storage.select': 'ストレージを選択',
+  'gpuservice.creator': '作成者',
+  'gpuservice.owner.global': 'グローバル',
+  'gpuservice.template.group.yours': '自分のテンプレート',
+  'gpuservice.template.group.global': 'グローバルテンプレート'
 };

src/locales/ja-JP/menu.ts

@@ -8,7 +8,7 @@ export default {
   'menu.playground.text2images': '画像生成',
   'menu.playground.video': '動画',
   'menu.compare': '比較',
-  'menu.models': 'モデル',
+  'menu.models': 'モデルサービス',
   'menu.models.modelList': 'デプロイと管理',
   'menu.models.modelCatalog': 'カタログ',
   'menu.models.catalog': 'モデルカタログ',
@@ -23,24 +23,28 @@ export default {
   'menu.resources': 'リソース',
   'menu.apikeys': 'APIキー',
   'menu.users': 'ユーザー',
-  'menu.profile': 'プロフィール',
+  'menu.profile': 'Preferences',
   'menu.login': 'ログイン',
   'menu.usage': '使用状況',
+  'menu.usage.usage': '使用状況',
+  'menu.billingAndUsage': '使用状況と請求',
+  'menu.billingAndUsage.usage': '使用状況',
+  'menu.billingAndUsage.billing': '請求',
   'menu.404': '404',
   'menu.settings': 'Settings',
   'menu.resources.workers': 'Workers',
   'menu.resources.gpus': 'GPUs',
-  'menu.resources.modelfiles': 'Model Files',
+  'menu.models.modelfiles': 'Model Files',
   'menu.accessControl': 'Access Control',
   'menu.accessControl.apikeys': 'API Keys',
   'menu.accessControl.users': 'Users',
-  'menu.clusterManagement': 'Cluster Management',
-  'menu.clusterManagement.clusters': 'Clusters',
-  'menu.clusterManagement.credentials': 'Cloud Credentials',
+  'menu.accessControl.organizations': 'Organizations',
+  'menu.resources.clusters': 'Clusters',
+  'menu.resources.credentials': 'Cloud Credentials',
   'menu.models.userModels': 'My Models',
-  'menu.clusterManagement.clusterDetail': 'Cluster Detail',
-  'menu.clusterManagement.clusterCreate': 'Create Cluster',
-  'menu.resources.backendsList': 'Inference Backends',
+  'menu.resources.clusterDetail': 'Cluster Detail',
+  'menu.resources.clusterCreate': 'Create Cluster',
+  'menu.models.backendsList': 'Inference Backends',
   'menu.gpuService': 'GPU Service',
   'menu.gpuService.instances': 'GPU Instances',
   'menu.gpuService.templates': 'Instance Templates',
@@ -53,7 +57,7 @@ export default {
 // 1.   'menu.models.deployment': 'Deployment',
 // 2. 'menu.resources.workers': 'Workers',
 // 3. 'menu.resources.gpus': 'GPUs',
-// 4. 'menu.resources.modelfiles': 'Model Files',
+// 4. 'menu.models.modelfiles': 'Model Files',
 // 5. 'menu.accessControl': 'Access Control',
 // 6. 'menu.accessControl.apikeys': 'API Keys',
 // 7. 'menu.accessControl.users': 'Users',
@@ -63,7 +67,7 @@ export default {
 // 11. 'menu.models.userModels': 'My Models'
 // 12. 'menu.clusterManagement.clusterDetail': 'Cluster Detail',
 // 13. 'menu.clusterManagement.clusterCreate': 'Create Cluster',
-// 14. 'menu.resources.backendsList': 'Inference Backends',
+// 14. 'menu.models.backendsList': 'Inference Backends',
 // 15. 'menu.models.benchmark': 'Benchmarks',
 // 15. 'menu.models.provider': 'Provider',
 // 15. 'menu.models.providers': 'Provider',

src/locales/ja-JP/models.ts

@@ -291,7 +291,7 @@ export default {
   'models.instance.startHistory': 'Run History',
   'models.instance.startHistory.tips':
     'Shows logs from the run before the last error-triggered restart.',
-  'models.form.lora.label': 'LoRA Adapter',
+  'models.form.lora.label': 'LoRA Adapters',
   'models.form.lora.add': 'Add LoRA Adapter',
   'models.form.lora.select': 'Select LoRA',
   'models.form.lora.name': 'LoRA name',

src/locales/ja-JP/no-result.ts

@@ -36,9 +36,12 @@ export default {
   'noresult.catalog.nofound': 'No matching models found.',
   'noresult.resources.cluster':
     'No clusters available. Add a cluster to get started.',
+  'noresult.resources.k8sCluster':
+    'No clusters available. Add a Kubernetes cluster to get started.',
   'noresult.resources.worker':
     'No workers available. Add a worker to get started.',
   'noresult.resources.gotocluster': 'Create Your First Cluster',
+  'noresult.resources.addk8scluster': 'Add a Kubernetes Cluster',
   'noresult.resources.gotoworker': 'Add Worker',
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',

src/locales/ja-JP/organizations.ts

@@ -0,0 +1,15 @@
+export default {
+  'organizations.upsell.title': 'Organizations are an Enterprise feature',
+  'organizations.upsell.subtitle':
+    'Multi-tenancy lets you isolate users, resources, and quotas across teams. Upgrade to GPUStack Enterprise to manage organizations.',
+  'organizations.upsell.featuresTitle': 'What you get in Enterprise',
+  'organizations.upsell.feature.orgs':
+    'Create organizations to group users and isolate workloads',
+  'organizations.upsell.feature.members':
+    'Manage members and roles per organization',
+  'organizations.upsell.feature.quotas':
+    'Set resource and token quotas per organization',
+  'organizations.upsell.feature.isolation':
+    'Scope API keys, model deployments, and resources per organization',
+  'organizations.upsell.cta': 'Learn about Enterprise'
+};

src/locales/ja-JP/usage.ts

@@ -17,9 +17,15 @@ export default {
   'usage.table.user.apiKeysUsed': 'API Keys Used',
   'usage.table.lastActive': 'Last Active',
   'usage.filter.granularity': 'Granularity',
+  'usage.filter.granularity.hour': '時間',
   'usage.filter.granularity.day': 'Day',
   'usage.filter.granularity.week': 'Week',
   'usage.filter.granularity.month': 'Month',
+  'usage.tabs.summary': '概要',
+  'usage.tabs.tokens': 'トークン',
+  'usage.tabs.gpuInstances': 'GPU インスタンス',
+  'usage.tabs.storage': 'ストレージ',
+  'usage.tabs.resourceEvents': 'リソースイベント',
   'usage.tabs.models': 'Models',
   'usage.tabs.apikeys': 'API Keys',
   'usage.tabs.users': 'User',
@@ -32,5 +38,70 @@ export default {
   'usage.chart.cached': 'Cached',
   'usage.chart.uncached': 'Uncached',
   'usage.chart.inputTokensCached': 'Input Tokens (Cached/Uncached)',
-  'usage.table.inputTokensCached': 'Input Tokens Cached'
+  'usage.table.inputTokensCached': 'Input Tokens Cached',
+
+  // --- Resource usage: shared metrics & units ---
+  'usage.metric.tokens': 'トークン数',
+  'usage.metric.input': '入力',
+  'usage.metric.output': '出力',
+  'usage.metric.gpuHours': 'GPU 時間',
+  'usage.metric.instanceHours': 'インスタンス時間',
+  'usage.metric.gbDays': 'GB·日',
+  'usage.metric.gbHours': 'GB·時間',
+  'usage.metric.activeUsers': 'アクティブユーザー',
+  'usage.metric.activeInstances': 'アクティブインスタンス',
+  'usage.metric.activeStorage': 'アクティブストレージ',
+  'usage.metric.activeVolumes': 'アクティブボリューム',
+  'usage.metric.storageTypes': 'ストレージタイプ',
+  'usage.metric.gpuHours.tip':
+    'インスタンスの稼働時間を GPU 数で重み付けした値：N 個の GPU を使用するインスタンスが H 時間稼働すると N × H GPU 時間としてカウントされます。すべてのインスタンスが単一の GPU を使用する場合はインスタンス時間と等しくなります。',
+  'usage.metric.instanceHours.tip':
+    'GPU の数に関係なく、すべてのインスタンスの稼働時間を合計した値。1 つのインスタンスが 2 時間稼働 = 2 インスタンス時間。',
+  'usage.metric.gbDays.tip':
+    'ストレージ容量を時間で積分した値（GB × 日）：10 GB を 5 日間保持 = 50 GB·日。（= GB·時間 ÷ 24）',
+  'usage.metric.gbHours.tip':
+    'ストレージ容量を時間で積分した値（GB × 時間）：10 GB を 5 時間保持 = 50 GB·時間。',
+
+  // --- Resource usage: common table / labels ---
+  'usage.common.noData': 'データがありません',
+  'usage.common.unknown': '不明',
+  'usage.table.date': '日付',
+  'usage.table.name': '名前',
+  'usage.table.user': 'ユーザー',
+  'usage.table.users': 'ユーザー',
+  'usage.table.type': 'タイプ',
+  'usage.table.instance': 'インスタンス',
+  'usage.table.instanceType': 'インスタンスタイプ',
+  'usage.table.instanceTypes': 'インスタンスタイプ',
+  'usage.table.instances': 'インスタンス',
+  'usage.table.capacity': '容量',
+  'usage.export.tableNamed': 'テーブルデータをエクスポート — {name}',
+
+  // --- Summary tab ---
+  'usage.summary.compute': 'コンピュート',
+  'usage.summary.tokensOverTime': 'トークン数の推移',
+  'usage.summary.gpuHoursOverTime': 'GPU 時間の推移',
+  'usage.summary.gbDaysOverTime': 'GB·日の推移',
+
+  // --- GPU Instances / Storage filters ---
+  'usage.filter.instance': 'インスタンスで絞り込み',
+  'usage.filter.storage': 'ストレージで絞り込み',
+
+  // --- Resource events ---
+  'usage.events.resourceType': 'リソースタイプ',
+  'usage.events.eventType': 'イベントタイプ',
+  'usage.events.resourceName': '名前で絞り込み',
+  'usage.events.col.time': '時刻',
+  'usage.events.col.resource': 'リソース',
+  'usage.events.col.event': 'イベント',
+  'usage.events.col.message': 'メッセージ',
+  'usage.events.resource.gpuInstance': 'GPU インスタンス',
+  'usage.events.resource.cpuInstance': 'CPU インスタンス',
+  'usage.events.type.created': '作成済み',
+  'usage.events.type.deleted': '削除済み',
+  'usage.events.type.started': '開始',
+  'usage.events.type.stopped': '停止',
+  'usage.events.type.updated': '更新済み',
+  'usage.events.type.attached': 'アタッチ済み',
+  'usage.events.type.detached': 'デタッチ済み'
 };

src/locales/ja-JP/vendor.ts

@@ -4,7 +4,7 @@ export default {
   'vendor.hygon': 'Hygon',
   'vendor.moorthreads': 'Moore Threads',
   'vendor.iluvatar': 'Iluvatar',
-  'vendor.metax': 'Metax',
+  'vendor.metax': 'MetaX',
   'vendor.cambricon': 'Cambricon',
   'vendor.thead': 'T-Head PPU'
 };

src/locales/ru-RU/apikeys.ts

@@ -23,7 +23,9 @@ export default {
   'apikeys.accessScope.inference': 'Inference APIs',
   'apikeys.access.permissions': 'Access Permissions',
   'apikeys.type.auto': 'Auto-generated',
-  'apikeys.type.custom': 'Custom'
+  'apikeys.type.custom': 'Custom',
+  'apikeys.button.ipConfig': 'IP Access Control',
+  'quotaLimits.button.title': 'Quota Limit'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ru-RU/backends.ts

@@ -23,11 +23,12 @@ export default {
   'backend.form.defaultExecuteCommand': 'Команда выполнения по умолчанию',
   'backend.form.defaultExecuteCommand.tips': `'{{'model_path'}}', '{{'port'}}', '{{'worker_ip'}}' и '{{'model_name'}}' заполняются реальными значениями во время запуска`,
   'backend.form.defaultBackendParameters': 'Параметры бэкенда по умолчанию',
-  'backend.form.parameterFormat': 'Формат параметров',
-  'backend.form.parameterFormat.default': 'По умолчанию бэкенда',
-  'backend.form.parameterFormat.space': 'Пробел (--key value)',
-  'backend.form.parameterFormat.equal': 'Знак равенства (--key=value)',
-  'backend.form.commonParameters': 'Часто используемые параметры',
+  'backend.form.flagFormat': 'Формат флага',
+  'backend.form.flagFormat.tips':
+    'Формат соединения опции и её значения. Оставьте пустым, чтобы сохранить каждый параметр в исходном виде, без приведения к единому формату.',
+  'backend.form.flagFormat.space': 'Разделение пробелом (--key value)',
+  'backend.form.flagFormat.equal': 'Знак равенства (--key=value)',
+  'backend.form.commonParameters': 'Общие параметры бэкенда',
   'backend.form.commonParameters.tips':
     'Отображаются как подсказки в поле параметров бэкенда при развёртывании.',
   'backend.form.versionConfig': 'Конфигурация версий',

src/locales/ru-RU/benchmark.ts

@@ -37,8 +37,8 @@ export default {
     'Stress test for long-context handling. Evaluates KV cache behavior, memory usage, and backend stability.',
   'benchmark.form.profile.heavy.tips':
     'Decode-heavy generation benchmark. Measures sustained decoding speed and output token throughput.',
-  'benchmark.table.filter.bygpu': 'Filter by GPU',
-  'benchmark.table.filter.bymodel': 'Filter by Model',
+  'benchmark.table.filter.bygpu': 'Поиск GPU',
+  'benchmark.table.filter.bymodel': 'Поиск модели',
   'benchmark.table.filter.bydataset': 'Filter by Dataset',
   'benchmark.table.filter.byProfile': 'Filter by Profile',
   'benchmark.table.avg': 'Avg',

src/locales/ru-RU/billing.ts

@@ -0,0 +1,15 @@
+export default {
+  'billing.upsell.title': 'Billing is an Enterprise feature',
+  'billing.upsell.subtitle':
+    'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.',
+  'billing.upsell.featuresTitle': 'What you get in Enterprise',
+  'billing.upsell.feature.usage':
+    'See cost breakdowns by organization, user, and model',
+  'billing.upsell.feature.invoices':
+    'Generate invoices and export billing reports',
+  'billing.upsell.feature.budgets':
+    'Set budgets and spending limits with alerts',
+  'billing.upsell.feature.chargeback':
+    'Attribute and charge back usage to teams and projects',
+  'billing.upsell.cta': 'Learn about Enterprise'
+};

src/locales/ru-RU/clusters.ts

@@ -39,7 +39,7 @@ export default {
   'clusters.workerpool.batchSize.desc':
     'Количество воркеров, создаваемых одновременно в пуле воркеров',
   'clusters.create.addworker.tips':
-    'Пожалуйста, убедитесь, что выполнены <a href={link} target="_blank">предварительные условия</a> для {label} перед выполнением следующей команды.',
+    'Пожалуйста, убедитесь, что выполнены <a href={link} target="_blank">предварительные условия</a> перед выполнением следующей команды.',
   'clusters.create.addCommand.tips':
     'На воркере, который необходимо добавить, выполните следующую команду, чтобы присоединить его к кластеру.',
   'clusters.create.addCommand.k8s.tips':
@@ -70,10 +70,13 @@ export default {
     'Для <span class="bold-text">не-Docker</span> кластеров, пожалуйста, регистрируйте кластеры или управляйте пулами воркеров на странице Кластеры.',
   'clusters.addworker.selectGPU': 'Выбрать производителя GPU',
   'clusters.addworker.selectGPU.multiTag': 'Multi-select',
-  'clusters.addworker.selectGPU.singleOnly':
-    'The selected vendor is not in this cluster’s GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
+  'clusters.addworker.selectGPU.subtitle':
+    'Вы можете выбрать несколько производителей GPU или не выбирать для кластера только с CPU',
   'clusters.addworker.checkEnv': 'Проверить окружение',
+  'clusters.addworker.checkEnv.cpuOnlyTips':
+    'Используйте следующую команду, чтобы убедиться, что в кластере Kubernetes есть хотя бы один готовый узел. Вы регистрируете кластер только с CPU.',
   'clusters.addworker.specifyArgs': 'Указать аргументы',
+  'clusters.addworker.dtkVersion': 'Версия DTK',
   'clusters.addworker.runCommand': 'Выполнить команду',
   'clusters.addworker.specifyWorkerIP': 'Указать IP воркера',
   'clusters.addworker.detectWorkerIP': 'Автоматически определить IP воркера',
@@ -112,6 +115,8 @@ export default {
     '{count} новых воркеров были добавлены в кластер.',
   'clusters.create.serverUrl': 'URL сервера GPUStack',
   'clusters.create.workerConfig': 'Конфигурация воркера',
+  'clusters.edit.k8sOptions.changed.tip':
+    'Вы изменили параметры Kubernetes. Чтобы изменения вступили в силу, повторно выполните команду регистрации в целевом кластере.',
   'clusters.addworker.containerName': 'Имя контейнера воркера',
   'clusters.addworker.containerName.tips':
     'Укажите имя для контейнера воркера.',
@@ -165,6 +170,10 @@ export default {
   'clusters.volume.configMap.name': 'ConfigMap Name',
   'clusters.volume.configMap.optional': 'Optional',
   'clusters.volume.add': 'Add Volume Mount',
+  'clusters.systemDefaultContainerRegistry.title': 'Default Container Registry',
+  'clusters.systemDefaultContainerRegistry.tip':
+    'Default registry used to resolve GPUStack images for this cluster. Falls back to the server default when unset.',
+  'clusters.k8sOptions.title': 'Kubernetes Deployment Options',
   'clusters.imageCredentials.title': 'Image Credentials',
   'clusters.imageCredentials.add': 'Add Credential',
   'clusters.imageCredentials.registry': 'Registry',
@@ -173,18 +182,22 @@ export default {
   'clusters.nodeSelector.title': 'Node Selector',
   'clusters.nodeSelector.tip':
     'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
-  'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
-  'clusters.gpuVendorOverrides.validate.emptySelector':
-    'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
-  'clusters.gpuVendorOverrides.validate.duplicate':
-    'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
-  'clusters.gpuVendorOverrides.validate.keyConflict':
-    'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
-  'clusters.gpuVendorOverrides.tip':
-    'Required when running multiple GPU vendors in one cluster. Each entry pins that vendor’s worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
-  'clusters.gpuVendorOverrides.add': 'Add Override',
-  'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
-  'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
+  'clusters.operatorImage.title': 'Operator Image',
+  'clusters.operatorImage.tip':
+    'Override for the GPUStack Operator container image. Leave empty to use the server default.',
+  'clusters.namespace.title': 'Namespace',
+  'clusters.namespace.tip':
+    'Kubernetes namespace the cluster’s manifests render into. Leave empty to use gpustack-system.',
+  'clusters.clusterType.title': 'Cluster Type',
+  'clusters.modelService.title': 'Model Service',
+  'clusters.modelService.tip':
+    'For LLM inference and API serving — e.g. exposing model APIs and token-based services.',
+  'clusters.gpuInstances.title': 'GPU Service',
+  'clusters.gpuInstances.tip':
+    'For on-demand GPU compute — e.g. interactive development, training jobs, or custom environments.',
+  'clusters.gpuInstances.staticAddress': 'GPU Service Static Access Address',
+  'clusters.gpuInstances.staticAddress.tip':
+    'Static address the operator uses to access GPU instances in this cluster (e.g. a LoadBalancer VIP). Optional.'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ru-RU/common.ts

@@ -46,6 +46,7 @@ export default {
   'common.button.enabled': 'Активно',
   'common.button.disabled': 'Отключено',
   'common.button.upgrade': 'Обновить',
+  'common.enterprise.feature': 'Available in GPUStack Enterprise',
   'common.input.holder': 'Введите значение',
   'common.validate.value': 'Поле {name} обязательно',
   'common.button.edit': 'Редактировать',
@@ -55,6 +56,7 @@ export default {
   'common.button.viewevent': 'Просмотр событий',
   'common.button.recreate': 'Пересоздать',
   'common.table.operation': 'Действия',
+  'common.table.creator': 'Создатель',
   'common.table.createTime': 'Создано',
   'common.table.updateTime': 'Обновлено',
   'common.table.description': 'Описание',
@@ -65,6 +67,7 @@ export default {
   'common.search.name.placeholder': 'Фильтр по названию',
   'common.search.id.placeholder': 'Фильтр по ID',
   'common.filter.byId': 'Фильтр по ID',
+  'common.filter.byCreator': 'Фильтр по создателю',
   'common.table.type': 'Тип',
   'common.table.default': 'Значение по умолчанию',
   'common.copy.success': 'Скопировано!',
@@ -164,6 +167,7 @@ export default {
   'common.time.hour': 'Час',
   'common.time.minute': 'Минута',
   'common.issue.report': 'Сообщить о проблеме',
+  'common.github.star.tooltip': 'Поставьте нам звезду на GitHub',
   'common.social.discord': 'Присоединиться к Discord',
   'common.table.mark': 'Комментарий',
   'common.table.rollback.mark': 'Комментарий к откату',
@@ -256,11 +260,15 @@ export default {
   'common.login.auth': 'Аутентификация...',
   'common.login.auth.failed': 'Ошибка аутентификации',
   'common.login.password': 'Войти с паролем',
+  'common.login.username.holder': 'Введите имя пользователя',
+  'common.login.password.holder': 'Введите пароль',
+  'common.login.newpassword.holder': 'Введите новый пароль',
+  'common.login.confirm.holder': 'Введите пароль ещё раз',
   'common.external.login': 'Войти через {type}',
   'common.sso.noConfig':
     'Единый вход не настроен в этой системе. Пожалуйста, обратитесь к администратору.',
   'common.button.edit.item': 'Редактировать {name}',
-  'common.button.copy.item': 'Duplicate {name}',
+  'common.button.copy.item': 'Дублировать {name}',
   'common.button.terminal': 'Терминал',
   'common.button.addItem': 'Добавить элемент',
   'common.help.default': 'По умолчанию: {content}',
@@ -284,7 +292,9 @@ export default {
   'common.image.limit.height': 'Image height must be {height}.',
   'common.remaining': 'Остаток {count}',
   'common.max': 'Макс. {count}',
-  'common.validate.group': 'Please complete the {group} configuration'
+  'common.max.count': 'Количество {label}',
+  'common.validate.group': 'Please complete the {group} configuration',
+  'common.preferences': 'Preferences'
 };
 
 // ========== To-Do: Translate Keys (Remove After Translation) ==========

src/locales/ru-RU/gpuservice.ts

@@ -14,7 +14,11 @@ export default {
   'gpuservice.template.command.placeholder':
     'Разделяйте аргументы пробелами; аргументы с пробелами заключайте в кавычки, например: /bin/bash -c "echo hello world"',
   'gpuservice.template.mountPath': 'Путь монтирования',
+  'gpuservice.template.mountPath.tips':
+    'Путь, по которому том хранилища монтируется по умолчанию при создании экземпляра из этого шаблона. Может использоваться для сохранения данных, которые нужно сохранить во время работы экземпляра.',
   'gpuservice.template.containerDisk': 'Диск контейнера (GB)',
+  'gpuservice.template.containerDisk.tips':
+    'Размер системного диска контейнера.',
   'gpuservice.template.memory': 'Память (GB)',
   'gpuservice.instance.containerDisk.remaining':
     'Диск контейнера (Макс. {count} GB)',
@@ -100,18 +104,27 @@ export default {
   'gpuservice.instance.templates': 'Шаблоны экземпляров',
   'gpuservice.instance.section.storage': 'Том хранилища',
   'gpuservice.instance.type.required': 'Выберите тип экземпляра',
+  'gpuservice.instance.type.noAvailable': 'Нет доступных типов экземпляров',
   'gpuservice.instance.gpuCount': 'Количество GPU',
   'gpuservice.instance.gpuCount.required': 'Введите количество GPU',
   'gpuservice.instance.gpuCount.max': 'Выберите максимум {count} GPU-карт',
   'gpuservice.instance.gpuCount.min': 'Выберите минимум {count} GPU-карт',
+  'gpuservice.instance.cpuCount.max': 'Выберите максимум {count} ядер CPU',
+  'gpuservice.instance.cpuCount.min': 'Выберите минимум {count} ядер CPU',
   'gpuservice.instance.gpuCount.noAvailable':
     'Нет доступных ресурсов GPU, выберите другой тип экземпляра.',
   'gpuservice.instance.gpuCount.zero': 'Только CPU, для подготовки окружения.',
   'gpuservice.instance.stock': 'Остаток',
   'gpuservice.instance.sliced': 'Разделено',
-  'gpuservice.instance.memory': 'Память',
+  'gpuservice.instance.memory': 'VRAM',
   'gpuservice.instance.ram': 'RAM',
+  'gpuservice.instance.os': 'ОС',
+  'gpuservice.instance.arch': 'Архитектура',
   'gpuservice.instance.disk': 'Диск',
+  'gpuservice.table.count': 'Количество',
+  'gpuservice.instance.disk.system': 'Системный диск',
+  'gpuservice.instance.disk.ephemeral': 'Временное хранилище',
+  'gpuservice.instance.disk.persistent': 'Постоянное хранилище',
   'gpuservice.instance.search.type.placeholder': 'Поиск по имени',
   'gpuservice.instance.search.template.placeholder':
     'Поиск по имени шаблона, образу или пути монтирования',
@@ -143,8 +156,8 @@ export default {
   'gpuservice.storage.accessMode': 'Режим доступа',
   'gpuservice.storage.persistent': 'Постоянное',
   'gpuservice.storage.temporary': 'Временное',
-  'gpuservice.storage.persistentVolume': 'Постоянный том',
-  'gpuservice.storage.persistentVolume.required': 'Выберите постоянный том',
+  'gpuservice.storage.persistentVolume': 'Постоянное',
+  'gpuservice.storage.persistentVolume.required': 'Выберите хранилище',
   'gpuservice.storage.persistentVolume.capacity': 'Ёмкость (ГБ)',
   'gpuservice.storage.persistentVolume.capacity.required': 'Введите ёмкость',
   'gpuservice.storage.persistentVolume.releaseWithInstance':
@@ -157,5 +170,10 @@ export default {
   'gpuservice.storage.temporary.tips':
     'Data is cleared when the instance stops.',
   'gpuservice.storage.persistentVolume.tips':
-    'Data persists across restarts and is deleted only when the instance is terminated. Cannot be shared with other instances.'
+    'Data persists across instance restarts. Persistent volumes remain intact after instance termination and can be shared by multiple instances.',
+  'gpuservice.form.storage.select': 'Выберите хранилище',
+  'gpuservice.creator': 'Создатель',
+  'gpuservice.owner.global': 'Глобальный',
+  'gpuservice.template.group.yours': 'Ваши шаблоны',
+  'gpuservice.template.group.global': 'Глобальные шаблоны'
 };

src/locales/ru-RU/menu.ts

@@ -8,7 +8,7 @@ export default {
   'menu.playground.text2images': 'Генерация изображений',
   'menu.playground.video': 'Видео',
   'menu.compare': 'Сравнение',
-  'menu.models': 'Модели',
+  'menu.models': 'Сервисы моделей',
   'menu.models.modelList': 'Развертывание и управление',
   'menu.models.modelCatalog': 'Каталог',
   'menu.models.catalog': 'Каталог моделей',
@@ -23,23 +23,27 @@ export default {
   'menu.resources': 'Ресурсы',
   'menu.apikeys': 'API-ключи',
   'menu.users': 'Пользователи',
-  'menu.profile': 'Профиль',
+  'menu.profile': 'Preferences',
   'menu.login': 'Авторизация',
   'menu.usage': 'Использование',
+  'menu.usage.usage': 'Использование',
+  'menu.billingAndUsage': 'Использование и биллинг',
+  'menu.billingAndUsage.usage': 'Использование',
+  'menu.billingAndUsage.billing': 'Биллинг',
   'menu.404': 'Ошибка 404',
   'menu.resources.workers': 'Воркеры',
   'menu.resources.gpus': 'GPUs',
-  'menu.resources.modelfiles': 'Файлы модлей',
+  'menu.models.modelfiles': 'Файлы модлей',
   'menu.accessControl': 'Управление доступом',
   'menu.accessControl.apikeys': 'API Ключи',
   'menu.accessControl.users': 'Пользователи',
-  'menu.clusterManagement': 'Управление кластерами',
-  'menu.clusterManagement.clusters': 'Кластеры',
-  'menu.clusterManagement.credentials': 'Облачные аккаунты',
+  'menu.accessControl.organizations': 'Организации',
+  'menu.resources.clusters': 'Кластеры',
+  'menu.resources.credentials': 'Облачные аккаунты',
   'menu.models.userModels': 'Мои модели',
-  'menu.clusterManagement.clusterDetail': 'Детали кластера',
-  'menu.clusterManagement.clusterCreate': 'Создать кластер',
-  'menu.resources.backendsList': 'Бэкенды запуска',
+  'menu.resources.clusterDetail': 'Детали кластера',
+  'menu.resources.clusterCreate': 'Создать кластер',
+  'menu.models.backendsList': 'Бэкенды запуска',
   'menu.settings': 'Settings',
   'menu.gpuService': 'GPU Service',
   'menu.gpuService.instances': 'GPU Instances',

src/locales/ru-RU/models.ts

@@ -295,7 +295,7 @@ export default {
   'models.instance.startHistory': 'Run History',
   'models.instance.startHistory.tips':
     'Shows logs from the run before the last error-triggered restart.',
-  'models.form.lora.label': 'LoRA Adapter',
+  'models.form.lora.label': 'LoRA Adapters',
   'models.form.lora.add': 'Add LoRA Adapter',
   'models.form.lora.select': 'Select LoRA',
   'models.form.lora.name': 'LoRA name',

src/locales/ru-RU/no-result.ts

@@ -37,9 +37,12 @@ export default {
   'noresult.catalog.nofound': 'Подходящие модели не найдены.',
   'noresult.resources.cluster':
     'No clusters available. Add a cluster to get started.',
+  'noresult.resources.k8sCluster':
+    'No clusters available. Add a Kubernetes cluster to get started.',
   'noresult.resources.worker':
     'No workers available. Add a worker to get started.',
   'noresult.resources.gotocluster': 'Create Your First Cluster',
+  'noresult.resources.addk8scluster': 'Add a Kubernetes Cluster',
   'noresult.resources.gotoworker': 'Add Worker',
   'noresult.benchmark.title': 'No Benchmarks',
   'noresult.benchmark.subTitle': 'No benchmarks have been added yet.',
@@ -67,8 +70,7 @@ export default {
   'noresult.gpuservice.storage.subTitle': 'Хранилища ещё не добавлены.',
   'noresult.gpuservice.storage.nofound': 'Подходящие хранилища не найдены.',
   'noresult.gpuservice.storageType.title': 'Нет типов хранилищ',
-  'noresult.gpuservice.storageType.subTitle':
-    'Типы хранилищ ещё не добавлены.',
+  'noresult.gpuservice.storageType.subTitle': 'Типы хранилищ ещё не добавлены.',
   'noresult.gpuservice.storageType.nofound':
     'Подходящие типы хранилищ не найдены.',
   'noresult.gpuservice.sshkey.title': 'Нет открытых ключей SSH',

src/locales/ru-RU/organizations.ts

@@ -0,0 +1,15 @@
+export default {
+  'organizations.upsell.title': 'Organizations are an Enterprise feature',
+  'organizations.upsell.subtitle':
+    'Multi-tenancy lets you isolate users, resources, and quotas across teams. Upgrade to GPUStack Enterprise to manage organizations.',
+  'organizations.upsell.featuresTitle': 'What you get in Enterprise',
+  'organizations.upsell.feature.orgs':
+    'Create organizations to group users and isolate workloads',
+  'organizations.upsell.feature.members':
+    'Manage members and roles per organization',
+  'organizations.upsell.feature.quotas':
+    'Set resource and token quotas per organization',
+  'organizations.upsell.feature.isolation':
+    'Scope API keys, model deployments, and resources per organization',
+  'organizations.upsell.cta': 'Learn about Enterprise'
+};

src/locales/ru-RU/usage.ts

@@ -17,9 +17,15 @@ export default {
   'usage.table.user.apiKeysUsed': 'API Keys Used',
   'usage.table.lastActive': 'Last Active',
   'usage.filter.granularity': 'Granularity',
+  'usage.filter.granularity.hour': 'Час',
   'usage.filter.granularity.day': 'Day',
   'usage.filter.granularity.week': 'Week',
   'usage.filter.granularity.month': 'Month',
+  'usage.tabs.summary': 'Обзор',
+  'usage.tabs.tokens': 'Токены',
+  'usage.tabs.gpuInstances': 'GPU-инстансы',
+  'usage.tabs.storage': 'Хранилище',
+  'usage.tabs.resourceEvents': 'События ресурсов',
   'usage.tabs.models': 'Models',
   'usage.tabs.apikeys': 'API Keys',
   'usage.tabs.users': 'User',
@@ -32,5 +38,70 @@ export default {
   'usage.chart.cached': 'Cached',
   'usage.chart.uncached': 'Uncached',
   'usage.chart.inputTokensCached': 'Input Tokens (Cached/Uncached)',
-  'usage.table.inputTokensCached': 'Input Tokens Cached'
+  'usage.table.inputTokensCached': 'Input Tokens Cached',
+
+  // --- Resource usage: shared metrics & units ---
+  'usage.metric.tokens': 'Токены',
+  'usage.metric.input': 'Вход',
+  'usage.metric.output': 'Выход',
+  'usage.metric.gpuHours': 'GPU-часы',
+  'usage.metric.instanceHours': 'Часы инстансов',
+  'usage.metric.gbDays': 'ГБ-дни',
+  'usage.metric.gbHours': 'ГБ-часы',
+  'usage.metric.activeUsers': 'Активные пользователи',
+  'usage.metric.activeInstances': 'Активные инстансы',
+  'usage.metric.activeStorage': 'Активное хранилище',
+  'usage.metric.activeVolumes': 'Активные тома',
+  'usage.metric.storageTypes': 'Типы хранилищ',
+  'usage.metric.gpuHours.tip':
+    'Время работы инстанса, взвешенное по количеству GPU: инстанс с N GPU, работающий H часов, считается как N × H GPU-часов. Равно часам инстансов, когда каждый инстанс использует один GPU.',
+  'usage.metric.instanceHours.tip':
+    'Суммарное время работы всех инстансов независимо от количества используемых GPU. Один инстанс, работающий 2 часа = 2 часа инстанса.',
+  'usage.metric.gbDays.tip':
+    'Ёмкость хранилища, проинтегрированная по времени, в ГБ × дни: 10 ГБ в течение 5 дней = 50 ГБ-дней. (= ГБ-часы ÷ 24)',
+  'usage.metric.gbHours.tip':
+    'Ёмкость хранилища, проинтегрированная по времени, в ГБ × часы: 10 ГБ в течение 5 часов = 50 ГБ-часов.',
+
+  // --- Resource usage: common table / labels ---
+  'usage.common.noData': 'Нет данных',
+  'usage.common.unknown': 'неизвестно',
+  'usage.table.date': 'Дата',
+  'usage.table.name': 'Имя',
+  'usage.table.user': 'Пользователь',
+  'usage.table.users': 'Пользователи',
+  'usage.table.type': 'Тип',
+  'usage.table.instance': 'Инстанс',
+  'usage.table.instanceType': 'Тип инстанса',
+  'usage.table.instanceTypes': 'Типы инстансов',
+  'usage.table.instances': 'Инстансы',
+  'usage.table.capacity': 'Ёмкость',
+  'usage.export.tableNamed': 'Экспорт данных таблицы — {name}',
+
+  // --- Summary tab ---
+  'usage.summary.compute': 'Вычисления',
+  'usage.summary.tokensOverTime': 'Токены по времени',
+  'usage.summary.gpuHoursOverTime': 'GPU-часы по времени',
+  'usage.summary.gbDaysOverTime': 'ГБ-дни по времени',
+
+  // --- GPU Instances / Storage filters ---
+  'usage.filter.instance': 'Фильтр по инстансу',
+  'usage.filter.storage': 'Фильтр по хранилищу',
+
+  // --- Resource events ---
+  'usage.events.resourceType': 'Тип ресурса',
+  'usage.events.eventType': 'Тип события',
+  'usage.events.resourceName': 'Фильтр по имени',
+  'usage.events.col.time': 'Время',
+  'usage.events.col.resource': 'Ресурс',
+  'usage.events.col.event': 'Событие',
+  'usage.events.col.message': 'Сообщение',
+  'usage.events.resource.gpuInstance': 'GPU-инстанс',
+  'usage.events.resource.cpuInstance': 'CPU-инстанс',
+  'usage.events.type.created': 'Создан',
+  'usage.events.type.deleted': 'Удалён',
+  'usage.events.type.started': 'Запущен',
+  'usage.events.type.stopped': 'Остановлен',
+  'usage.events.type.updated': 'Обновлён',
+  'usage.events.type.attached': 'Подключён',
+  'usage.events.type.detached': 'Отключён'
 };

src/locales/ru-RU/vendor.ts

@@ -4,7 +4,7 @@ export default {
   'vendor.hygon': 'Hygon',
   'vendor.moorthreads': 'Moore Threads',
   'vendor.iluvatar': 'Iluvatar',
-  'vendor.metax': 'Metax',
+  'vendor.metax': 'MetaX',
   'vendor.cambricon': 'Cambricon',
   'vendor.thead': 'T-Head PPU'
 };

src/locales/tr-TR/apikeys.ts

@@ -23,5 +23,7 @@ export default {
   'apikeys.accessScope.inference': 'Inference APIs',
   'apikeys.access.permissions': 'Access Permissions',
   'apikeys.type.auto': 'Auto-generated',
-  'apikeys.type.custom': 'Custom'
+  'apikeys.type.custom': 'Custom',
+  'apikeys.button.ipConfig': 'IP Access Control',
+  'quotaLimits.button.title': 'Quota Limit'
 };

src/locales/tr-TR/backends.ts

@@ -23,11 +23,12 @@ export default {
   'backend.form.defaultExecuteCommand': 'Varsayılan Çalıştırma Komutu',
   'backend.form.defaultExecuteCommand.tips': `'{{'model_path'}}', '{{'port'}}', '{{'worker_ip'}}' ve '{{'model_name'}}' dağıtım sırasında gerçek değerlerle değiştirilecek yer tutuculardır.`,
   'backend.form.defaultBackendParameters': 'Varsayılan Altyapı Parametreleri',
-  'backend.form.parameterFormat': 'Parametre Biçimi',
-  'backend.form.parameterFormat.default': 'Varsayılan',
-  'backend.form.parameterFormat.space': 'Boşluk (--key value)',
-  'backend.form.parameterFormat.equal': 'Eşittir (--key=value)',
-  'backend.form.commonParameters': 'Yaygın Parametreler',
+  'backend.form.flagFormat': 'Bayrak Biçimi',
+  'backend.form.flagFormat.tips':
+    'Bir seçenek ile değerinin birleştirilme biçimi. Boş bırakılırsa her parametre girildiği biçimde korunur, biçim birleştirilmez.',
+  'backend.form.flagFormat.space': 'Boşlukla Ayır (--key value)',
+  'backend.form.flagFormat.equal': 'Eşittir İşareti (--key=value)',
+  'backend.form.commonParameters': 'Ortak Altyapı Parametreleri',
   'backend.form.commonParameters.tips':
     'Dağıtım sırasında altyapı parametreleri girişinde öneri olarak gösterilir.',
   'backend.form.versionConfig': 'Sürüm Yapılandırması',

src/locales/tr-TR/benchmark.ts

@@ -37,8 +37,8 @@ export default {
     'Uzun bağlam işleme için stres testi. KV önbellek davranışını, bellek kullanımını ve altyapı kararlılığını değerlendirir.',
   'benchmark.form.profile.heavy.tips':
     'Çözümleme ağırlıklı üretim kıyaslaması. Sürekli çözümleme hızını ve çıkış token verimini ölçer.',
-  'benchmark.table.filter.bygpu': "GPU'ya göre filtrele",
-  'benchmark.table.filter.bymodel': 'Modele göre filtrele',
+  'benchmark.table.filter.bygpu': 'GPU ara',
+  'benchmark.table.filter.bymodel': 'Model ara',
   'benchmark.table.filter.bydataset': 'Veri Kümesine göre filtrele',
   'benchmark.table.filter.byProfile': 'Profile göre filtrele',
   'benchmark.table.avg': 'Ort.',

src/locales/tr-TR/billing.ts

@@ -0,0 +1,15 @@
+export default {
+  'billing.upsell.title': 'Billing is an Enterprise feature',
+  'billing.upsell.subtitle':
+    'Track spend, generate invoices, and enforce budgets across teams. Upgrade to GPUStack Enterprise to manage billing.',
+  'billing.upsell.featuresTitle': 'What you get in Enterprise',
+  'billing.upsell.feature.usage':
+    'See cost breakdowns by organization, user, and model',
+  'billing.upsell.feature.invoices':
+    'Generate invoices and export billing reports',
+  'billing.upsell.feature.budgets':
+    'Set budgets and spending limits with alerts',
+  'billing.upsell.feature.chargeback':
+    'Attribute and charge back usage to teams and projects',
+  'billing.upsell.cta': 'Learn about Enterprise'
+};

src/locales/tr-TR/clusters.ts

@@ -39,7 +39,7 @@ export default {
   'clusters.workerpool.batchSize.desc':
     'İşçi havuzunda eşzamanlı olarak oluşturulan işçi düğüm sayısı',
   'clusters.create.addworker.tips':
-    'Aşağıdaki komutu çalıştırmadan önce lütfen {label} için <a href={link} target="_blank">ön koşulların</a> karşılandığından emin olun.',
+    'Aşağıdaki komutu çalıştırmadan önce lütfen <a href={link} target="_blank">ön koşulların</a> karşılandığından emin olun.',
   'clusters.create.addCommand.tips':
     'Eklenmesi gereken İşçi Düğümde, kümeye katılması için aşağıdaki komutu çalıştırın.',
   'clusters.create.addCommand.k8s.tips':
@@ -70,10 +70,13 @@ export default {
     '<span class="bold-text">Docker dışı</span> kümeler için lütfen Kümeler sayfasından küme kaydı oluşturun veya işçi havuzlarını yönetin.',
   'clusters.addworker.selectGPU': 'GPU Üreticisi Seç',
   'clusters.addworker.selectGPU.multiTag': 'Multi-select',
-  'clusters.addworker.selectGPU.singleOnly':
-    'The selected vendor is not in this cluster’s GPU vendor overrides — single-select only. Pick a vendor configured in the overrides to enable multi-select.',
+  'clusters.addworker.selectGPU.subtitle':
+    'Birden fazla GPU Üreticisi seçebilir veya yalnızca CPU kümeleri için hiçbirini seçmeyebilirsiniz',
   'clusters.addworker.checkEnv': 'Ortamı Kontrol Et',
+  'clusters.addworker.checkEnv.cpuOnlyTips':
+    'Kubernetes kümesinde en az bir hazır düğüm olduğunu doğrulamak için aşağıdaki komutu kullanın. Yalnızca CPU kümelerini kaydediyorsunuz.',
   'clusters.addworker.specifyArgs': 'Argümanları Belirle',
+  'clusters.addworker.dtkVersion': 'DTK Sürümü',
   'clusters.addworker.runCommand': 'Komutu Çalıştır',
   'clusters.addworker.specifyWorkerIP': "İşçi Düğüm IP'si",
   'clusters.addworker.detectWorkerIP': "İşçi Düğüm IP'sini Otomatik Algıla",
@@ -112,6 +115,8 @@ export default {
     '{count} yeni işçi düğüm kümeye eklendi.',
   'clusters.create.serverUrl': "GPUStack Sunucu URL'si",
   'clusters.create.workerConfig': 'İşçi Düğüm Yapılandırması',
+  'clusters.edit.k8sOptions.changed.tip':
+    'Kubernetes seçeneklerini değiştirdiniz. Değişikliklerin etkili olması için kayıt komutunu hedef kümede yeniden çalıştırın.',
   'clusters.addworker.containerName': 'İşçi Düğüm Konteyner Adı',
   'clusters.addworker.containerName.tips':
     'İşçi düğüm konteyneri için bir ad belirtin.',
@@ -165,6 +170,10 @@ export default {
   'clusters.volume.configMap.name': 'ConfigMap Name',
   'clusters.volume.configMap.optional': 'Optional',
   'clusters.volume.add': 'Add Volume Mount',
+  'clusters.systemDefaultContainerRegistry.title': 'Default Container Registry',
+  'clusters.systemDefaultContainerRegistry.tip':
+    'Default registry used to resolve GPUStack images for this cluster. Falls back to the server default when unset.',
+  'clusters.k8sOptions.title': 'Kubernetes Deployment Options',
   'clusters.imageCredentials.title': 'Image Credentials',
   'clusters.imageCredentials.add': 'Add Credential',
   'clusters.imageCredentials.registry': 'Registry',
@@ -173,16 +182,20 @@ export default {
   'clusters.nodeSelector.title': 'Node Selector',
   'clusters.nodeSelector.tip':
     'Pod nodeSelector applied to every worker DaemonSet — only nodes whose labels match are eligible to run the worker.',
-  'clusters.gpuVendorOverrides.title': 'GPU Vendor Overrides',
-  'clusters.gpuVendorOverrides.validate.emptySelector':
-    'The override for {vendor} needs at least one nodeSelector entry — an empty override would leave the multi-vendor manifest unable to target nodes for this runtime.',
-  'clusters.gpuVendorOverrides.validate.duplicate':
-    'Overrides for {v1} and {v2} use the same nodeSelector. Each vendor must scope to a distinct node set, otherwise their worker DaemonSets would compete for the same nodes.',
-  'clusters.gpuVendorOverrides.validate.keyConflict':
-    'Override for {vendor} reuses key(s) {keys} from the base Node Selector — the CPU worker would simultaneously require and forbid the key and never schedule.',
-  'clusters.gpuVendorOverrides.tip':
-    'Required when running multiple GPU vendors in one cluster. Each entry pins that vendor’s worker DaemonSet to nodes matching its nodeSelector, and the CPU worker is steered away from those nodes via a DoesNotExist node-affinity.',
-  'clusters.gpuVendorOverrides.add': 'Add Override',
-  'clusters.gpuVendorOverrides.vendor': 'GPU Vendor',
-  'clusters.gpuVendorOverrides.nodeSelector': 'Node Selector'
+  'clusters.operatorImage.title': 'Operator Image',
+  'clusters.operatorImage.tip':
+    'Override for the GPUStack Operator container image. Leave empty to use the server default.',
+  'clusters.namespace.title': 'Namespace',
+  'clusters.namespace.tip':
+    'Kubernetes namespace the cluster’s manifests render into. Leave empty to use gpustack-system.',
+  'clusters.clusterType.title': 'Cluster Type',
+  'clusters.modelService.title': 'Model Service',
+  'clusters.modelService.tip':
+    'For LLM inference and API serving — e.g. exposing model APIs and token-based services.',
+  'clusters.gpuInstances.title': 'GPU Service',
+  'clusters.gpuInstances.tip':
+    'For on-demand GPU compute — e.g. interactive development, training jobs, or custom environments.',
+  'clusters.gpuInstances.staticAddress': 'GPU Service Static Access Address',
+  'clusters.gpuInstances.staticAddress.tip':
+    'Static address the operator uses to access GPU instances in this cluster (e.g. a LoadBalancer VIP). Optional.'
 };

src/locales/tr-TR/common.ts

@@ -46,6 +46,7 @@ export default {
   'common.button.enabled': 'Etkin',
   'common.button.disabled': 'Devre dışı',
   'common.button.upgrade': 'Yükselt',
+  'common.enterprise.feature': 'Available in GPUStack Enterprise',
   'common.input.holder': 'Lütfen girin',
   'common.validate.value': '{name} değeri gereklidir',
   'common.button.edit': 'Düzenle',
@@ -55,6 +56,7 @@ export default {
   'common.button.viewevent': 'Olayları Görüntüle',
   'common.button.recreate': 'Yeniden Oluştur',
   'common.table.operation': 'İşlemler',
+  'common.table.creator': 'Oluşturan',
   'common.table.createTime': 'Oluşturulma',
   'common.table.updateTime': 'Güncellenme',
   'common.table.description': 'Açıklama',
@@ -65,6 +67,7 @@ export default {
   'common.search.name.placeholder': 'ada göre filtrele',
   'common.search.id.placeholder': 'kimliğe göre filtrele',
   'common.filter.byId': 'kimliğe göre filtrele',
+  'common.filter.byCreator': 'Oluşturana göre filtrele',
   'common.table.type': 'Tür',
   'common.table.default': 'Varsayılan Değer',
   'common.copy.success': 'Kopyalama başarılı!',
@@ -164,6 +167,7 @@ export default {
   'common.time.hour': 'saat',
   'common.time.minute': 'dakika',
   'common.issue.report': 'Sorun bildir',
+  'common.github.star.tooltip': "GitHub'da bize yıldız verin",
   'common.social.discord': "Discord'umuza Katılın",
   'common.table.mark': 'Yorum',
   'common.table.rollback.mark': 'Geri Alma Yorumu',
@@ -260,6 +264,10 @@ export default {
   'common.login.auth': 'Kimlik doğrulanıyor...',
   'common.login.auth.failed': 'Kimlik doğrulama başarısız',
   'common.login.password': 'Şifre ile giriş yap',
+  'common.login.username.holder': 'Lütfen kullanıcı adını girin',
+  'common.login.password.holder': 'Lütfen şifreyi girin',
+  'common.login.newpassword.holder': 'Lütfen yeni şifreyi girin',
+  'common.login.confirm.holder': 'Lütfen şifreyi tekrar girin',
   'common.external.login': '{type} ile giriş yap',
   'common.sso.noConfig':
     'Bu sistemde çoklu oturum açma etkinleştirilmemiş. Lütfen yöneticinize başvurun.',
@@ -288,5 +296,7 @@ export default {
   'common.image.limit.height': 'Image height must be {height}.',
   'common.remaining': 'Kalan {count}',
   'common.max': 'Maks. {count}',
-  'common.validate.group': 'Please complete the {group} configuration'
+  'common.max.count': '{label} Sayısı',
+  'common.validate.group': 'Please complete the {group} configuration',
+  'common.preferences': 'Tercihler'
 };

src/locales/tr-TR/gpuservice.ts

@@ -13,7 +13,10 @@ export default {
   'gpuservice.template.command.placeholder':
     'Argümanları boşlukla ayırın; boşluk içeren argümanları tırnak içine alın, örn.: /bin/bash -c "echo hello world"',
   'gpuservice.template.mountPath': 'Bağlama Yolu',
+  'gpuservice.template.mountPath.tips':
+    'Bu şablondan bir örnek oluşturulurken depolama biriminin varsayılan olarak bağlanacağı yol. Örnek çalışırken saklanması gereken verileri kalıcı hale getirmek için kullanılabilir.',
   'gpuservice.template.containerDisk': 'Konteyner Diski (GB)',
+  'gpuservice.template.containerDisk.tips': 'Konteyner sistem diskinin boyutu.',
   'gpuservice.template.memory': 'Bellek (GB)',
   'gpuservice.instance.containerDisk.remaining':
     'Konteyner Diski (Maks. {count} GB)',
@@ -97,18 +100,27 @@ export default {
   'gpuservice.instance.templates': 'Örnek Şablonları',
   'gpuservice.instance.section.storage': 'Depolama Hacmi',
   'gpuservice.instance.type.required': 'Lütfen bir örnek türü seçin',
+  'gpuservice.instance.type.noAvailable': 'Kullanılabilir örnek türü yok',
   'gpuservice.instance.gpuCount': 'GPU Sayısı',
   'gpuservice.instance.gpuCount.required': 'Lütfen GPU sayısını girin',
   'gpuservice.instance.gpuCount.max': 'En fazla {count} GPU kartı seçin',
   'gpuservice.instance.gpuCount.min': 'En az {count} GPU kartı seçin',
+  'gpuservice.instance.cpuCount.max': 'En fazla {count} CPU çekirdeği seçin',
+  'gpuservice.instance.cpuCount.min': 'En az {count} CPU çekirdeği seçin',
   'gpuservice.instance.gpuCount.noAvailable':
     'Kullanılabilir GPU kaynağı yok, lütfen başka bir örnek türü seçin.',
   'gpuservice.instance.gpuCount.zero': 'Yalnızca CPU, ortam hazırlığı için.',
   'gpuservice.instance.stock': 'Stok',
   'gpuservice.instance.sliced': 'Bölünmüş',
-  'gpuservice.instance.memory': 'Bellek',
+  'gpuservice.instance.memory': 'VRAM',
   'gpuservice.instance.ram': 'RAM',
+  'gpuservice.instance.os': 'OS',
+  'gpuservice.instance.arch': 'Mimari',
   'gpuservice.instance.disk': 'Disk',
+  'gpuservice.table.count': 'Sayı',
+  'gpuservice.instance.disk.system': 'Sistem Diski',
+  'gpuservice.instance.disk.ephemeral': 'Geçici Depolama',
+  'gpuservice.instance.disk.persistent': 'Kalıcı Depolama',
   'gpuservice.instance.search.type.placeholder': 'Ada göre ara',
   'gpuservice.instance.search.template.placeholder':
     'Şablon adına, imaja veya bağlama yoluna göre ara',
@@ -141,9 +153,8 @@ export default {
   'gpuservice.storage.accessMode': 'Erişim Modu',
   'gpuservice.storage.persistent': 'Kalıcı',
   'gpuservice.storage.temporary': 'Geçici',
-  'gpuservice.storage.persistentVolume': 'Kalıcı Hacim',
-  'gpuservice.storage.persistentVolume.required':
-    'Lütfen bir kalıcı hacim seçin',
+  'gpuservice.storage.persistentVolume': 'Kalıcı',
+  'gpuservice.storage.persistentVolume.required': 'Lütfen bir depolama seçin',
   'gpuservice.storage.persistentVolume.capacity': 'Kapasite (GB)',
   'gpuservice.storage.persistentVolume.capacity.required':
     'Lütfen kapasiteyi girin',
@@ -157,5 +168,10 @@ export default {
   'gpuservice.storage.temporary.tips':
     'Data is cleared when the instance stops.',
   'gpuservice.storage.persistentVolume.tips':
-    'Data persists across restarts and is deleted only when the instance is terminated. Cannot be shared with other instances.'
+    'Data persists across instance restarts. Persistent volumes remain intact after instance termination and can be shared by multiple instances.',
+  'gpuservice.form.storage.select': 'Depolamayı Seç',
+  'gpuservice.creator': 'Oluşturan',
+  'gpuservice.owner.global': 'Genel',
+  'gpuservice.template.group.yours': 'Şablonlarınız',
+  'gpuservice.template.group.global': 'Genel Şablonlar'
 };

src/locales/tr-TR/menu.ts

@@ -8,7 +8,7 @@ export default {
   'menu.playground.text2images': 'Görsel',
   'menu.playground.video': 'Video',
   'menu.compare': 'Karşılaştır',
-  'menu.models': 'Modeller',
+  'menu.models': 'Model Hizmetleri',
   'menu.models.modelList': 'Dağıt ve Yönet',
   'menu.models.modelCatalog': 'Katalog',
   'menu.models.catalog': 'Model Kataloğu',
@@ -25,20 +25,24 @@ export default {
   'menu.users': 'Kullanıcılar',
   'menu.resources.workers': 'İşçi Düğümler',
   'menu.resources.gpus': "GPU'lar",
-  'menu.resources.modelfiles': 'Model Dosyaları',
+  'menu.models.modelfiles': 'Model Dosyaları',
   'menu.accessControl': 'Erişim Kontrolü',
   'menu.accessControl.apikeys': 'API Anahtarları',
   'menu.accessControl.users': 'Kullanıcılar',
-  'menu.profile': 'Profil',
+  'menu.accessControl.organizations': 'Organizasyonlar',
+  'menu.profile': 'Preferences',
   'menu.login': 'Giriş',
   'menu.usage': 'Kullanım',
+  'menu.usage.usage': 'Kullanım',
+  'menu.billingAndUsage': 'Kullanım ve Faturalandırma',
+  'menu.billingAndUsage.usage': 'Kullanım',
+  'menu.billingAndUsage.billing': 'Faturalandırma',
   'menu.404': '404',
-  'menu.clusterManagement': 'Küme Yönetimi',
-  'menu.clusterManagement.clusters': 'Kümeler',
-  'menu.clusterManagement.credentials': 'Bulut Kimlik Bilgileri',
-  'menu.clusterManagement.clusterDetail': 'Küme Detayı',
-  'menu.clusterManagement.clusterCreate': 'Küme Oluştur',
-  'menu.resources.backendsList': 'Çıkarım Altyapıları',
+  'menu.resources.clusters': 'Kümeler',
+  'menu.resources.credentials': 'Bulut Kimlik Bilgileri',
+  'menu.resources.clusterDetail': 'Küme Detayı',
+  'menu.resources.clusterCreate': 'Küme Oluştur',
+  'menu.models.backendsList': 'Çıkarım Altyapıları',
   'menu.models.instances': 'Instances',
   'menu.settings': 'Settings',
   'menu.gpuService': 'GPU Service',

src/locales/tr-TR/models.ts

@@ -291,7 +291,7 @@ export default {
   'models.instance.startHistory': 'Run History',
   'models.instance.startHistory.tips':
     'Shows logs from the run before the last error-triggered restart.',
-  'models.form.lora.label': 'LoRA Adapter',
+  'models.form.lora.label': 'LoRA Adapters',
   'models.form.lora.add': 'Add LoRA Adapter',
   'models.form.lora.select': 'Select LoRA',
   'models.form.lora.name': 'LoRA name',

src/locales/tr-TR/no-result.ts

@@ -38,9 +38,12 @@ export default {
   'noresult.catalog.nofound': 'Eşleşen model bulunamadı.',
   'noresult.resources.cluster':
     'Kullanılabilir küme yok. Başlamak için bir küme ekleyin.',
+  'noresult.resources.k8sCluster':
+    'Kullanılabilir küme yok. Başlamak için bir Kubernetes kümesi ekleyin.',
   'noresult.resources.worker':
     'Kullanılabilir işçi düğüm yok. Başlamak için bir işçi düğüm ekleyin.',
   'noresult.resources.gotocluster': 'İlk Kümenizi Oluşturun',
+  'noresult.resources.addk8scluster': 'Kubernetes Kümesi Ekle',
   'noresult.resources.gotoworker': 'İşçi Düğüm Ekle',
   'noresult.benchmark.title': 'Kıyaslama Yok',
   'noresult.benchmark.subTitle': 'Henüz kıyaslama eklenmedi.',

src/locales/tr-TR/organizations.ts

@@ -0,0 +1,15 @@
+export default {
+  'organizations.upsell.title': 'Organizations are an Enterprise feature',
+  'organizations.upsell.subtitle':
+    'Multi-tenancy lets you isolate users, resources, and quotas across teams. Upgrade to GPUStack Enterprise to manage organizations.',
+  'organizations.upsell.featuresTitle': 'What you get in Enterprise',
+  'organizations.upsell.feature.orgs':
+    'Create organizations to group users and isolate workloads',
+  'organizations.upsell.feature.members':
+    'Manage members and roles per organization',
+  'organizations.upsell.feature.quotas':
+    'Set resource and token quotas per organization',
+  'organizations.upsell.feature.isolation':
+    'Scope API keys, model deployments, and resources per organization',
+  'organizations.upsell.cta': 'Learn about Enterprise'
+};

src/locales/tr-TR/usage.ts

@@ -17,9 +17,15 @@ export default {
   'usage.table.user.apiKeysUsed': 'API Keys Used',
   'usage.table.lastActive': 'Last Active',
   'usage.filter.granularity': 'Granularity',
+  'usage.filter.granularity.hour': 'Saat',
   'usage.filter.granularity.day': 'Day',
   'usage.filter.granularity.week': 'Week',
   'usage.filter.granularity.month': 'Month',
+  'usage.tabs.summary': 'Özet',
+  'usage.tabs.tokens': 'Token',
+  'usage.tabs.gpuInstances': 'GPU Örnekleri',
+  'usage.tabs.storage': 'Depolama',
+  'usage.tabs.resourceEvents': 'Kaynak Olayları',
   'usage.tabs.models': 'Models',
   'usage.tabs.apikeys': 'API Keys',
   'usage.tabs.users': 'User',
@@ -32,5 +38,70 @@ export default {
   'usage.chart.cached': 'Cached',
   'usage.chart.uncached': 'Uncached',
   'usage.chart.inputTokensCached': 'Input Tokens (Cached/Uncached)',
-  'usage.table.inputTokensCached': 'Input Tokens Cached'
+  'usage.table.inputTokensCached': 'Input Tokens Cached',
+
+  // --- Resource usage: shared metrics & units ---
+  'usage.metric.tokens': 'Token',
+  'usage.metric.input': 'Girdi',
+  'usage.metric.output': 'Çıktı',
+  'usage.metric.gpuHours': 'GPU Saati',
+  'usage.metric.instanceHours': 'Örnek Saati',
+  'usage.metric.gbDays': 'GB-Gün',
+  'usage.metric.gbHours': 'GB-Saat',
+  'usage.metric.activeUsers': 'Aktif Kullanıcılar',
+  'usage.metric.activeInstances': 'Aktif Örnekler',
+  'usage.metric.activeStorage': 'Aktif Depolama',
+  'usage.metric.activeVolumes': 'Aktif Birimler',
+  'usage.metric.storageTypes': 'Depolama Türleri',
+  'usage.metric.gpuHours.tip':
+    'Örnek çalışma süresinin GPU sayısına göre ağırlıklandırılmış hali: N GPU kullanan bir örnek H saat çalıştığında N × H GPU-saat olarak sayılır. Her örnek tek bir GPU kullandığında Örnek Saati ile eşittir.',
+  'usage.metric.instanceHours.tip':
+    'Her örneğin kullandığı GPU sayısından bağımsız olarak tüm örneklerin toplam çalışma süresi. 2 saat çalışan bir örnek = 2 örnek-saat.',
+  'usage.metric.gbDays.tip':
+    'Depolama kapasitesinin zamana göre integrali, GB × gün cinsinden: 5 gün boyunca tutulan 10 GB = 50 GB-gün. (= GB-Saat ÷ 24)',
+  'usage.metric.gbHours.tip':
+    'Depolama kapasitesinin zamana göre integrali, GB × saat cinsinden: 5 saat boyunca tutulan 10 GB = 50 GB-saat.',
+
+  // --- Resource usage: common table / labels ---
+  'usage.common.noData': 'Veri yok',
+  'usage.common.unknown': 'bilinmiyor',
+  'usage.table.date': 'Tarih',
+  'usage.table.name': 'Ad',
+  'usage.table.user': 'Kullanıcı',
+  'usage.table.users': 'Kullanıcılar',
+  'usage.table.type': 'Tür',
+  'usage.table.instance': 'Örnek',
+  'usage.table.instanceType': 'Örnek Türü',
+  'usage.table.instanceTypes': 'Örnek Türleri',
+  'usage.table.instances': 'Örnekler',
+  'usage.table.capacity': 'Kapasite',
+  'usage.export.tableNamed': 'Tablo Verilerini Dışa Aktar — {name}',
+
+  // --- Summary tab ---
+  'usage.summary.compute': 'Hesaplama',
+  'usage.summary.tokensOverTime': 'Zaman içinde Token',
+  'usage.summary.gpuHoursOverTime': 'Zaman içinde GPU Saati',
+  'usage.summary.gbDaysOverTime': 'Zaman içinde GB-Gün',
+
+  // --- GPU Instances / Storage filters ---
+  'usage.filter.instance': 'Örneğe göre filtrele',
+  'usage.filter.storage': 'Depolamaya göre filtrele',
+
+  // --- Resource events ---
+  'usage.events.resourceType': 'Kaynak türü',
+  'usage.events.eventType': 'Olay türü',
+  'usage.events.resourceName': 'Ada göre filtrele',
+  'usage.events.col.time': 'Zaman',
+  'usage.events.col.resource': 'Kaynak',
+  'usage.events.col.event': 'Olay',
+  'usage.events.col.message': 'Mesaj',
+  'usage.events.resource.gpuInstance': 'GPU Örneği',
+  'usage.events.resource.cpuInstance': 'CPU Örneği',
+  'usage.events.type.created': 'Oluşturuldu',
+  'usage.events.type.deleted': 'Silindi',
+  'usage.events.type.started': 'Başlatıldı',
+  'usage.events.type.stopped': 'Durduruldu',
+  'usage.events.type.updated': 'Güncellendi',
+  'usage.events.type.attached': 'Eklendi',
+  'usage.events.type.detached': 'Ayrıldı'
 };

src/locales/tr-TR/vendor.ts

@@ -4,7 +4,7 @@ export default {
   'vendor.hygon': 'Hygon',
   'vendor.moorthreads': 'Moore Threads',
   'vendor.iluvatar': 'Iluvatar',
-  'vendor.metax': 'Metax',
+  'vendor.metax': 'MetaX',
   'vendor.cambricon': 'Cambricon',
   'vendor.thead': 'T-Head PPU'
 };

src/locales/zh-CN/apikeys.ts

@@ -22,5 +22,7 @@ export default {
   'apikeys.accessScope.inference': '推理接口',
   'apikeys.access.permissions': '访问权限',
   'apikeys.type.auto': '自动生成',
-  'apikeys.type.custom': '自定义'
+  'apikeys.type.custom': '自定义',
+  'apikeys.button.ipConfig': 'IP 访问控制',
+  'quotaLimits.button.title': '配额限制'
 };

src/locales/zh-CN/backends.ts

@@ -23,11 +23,12 @@ export default {
   'backend.form.defaultExecuteCommand': '默认执行命令',
   'backend.form.defaultExecuteCommand.tips': `'{{'model_path'}}'、'{{'port'}}'、'{{'worker_ip'}}' 和 '{{'model_name'}}' 都是占位符，在部署过程中会被替换为实际的值。`,
   'backend.form.defaultBackendParameters': '默认后端参数',
-  'backend.form.parameterFormat': '参数输出格式',
-  'backend.form.parameterFormat.default': '后端默认',
-  'backend.form.parameterFormat.space': '空格分隔 (--key value)',
-  'backend.form.parameterFormat.equal': '等号连接 (--key=value)',
-  'backend.form.commonParameters': '常用参数',
+  'backend.form.flagFormat': '参数格式',
+  'backend.form.flagFormat.tips':
+    '选项名与取值之间使用的连接格式。留空则保留每个参数原本的写法，不做统一转换。',
+  'backend.form.flagFormat.space': '空格分隔 (--key value)',
+  'backend.form.flagFormat.equal': '等号连接 (--key=value)',
+  'backend.form.commonParameters': '常用后端参数',
   'backend.form.commonParameters.tips': '部署模型时作为后端参数候选项展示。',
   'backend.form.versionConfig': '版本配置',
   'backend.form.addParameter': '添加参数',

src/locales/zh-CN/benchmark.ts

@@ -37,8 +37,8 @@ export default {
     '长上下文压力测试。评估 KV Cache 行为、内存占用及后端稳定性。',
   'benchmark.form.profile.heavy.tips':
     '以解码为主的生成测试。衡量持续解码速度与输出 Token 吞吐能力。',
-  'benchmark.table.filter.bygpu': '按 GPU 过滤',
-  'benchmark.table.filter.bymodel': '按模型过滤',
+  'benchmark.table.filter.bygpu': 'GPU 查询',
+  'benchmark.table.filter.bymodel': '模型查询',
   'benchmark.table.filter.bydataset': '按数据集过滤',
   'benchmark.table.filter.byProfile': '按模式过滤',
   'benchmark.table.avg': '均值',

src/locales/zh-CN/billing.ts

@@ -0,0 +1,11 @@
+export default {
+  'billing.upsell.title': '计费是企业版功能',
+  'billing.upsell.subtitle':
+    '在团队间跟踪花费、生成账单并执行预算。升级到 GPUStack 企业版即可管理计费。',
+  'billing.upsell.featuresTitle': '企业版包含的能力',
+  'billing.upsell.feature.usage': '按组织、用户与模型查看成本明细',
+  'billing.upsell.feature.invoices': '生成账单并导出计费报表',
+  'billing.upsell.feature.budgets': '设置预算与花费上限并触发告警',
+  'billing.upsell.feature.chargeback': '将用量归属并分摊到团队与项目',
+  'billing.upsell.cta': '了解企业版'
+};

src/locales/zh-CN/clusters.ts

@@ -38,7 +38,7 @@ export default {
   'clusters.create.noRegions': '无可用的区域',
   'clusters.workerpool.batchSize.desc': '节点池中同时创建的节点数量。',
   'clusters.create.addworker.tips':
-    '在执行以下命令之前，请确保已满足 {label} 的<a href={link} target="_blank">先决条件</a>。',
+    '在执行以下命令之前，请确保已满足<a href={link} target="_blank">先决条件</a>。',
   'clusters.create.addCommand.tips':
     '在需要添加的节点上运行以下命令，将其加入到集群中。',
   'clusters.create.addCommand.k8s.tips':
@@ -68,10 +68,13 @@ export default {
     '<span class="bold-text">非 Docker</span> 集群请前往集群页面注册集群或管理节点池。',
   'clusters.addworker.selectGPU': '选择 GPU 厂商',
   'clusters.addworker.selectGPU.multiTag': '可多选',
-  'clusters.addworker.selectGPU.singleOnly':
-    '当前所选厂商未在集群的 GPU 厂商覆盖（override node selector）中配置，仅支持单选。如需多选，请先选择 override 中已配置的厂商。',
+  'clusters.addworker.selectGPU.subtitle':
+    '可选择多个 GPU 厂商，或不选择以用于仅 CPU 的集群',
   'clusters.addworker.checkEnv': '检查环境',
+  'clusters.addworker.checkEnv.cpuOnlyTips':
+    '使用以下命令验证 Kubernetes 集群中至少有一个就绪节点。你正在注册仅 CPU 的集群。',
   'clusters.addworker.specifyArgs': '指定参数',
+  'clusters.addworker.dtkVersion': 'DTK 版本',
   'clusters.addworker.runCommand': '运行指令',
   'clusters.addworker.specifyWorkerIP': '节点 IP',
   'clusters.addworker.detectWorkerIP': '自动检测节点 IP',
@@ -110,6 +113,8 @@ export default {
     '已将 {count} 个新节点添加到集群中。',
   'clusters.create.serverUrl': 'GPUStack Server 节点地址',
   'clusters.create.workerConfig': '节点配置',
+  'clusters.edit.k8sOptions.changed.tip':
+    '您已修改 Kubernetes 选项，需要在目标集群上重新运行注册命令才会生效。',
   'clusters.addworker.containerName': '节点容器名称',
   'clusters.addworker.containerName.tips': '为节点容器指定一个名称。',
   'clusters.addworker.dataVolume': 'GPUStack 数据卷',
@@ -157,6 +162,10 @@ export default {
   'clusters.volume.configMap.name': '配置名称',
   'clusters.volume.configMap.optional': '可选',
   'clusters.volume.add': '添加卷挂载',
+  'clusters.systemDefaultContainerRegistry.title': '默认容器镜像仓库',
+  'clusters.systemDefaultContainerRegistry.tip':
+    '用于解析该集群 GPUStack 镜像的默认镜像仓库。未设置时回退到服务端默认值。',
+  'clusters.k8sOptions.title': 'Kubernetes 部署选项',
   'clusters.imageCredentials.title': '镜像仓库凭证',
   'clusters.imageCredentials.add': '添加凭证',
   'clusters.imageCredentials.registry': '镜像仓库地址',
@@ -165,16 +174,20 @@ export default {
   'clusters.nodeSelector.title': '节点选择器',
   'clusters.nodeSelector.tip':
     '应用到每个 worker DaemonSet 的 Pod nodeSelector，只有标签匹配的节点才会被调度运行 worker。',
-  'clusters.gpuVendorOverrides.title': 'GPU 厂商覆盖配置',
-  'clusters.gpuVendorOverrides.validate.emptySelector':
-    '{vendor} 的覆盖配置至少需要一项 nodeSelector —— 空覆盖会让多 vendor manifest 无法定位该 runtime 的节点。',
-  'clusters.gpuVendorOverrides.validate.duplicate':
-    '{v1} 与 {v2} 的覆盖配置使用了完全相同的 nodeSelector。每个 vendor 必须对应不同的节点集，否则它们的 worker DaemonSet 会相互争抢同一批节点。',
-  'clusters.gpuVendorOverrides.validate.keyConflict':
-    '{vendor} 的覆盖配置重用了基础节点选择器中已有的 key（{keys}）—— 这会让 CPU worker 同时"要求"和"禁止"这些 key，永远无法被调度。',
-  'clusters.gpuVendorOverrides.tip':
-    '集群中存在多个 GPU 厂商时必填。每项的 nodeSelector 将该厂商的 worker DaemonSet 固定到匹配的节点，同时 CPU worker 通过 DoesNotExist 节点亲和性避开这些节点。',
-  'clusters.gpuVendorOverrides.add': '添加覆盖配置',
-  'clusters.gpuVendorOverrides.vendor': 'GPU 厂商',
-  'clusters.gpuVendorOverrides.nodeSelector': '节点选择器'
+  'clusters.operatorImage.title': 'Operator 镜像',
+  'clusters.operatorImage.tip':
+    'GPUStack Operator 容器镜像的覆盖值。留空则使用服务端默认值。',
+  'clusters.namespace.title': '命名空间',
+  'clusters.namespace.tip':
+    '集群清单渲染所使用的 Kubernetes 命名空间。留空则使用 gpustack-system。',
+  'clusters.clusterType.title': '集群类型',
+  'clusters.modelService.title': '模型服务',
+  'clusters.modelService.tip':
+    '适用于大模型推理与 API 服务化场景，例如对外提供模型 API 与 Token 服务能力。',
+  'clusters.gpuInstances.title': 'GPU 服务',
+  'clusters.gpuInstances.tip':
+    '适用于按需分配 GPU 计算资源的场景，例如交互式开发、训练任务或自定义运行环境。',
+  'clusters.gpuInstances.staticAddress': 'GPU 服务静态访问地址',
+  'clusters.gpuInstances.staticAddress.tip':
+    'Operator 访问该集群 GPU 实例所使用的静态地址（例如 LoadBalancer VIP）。可选。'
 };

src/locales/zh-CN/common.ts

@@ -44,6 +44,7 @@ export default {
   'common.button.rollback': '回滚',
   'common.button.new': '新建{ text }',
   'common.button.upgrade': '升级',
+  'common.enterprise.feature': 'GPUStack 企业版可用',
   'common.input.holder': '请输入',
   'common.holder.search': '搜索',
   'common.button.edit': '编辑',
@@ -51,8 +52,8 @@ export default {
   'common.button.confirm': '确定',
   'common.button.viewlog': '查看日志',
   'common.button.viewevent': '查看事件',
-  'common.button.recreate': '重新创建',
   'common.table.operation': '操作',
+  'common.table.creator': '创建者',
   'common.table.createTime': '创建时间',
   'common.table.updateTime': '更新时间',
   'common.table.description': '描述',
@@ -160,6 +161,7 @@ export default {
   'common.time.hour': '小时',
   'common.time.minute': '分钟',
   'common.issue.report': '问题反馈',
+  'common.github.star.tooltip': '在 GitHub 上 Star 我们',
   'common.social.discord': '加入我们的Discord',
   'common.table.mark': '备注',
   'common.table.rollback.mark': '回滚备注',
@@ -233,6 +235,7 @@ export default {
   'common.text.tips': '提示',
   'settings.system': '系统设置',
   'common.filter.byId': '按 ID 查询',
+  'common.filter.byCreator': '按创建者筛选',
   'common.appearance': '外观',
   'common.appearance.dark': '深色',
   'common.appearance.light': '浅色',
@@ -251,6 +254,10 @@ export default {
   'common.login.auth': '认证中...',
   'common.login.auth.failed': '认证失败',
   'common.login.password': '使用密码登录',
+  'common.login.username.holder': '请输入用户名',
+  'common.login.password.holder': '请输入密码',
+  'common.login.newpassword.holder': '请输入新密码',
+  'common.login.confirm.holder': '请再次输入密码',
   'common.external.login': '使用 {type} 登录',
   'common.sso.noConfig': '该系统未启用单点登录，请联系管理员。',
   'common.button.edit.item': '编辑 {name}',
@@ -258,7 +265,7 @@ export default {
   'common.button.terminal': '终端',
   'common.button.addItem': '添加项',
   'common.help.default': '默认: {content}',
-  'common.filter.status': '按状态筛选',
+  'common.filter.status': '按状态过滤',
   'common.form.rule.selectInput': '请选择或输入{name}',
   'common.tag.experimental': '实验性',
   'common.title.example': '示例',
@@ -278,5 +285,7 @@ export default {
   'common.image.limit.height': '图片高度须为{height}。',
   'common.remaining': '剩余 {count}',
   'common.max': '最大 {count}',
-  'common.validate.group': '请填写完整的{group}配置'
+  'common.max.count': '{label} 数量',
+  'common.validate.group': '请填写完整的{group}配置',
+  'common.preferences': '偏好设置'
 };

src/locales/zh-CN/dashboard.ts

@@ -2,7 +2,7 @@ export default {
   'dashboard.workers': '节点',
   'dashboard.deployments': '部署',
   'dashboard.clusters': '集群',
-  'dashboard.totalgpus': 'GPUs',
+  'dashboard.totalgpus': 'GPU',
   'dashboard.systemload': '系统负载',
   'dashboard.memory': '内存',
   'dashboard.vram': '显存',

src/locales/zh-CN/gpuservice.ts

@@ -13,10 +13,13 @@ export default {
   'gpuservice.template.command.placeholder':
     '使用空格分隔参数；含空格的参数请用引号包裹，例如：/bin/bash -c "echo hello world"',
   'gpuservice.template.mountPath': '挂载路径',
-  'gpuservice.template.containerDisk': '容器磁盘(GB)',
-  'gpuservice.template.memory': '内存(GB)',
-  'gpuservice.instance.containerDisk.remaining': '容器磁盘(最大{count}GB)',
-  'gpuservice.instance.memory.remaining': '内存(最大{count}GB)',
+  'gpuservice.template.mountPath.tips':
+    '在使用该模板创建实例时，存储卷默认挂载的路径，可用于持久化实例运行过程中需要保留的数据。',
+  'gpuservice.template.containerDisk': '容器磁盘（GB）',
+  'gpuservice.template.containerDisk.tips': '容器系统盘大小。',
+  'gpuservice.template.memory': '内存（GB）',
+  'gpuservice.instance.containerDisk.remaining': '容器磁盘（最大 {count} GB）',
+  'gpuservice.instance.memory.remaining': '内存（最大 {count} GB）',
   'gpuservice.template.displayName': '显示名称',
   'gpuservice.template.displayName.max': '显示名称不能超过 63 个字符',
   'gpuservice.template.ports': '端口',
@@ -92,10 +95,13 @@ export default {
   'gpuservice.instance.templates': '实例模板',
   'gpuservice.instance.section.storage': '存储卷',
   'gpuservice.instance.type.required': '请选择实例类型',
+  'gpuservice.instance.type.noAvailable': '无可用的实例类型',
   'gpuservice.instance.gpuCount': 'GPU 数量',
   'gpuservice.instance.gpuCount.required': '请输入 GPU 数量',
   'gpuservice.instance.gpuCount.max': '最多选择 {count} 张卡',
   'gpuservice.instance.gpuCount.min': '至少选择 {count} 张卡',
+  'gpuservice.instance.cpuCount.max': '最多选择 {count} 核',
+  'gpuservice.instance.cpuCount.min': '至少选择 {count} 核',
   'gpuservice.instance.gpuCount.noAvailable':
     '没有可用的 GPU 资源，请选择其他实例类型。',
   'gpuservice.instance.gpuCount.zero': '仅使用 CPU，用于环境准备。',
@@ -103,7 +109,13 @@ export default {
   'gpuservice.instance.sliced': '切分',
   'gpuservice.instance.memory': '显存',
   'gpuservice.instance.ram': '内存',
+  'gpuservice.instance.os': '系统',
+  'gpuservice.instance.arch': '架构',
   'gpuservice.instance.disk': '磁盘',
+  'gpuservice.table.count': '数量',
+  'gpuservice.instance.disk.system': '系统盘',
+  'gpuservice.instance.disk.ephemeral': '临时存储',
+  'gpuservice.instance.disk.persistent': '持久存储',
   'gpuservice.instance.search.type.placeholder': '搜索名称',
   'gpuservice.instance.search.template.placeholder':
     '搜索模板名称、镜像或挂载路径',
@@ -134,16 +146,21 @@ export default {
   'gpuservice.storage.accessMode': '访问模式',
   'gpuservice.storage.persistent': '持久',
   'gpuservice.storage.temporary': '临时',
-  'gpuservice.storage.persistentVolume': '持久卷',
+  'gpuservice.storage.persistentVolume': '持久',
   'gpuservice.storage.temporary.tips': '实例停止后，数据将被清除。',
   'gpuservice.storage.persistentVolume.tips':
-    '数据在实例重启后仍会保留，仅在实例被终止时删除。无法被其它实例共享。',
-  'gpuservice.storage.persistentVolume.required': '请选择持久卷',
+    '数据在实例重启后仍会保留。持久卷不会随实例终止而删除，并可被多个实例共享。',
+  'gpuservice.storage.persistentVolume.required': '请选择存储',
   'gpuservice.storage.persistentVolume.capacity': '容量（GB）',
   'gpuservice.storage.persistentVolume.capacity.required': '请输入容量',
   'gpuservice.storage.persistentVolume.releaseWithInstance': '随实例释放',
   'gpuservice.storage.tempCapacity': '容量（GB）',
   'gpuservice.storage.tempCapacity.required': '请输入临时存储容量',
   'gpuservice.form.rule.name':
-    '由小写字母、数字和 "-" 组成，以字母或数字开头和结尾，不能包含连续的 "-"，最多 63 个字符。'
+    '由小写字母、数字和 "-" 组成，以字母或数字开头和结尾，不能包含连续的 "-"，最多 63 个字符。',
+  'gpuservice.form.storage.select': '选择存储',
+  'gpuservice.creator': '创建者',
+  'gpuservice.owner.global': '全局',
+  'gpuservice.template.group.yours': '我的模板',
+  'gpuservice.template.group.global': '全局模板'
 };

src/locales/zh-CN/menu.ts

@@ -8,7 +8,7 @@ export default {
   'menu.playground.text2images': '图像',
   'menu.playground.video': '视频',
   'menu.compare': '多模型对比',
-  'menu.models': '模型',
+  'menu.models': '模型服务',
   'menu.models.modelList': '部署与管理',
   'menu.models.modelCatalog': '模型库',
   'menu.models.deployment': '部署',
@@ -25,22 +25,26 @@ export default {
   'menu.resources': '资源',
   'menu.apikeys': 'API 密钥',
   'menu.users': '用户',
-  'menu.profile': '个人信息',
+  'menu.profile': '偏好',
   'menu.login': '登录',
   'menu.usage': '使用量',
+  'menu.usage.usage': '使用量',
+  'menu.billingAndUsage': '用量与计费',
+  'menu.billingAndUsage.usage': '用量统计',
+  'menu.billingAndUsage.billing': '计费',
   'menu.404': '404',
   'menu.resources.workers': '节点',
-  'menu.resources.gpus': 'GPUs',
-  'menu.resources.modelfiles': '模型文件',
+  'menu.resources.gpus': 'GPU',
+  'menu.models.modelfiles': '模型文件',
   'menu.accessControl': '访问控制',
   'menu.accessControl.apikeys': 'API 密钥',
   'menu.accessControl.users': '用户',
-  'menu.clusterManagement': '集群管理',
-  'menu.clusterManagement.clusters': '集群',
-  'menu.clusterManagement.credentials': '云凭证',
-  'menu.clusterManagement.clusterDetail': '集群详情',
-  'menu.clusterManagement.clusterCreate': '创建集群',
-  'menu.resources.backendsList': '推理后端',
+  'menu.accessControl.organizations': '组织',
+  'menu.resources.clusters': '集群',
+  'menu.resources.credentials': '云凭证',
+  'menu.resources.clusterDetail': '集群详情',
+  'menu.resources.clusterCreate': '创建集群',
+  'menu.models.backendsList': '推理后端',
   'menu.gpuService': 'GPU 服务',
   'menu.gpuService.instances': 'GPU 实例',
   'menu.gpuService.templates': '实例模板',

src/locales/zh-CN/models.ts

@@ -99,7 +99,7 @@ export default {
   'models.form.search.gguftips':
     '当 macOS 或 Windows 作节点时勾选 GGUF（搜索语音模型时取消勾选）',
   'models.form.button.addlabel': '添加标签',
-  'models.filter.category': '按类别筛选',
+  'models.filter.category': '按类别过滤',
   'models.list.more.logs': '查看更多',
   'models.catalog.release.date': '发布日期',
   'models.localpath.gguf.tips.title': 'GGUF 格式模型',

src/locales/zh-CN/no-result.ts

@@ -35,8 +35,11 @@ export default {
   'noresult.catalog.subTitle': '尚未配置任何模型。',
   'noresult.catalog.nofound': '未找到匹配的模型',
   'noresult.resources.cluster': '暂无可用集群，请添加集群以开始使用。',
+  'noresult.resources.k8sCluster':
+    '暂无可用集群，请添加 Kubernetes 集群以开始使用。',
   'noresult.resources.worker': '暂无可用节点，请添加节点以开始使用。',
   'noresult.resources.gotocluster': '创建您的第一个集群',
+  'noresult.resources.addk8scluster': '添加 Kubernetes 集群',
   'noresult.resources.gotoworker': '添加节点',
   'noresult.benchmark.title': '暂无基准测试',
   'noresult.benchmark.subTitle': '尚未添加任何基准测试。',

src/locales/zh-CN/organizations.ts

@@ -0,0 +1,12 @@
+export default {
+  'organizations.upsell.title': '组织是企业版功能',
+  'organizations.upsell.subtitle':
+    '多租户可在团队间隔离用户、资源与配额。升级到 GPUStack 企业版即可管理组织。',
+  'organizations.upsell.featuresTitle': '企业版包含的能力',
+  'organizations.upsell.feature.orgs': '创建组织来分组用户并隔离工作负载',
+  'organizations.upsell.feature.members': '为每个组织管理成员与角色',
+  'organizations.upsell.feature.quotas': '为每个组织设置资源与 Token 配额',
+  'organizations.upsell.feature.isolation':
+    '按组织隔离 API 密钥、模型部署与资源',
+  'organizations.upsell.cta': '了解企业版'
+};

src/locales/zh-CN/usage.ts

@@ -17,9 +17,15 @@ export default {
   'usage.table.user.apiKeysUsed': '使用的 API 密钥',
   'usage.table.lastActive': '最后活跃时间',
   'usage.filter.granularity': '粒度',
+  'usage.filter.granularity.hour': '按小时',
   'usage.filter.granularity.day': '按天',
   'usage.filter.granularity.week': '按周',
   'usage.filter.granularity.month': '按月',
+  'usage.tabs.summary': '总览',
+  'usage.tabs.tokens': 'Token',
+  'usage.tabs.gpuInstances': 'GPU 实例',
+  'usage.tabs.storage': '存储',
+  'usage.tabs.resourceEvents': '资源事件',
   'usage.tabs.models': '模型',
   'usage.tabs.apikeys': 'API 密钥',
   'usage.tabs.users': '用户',
@@ -32,5 +38,70 @@ export default {
   'usage.chart.cached': '缓存',
   'usage.chart.uncached': '非缓存',
   'usage.chart.inputTokensCached': '输入 Token 数（缓存/非缓存）',
-  'usage.table.inputTokensCached': '输入 Token 缓存数'
+  'usage.table.inputTokensCached': '输入 Token 缓存数',
+
+  // --- Resource usage: shared metrics & units ---
+  'usage.metric.tokens': 'Token 数',
+  'usage.metric.input': '输入',
+  'usage.metric.output': '输出',
+  'usage.metric.gpuHours': 'GPU 小时',
+  'usage.metric.instanceHours': '实例小时',
+  'usage.metric.gbDays': 'GB·天',
+  'usage.metric.gbHours': 'GB·小时',
+  'usage.metric.activeUsers': '活跃用户',
+  'usage.metric.activeInstances': '活跃实例',
+  'usage.metric.activeStorage': '活跃存储',
+  'usage.metric.activeVolumes': '活跃存储卷',
+  'usage.metric.storageTypes': '存储类型',
+  'usage.metric.gpuHours.tip':
+    '实例运行时长按 GPU 数量加权：一个使用 N 个 GPU 的实例运行 H 小时记为 N × H GPU 小时。当每个实例仅使用单个 GPU 时，等于实例小时。',
+  'usage.metric.instanceHours.tip':
+    '所有实例运行时长的总和，与每个实例使用的 GPU 数量无关。一个实例运行 2 小时 = 2 实例小时。',
+  'usage.metric.gbDays.tip':
+    '存储容量随时间的积分，单位为 GB × 天：10 GB 保留 5 天 = 50 GB·天。（= GB·小时 ÷ 24）',
+  'usage.metric.gbHours.tip':
+    '存储容量随时间的积分，单位为 GB × 小时：10 GB 保留 5 小时 = 50 GB·小时。',
+
+  // --- Resource usage: common table / labels ---
+  'usage.common.noData': '暂无数据',
+  'usage.common.unknown': '未知',
+  'usage.table.date': '日期',
+  'usage.table.name': '名称',
+  'usage.table.user': '用户',
+  'usage.table.users': '用户',
+  'usage.table.type': '类型',
+  'usage.table.instance': '实例',
+  'usage.table.instanceType': '实例类型',
+  'usage.table.instanceTypes': '实例类型',
+  'usage.table.instances': '实例',
+  'usage.table.capacity': '容量',
+  'usage.export.tableNamed': '导出表格数据 — {name}',
+
+  // --- Summary tab ---
+  'usage.summary.compute': '算力',
+  'usage.summary.tokensOverTime': 'Token 数趋势',
+  'usage.summary.gpuHoursOverTime': 'GPU 小时趋势',
+  'usage.summary.gbDaysOverTime': 'GB·天趋势',
+
+  // --- GPU Instances / Storage filters ---
+  'usage.filter.instance': '按实例查询',
+  'usage.filter.storage': '按存储查询',
+
+  // --- Resource events ---
+  'usage.events.resourceType': '资源类型',
+  'usage.events.eventType': '事件类型',
+  'usage.events.resourceName': '按名称筛选',
+  'usage.events.col.time': '时间',
+  'usage.events.col.resource': '资源',
+  'usage.events.col.event': '事件',
+  'usage.events.col.message': '消息',
+  'usage.events.resource.gpuInstance': 'GPU 实例',
+  'usage.events.resource.cpuInstance': 'CPU 实例',
+  'usage.events.type.created': '已创建',
+  'usage.events.type.deleted': '已删除',
+  'usage.events.type.started': '已启动',
+  'usage.events.type.stopped': '已停止',
+  'usage.events.type.updated': '已更新',
+  'usage.events.type.attached': '已挂载',
+  'usage.events.type.detached': '已卸载'
 };