diff --git a/scripts/i18n-guard.js b/scripts/i18n-guard.js
index 99632b5908c0..46b187e82466 100644
--- a/scripts/i18n-guard.js
+++ b/scripts/i18n-guard.js
@@ -11,10 +11,11 @@
 //    consistency: selectors, match keys, and placeholders must resolve to
 //    declared inputs or locals.
 //
-// 2. Hardcoded-string heuristic (warning by default). Scans `.svelte` markup
-//    (not <script>/<style>) in already-migrated areas for visible text nodes
-//    and a fixed set of human-facing attributes. Intentionally a lightweight,
-//    dependency-free heuristic, not a parser: it runs at WARNING level
+// 2. Hardcoded-string heuristic (warning by default). Scans explicitly
+//    migrated Svelte markup and source files that import the paraglide messages.
+//    It checks visible text nodes, human-facing attributes, and common copy-
+//    bearing object properties. Intentionally a lightweight, dependency-free
+//    heuristic, not a parser: it runs at WARNING level
 //    (exit 0) by default so occasional false positives are tolerable. Pass
 //    `--strict` to make findings fatal (exit 1) — the final i18n migration
 //    chunk flips the quality pipeline to strict once every listed area is
@@ -214,21 +215,46 @@ if (catalogErrors.length === 0) {
 // Hardcoded-string heuristic
 // ---------------------------------------------------------------------------
 
-// Directories whose strings have been migrated to paraglide. Each migration
-// chunk appends its directories here; the guard only polices these areas so
-// unmigrated code does not drown the signal.
+// Areas whose strings have been migrated even when individual leaf components
+// do not need to import the message namespace themselves.
 const MIGRATED_GLOBS = [
-  // web-admin organization overview page. Literal `[organization]` brackets are
-  // a glob character class, so match the segment with a wildcard.
+  // Literal `[organization]` brackets are a glob character class, so match the
+  // route segment with a wildcard.
   "web-admin/src/routes/*organization*/+page.svelte",
   "web-common/src/features/chat/core/messages/file-diff/*.svelte",
   "web-common/src/features/exports/pdf/*.svelte",
   "web-common/src/features/project/changes/*.svelte",
 ];
 
+// Also treat a source file as migrated as soon as it imports the paraglide
+// message namespace. This keeps coverage in sync with migration work and
+// catches partially migrated code without scanning wholly unmigrated areas.
+const SOURCE_GLOBS = [
+  "web-admin/src/**/*.svelte",
+  "web-admin/src/**/*.ts",
+  "web-admin/src/**/*.js",
+  "web-common/src/**/*.svelte",
+  "web-common/src/**/*.ts",
+  "web-common/src/**/*.js",
+  "web-local/src/**/*.svelte",
+  "web-local/src/**/*.ts",
+  "web-local/src/**/*.js",
+];
+const MESSAGES_IMPORT = "@rilldata/web-common/lib/i18n/gen/messages";
+
 // Human-facing attributes worth translating. Attributes like `class`, `id`,
 // `href`, `name`, etc. are deliberately excluded.
 const TEXT_ATTRS = ["placeholder", "title", "aria-label", "alt", "label"];
+const COPY_PROPERTIES = [
+  "label",
+  "title",
+  "description",
+  "message",
+  "tooltip",
+  "placeholder",
+  "ariaLabel",
+  "alt",
+];
 
 function stripBlocks(src) {
   // Replace <script> and <style> bodies with blank lines so line numbers and
@@ -239,6 +265,56 @@ function stripBlocks(src) {
   );
 }
 
+function stripMustacheBlocks(src) {
+  const chars = [...src];
+
+  for (let start = 0; start < chars.length; start++) {
+    if (chars[start] !== "{") continue;
+
+    let depth = 0;
+    let quote = null;
+    let escaped = false;
+    let end = start;
+    for (; end < chars.length; end++) {
+      const ch = chars[end];
+      if (quote) {
+        if (escaped) {
+          escaped = false;
+        } else if (ch === "\\") {
+          escaped = true;
+        } else if (ch === quote) {
+          quote = null;
+        }
+        continue;
+      }
+      if (ch === '"' || ch === "'" || ch === "`") {
+        quote = ch;
+      } else if (ch === "{") {
+        depth++;
+      } else if (ch === "}" && --depth === 0) {
+        break;
+      }
+    }
+
+    // An unmatched brace is more likely to be literal copy than a Svelte
+    // expression, so leave it for the heuristic to report.
+    if (depth !== 0) continue;
+    const isDirective = /[#:/@]/.test(chars[start + 1] ?? "");
+    for (let i = start; i <= end; i++) {
+      if (chars[i] !== "\n") chars[i] = " ";
+    }
+    // Keep Svelte control/special directives as tag-like boundaries so text
+    // from separate branches is reported and suppressible independently.
+    if (isDirective) {
+      chars[start] = "<";
+      chars[end] = ">";
+    }
+    start = end;
+  }
+
+  return chars.join("");
+}
+
 function lineOf(src, index) {
   return src.slice(0, index).split("\n").length;
 }
@@ -257,36 +333,73 @@ function looksLikeCopy(raw) {
   const text = raw.replace(/\{[^}]*\}/g, "").trim();
   if (!text) return false;
   if (!/[A-Za-z]{2,}/.test(text)) return false; // needs at least one real word
-  if (/^[a-z0-9_\-./:]+$/.test(text)) return false; // identifier / url / path
+  if (/^(?:https?:\/\/|\/)/i.test(text)) return false; // URL / absolute path
+  if (/^[a-z0-9]+(?:[_./:-][a-z0-9]+)+$/.test(text)) return false; // identifier
   if (/^[A-Z0-9_]+$/.test(text)) return false; // CONSTANT_CASE
   return true;
 }
 
-const findings = [];
+function displayCopy(raw) {
+  return raw.replace(/\s+/g, " ").trim();
+}
 
-for (const pattern of MIGRATED_GLOBS) {
-  for (const file of globSync(pattern)) {
-    const original = readFileSync(file, "utf8");
+const findings = [];
+const importedFiles = SOURCE_GLOBS.flatMap((pattern) => globSync(pattern)).filter(
+  (file) => readFileSync(file, "utf8").includes(MESSAGES_IMPORT),
+);
+const migratedFiles = [
+  ...new Set([
+    ...MIGRATED_GLOBS.flatMap((pattern) => globSync(pattern)),
+    ...importedFiles,
+  ]),
+].sort();
+
+for (const file of migratedFiles) {
+  const original = readFileSync(file, "utf8");
+  const rel = relative(process.cwd(), file);
+
+  if (file.endsWith(".svelte")) {
     const src = stripBlocks(original);
-    const rel = relative(process.cwd(), file);
+    const markup = stripMustacheBlocks(src);
 
     // Visible text nodes: content between a closing `>` and the next `<`.
-    for (const match of src.matchAll(/>([^<>]+)</g)) {
+    for (const match of markup.matchAll(/>([^<>]+)</g)) {
       if (!looksLikeCopy(match[1])) continue;
-      const line = lineOf(src, match.index);
+      const textStart = match[1].search(/\S/);
+      const line = lineOf(markup, match.index + 1 + textStart);
       if (isIgnored(original, line)) continue;
-      findings.push(`${rel}:${line}  text: ${match[1].trim()}`);
+      findings.push(`${rel}:${line}  text: ${displayCopy(match[1])}`);
     }
 
     // Human-facing attributes with a static string value.
-    const attrRe = new RegExp(`\\b(${TEXT_ATTRS.join("|")})="([^"]+)"`, "g");
-    for (const match of src.matchAll(attrRe)) {
-      if (!looksLikeCopy(match[2])) continue;
-      const line = lineOf(src, match.index);
+    const attrRe = new RegExp(
+      `\\b(${TEXT_ATTRS.join("|")})=(?:"([^"]+)"|'([^']+)')`,
+      "g",
+    );
+    for (const match of markup.matchAll(attrRe)) {
+      const value = match[2] ?? match[3];
+      if (!looksLikeCopy(value)) continue;
+      const line = lineOf(markup, match.index);
       if (isIgnored(original, line)) continue;
-      findings.push(`${rel}:${line}  ${match[1]}: ${match[2].trim()}`);
+      findings.push(`${rel}:${line}  ${match[1]}: ${displayCopy(value)}`);
     }
   }
+
+  // Common object properties used for option labels, help copy, toast
+  // messages, and similar UI strings in Svelte script blocks and TS/JS files.
+  const propertyRe = new RegExp(
+    `\\b(${COPY_PROPERTIES.join("|")})\\s*:\\s*(?:"([^"\\n]+)"|'([^'\\n]+)'|\`([^\`\\n]+)\`)`,
+    "g",
+  );
+  for (const match of original.matchAll(propertyRe)) {
+    const value = match[2] ?? match[3] ?? match[4];
+    if (!looksLikeCopy(value)) continue;
+    const line = lineOf(original, match.index);
+    if (isIgnored(original, line)) continue;
+    findings.push(
+      `${rel}:${line}  ${match[1]} property: ${displayCopy(value)}`,
+    );
+  }
 }
 
 if (findings.length === 0) {
diff --git a/scripts/web-test-code-quality.sh b/scripts/web-test-code-quality.sh
index 7b7e55656604..fa715f52a780 100755
--- a/scripts/web-test-code-quality.sh
+++ b/scripts/web-test-code-quality.sh
@@ -87,12 +87,12 @@ fi
 
 echo ""
 echo "== i18n guard: catalog integrity + migrated areas =="
-# Scans the message catalogs and a fixed set of already-migrated areas on the
-# filesystem, so it runs unconditionally rather than under an app filter: the
-# migrated areas span multiple apps and are independent of which files a given
-# PR touched. Catalog integrity errors are exact and fatal; hardcoded-string
-# findings are heuristic and non-fatal for now: the final i18n migration chunk
-# adds --strict to make them fatal too.
+# Scans the message catalogs, explicitly migrated Svelte areas, and source files
+# that import the generated message namespace. It runs unconditionally rather
+# than under an app filter: migrated files span apps and are independent of
+# which files a given PR touched. Catalog integrity errors are exact and fatal;
+# hardcoded-string findings are heuristic and non-fatal for now: the final i18n
+# migration chunk adds --strict to make them fatal too.
 node ./scripts/i18n-guard.js || exit_code=$?
 
 if [[ "$LOCAL" == "true" ]]; then
diff --git a/web-common/src/components/time-series-chart/Chart.svelte b/web-common/src/components/time-series-chart/Chart.svelte
index 99a6da037331..26455e2c3299 100644
--- a/web-common/src/components/time-series-chart/Chart.svelte
+++ b/web-common/src/components/time-series-chart/Chart.svelte
@@ -165,7 +165,7 @@
       DateTime.fromJSDate(date).setZone(selectedTimeZone),
       DateTime.fromJSDate(date)
         .setZone(selectedTimeZone)
-        .plus({ [TIME_GRAIN[timeGrain]?.label || "minute"]: 1 }),
+        .plus({ [TIME_GRAIN[timeGrain]?.unit || "minute"]: 1 }),
     );
 
     hoveredIntervalCache.set(cacheKey, interval);
diff --git a/web-common/src/features/dashboards/time-series/measure-selection/measure-selection.ts b/web-common/src/features/dashboards/time-series/measure-selection/measure-selection.ts
index c3755d858203..50dd59eec203 100644
--- a/web-common/src/features/dashboards/time-series/measure-selection/measure-selection.ts
+++ b/web-common/src/features/dashboards/time-series/measure-selection/measure-selection.ts
@@ -70,7 +70,7 @@ export class MeasureSelection {
     const endJsDate = get(this.end);
     if (!startJsDate) return;
 
-    const grain = TIME_GRAIN[this.timeGrain].label;
+    const grain = TIME_GRAIN[this.timeGrain].unit;
     const start = roundDownToTimeUnit(
       startJsDate,
       grain,
diff --git a/web-common/src/lib/i18n/MIGRATION_AUDIT.md b/web-common/src/lib/i18n/MIGRATION_AUDIT.md
new file mode 100644
index 000000000000..4ac9317cf120
--- /dev/null
+++ b/web-common/src/lib/i18n/MIGRATION_AUDIT.md
@@ -0,0 +1,218 @@
+# i18n Migration Audit
+
+Baseline: 2026-07-27
+
+This document records the remaining hardcoded-string findings discovered by
+`node scripts/i18n-guard.js` and divides them into reviewable migration PRs.
+The guard output is the live source of truth for line-level findings; counts in
+this document are a snapshot and should decrease as PRs land.
+
+## Summary
+
+- Corrected baseline: 270 candidates across 86 files
+- Current after PR 2: 233 candidates across 85 files
+- Current split: 116 candidates in `web-admin` and 117 in `web-common`
+- No candidates in `web-local`
+- Current categories: 126 visible-text findings, 50 attribute findings, and 57
+  copy-property findings
+- Currently, 61 candidates have an exact English-text match in the existing
+  catalog; each still needs a semantic/context check before reusing that key
+- Message catalogs currently pass integrity checks
+
+The original guard reported no hardcoded strings because it covered only four
+explicit path globs. The guard has been expanded to preserve those globs and
+automatically scan Svelte, TypeScript, and JavaScript files that import the
+generated message namespace. It now checks Svelte text and human-facing
+attributes as well as common copy-bearing object properties such as `label`,
+`description`, and `message`.
+
+The corrected baseline also preserves Svelte control directives as text-scan
+boundaries. The initial expanded scan merged literals from adjacent `{#if}` and
+`{:else}` branches into single findings; splitting those branches added 10
+independently actionable findings.
+
+## Migration rules
+
+For each candidate:
+
+1. Reuse an existing message only when meaning and context match, not merely
+   because the English text is identical.
+2. Otherwise add matching English and Spanish messages using the documented key
+   naming convention.
+3. Use named interpolation and Paraglide variants instead of concatenation or
+   manual plural logic.
+4. Add `i18n-ignore` only for genuinely non-translatable values such as a CLI
+   command or standalone product name. Mixed product-name sentences and page
+   titles should generally still be messages.
+5. Clear every guard finding in the PR's assigned paths.
+
+Each migration PR should run:
+
+```sh
+npm run build:i18n
+npm run test -w web-common
+node scripts/i18n-guard.js
+npm run quality
+```
+
+The final PR should additionally require:
+
+```sh
+node scripts/i18n-guard.js --strict
+```
+
+## PR plan
+
+| PR  | Scope                                                      | Baseline candidates | Status                     |
+| --- | ---------------------------------------------------------- | ------------------: | -------------------------- |
+| 1   | Guard coverage improvements                                |                   — | Implemented on this branch |
+| 2   | Time presets and comparisons                               |                  37 | Implemented on this branch |
+| 3   | Canvas components and inspector                            |                  35 | Planned                    |
+| 4   | Workspaces and Visual Metrics                              |                  18 | Planned                    |
+| 5   | Dashboard UI, pivot, filters, and charts                   |                  30 | Planned                    |
+| 6   | Resources, connectors, and models                          |                  16 | Planned                    |
+| 7   | Shared alerts, chat, reports, exports, and components      |                  18 | Planned                    |
+| 8   | Admin project status, GitHub, and user management          |                  29 | Planned                    |
+| 9   | Admin edit sessions and branches                           |                  32 | Planned                    |
+| 10  | Admin organizations, bookmarks, and view-as-user           |                  19 | Planned                    |
+| 11  | Admin alerts, reports, public URLs, and personal files     |                  18 | Planned                    |
+| 12  | Admin routes, page titles, onboarding, and access requests |                  18 | Planned                    |
+| 13  | Final audit, intentional suppressions, and strict mode     |                   — | Planned                    |
+
+PRs 1 and 2 are implemented on this branch. PRs 3–12 can be developed
+independently after it lands, but landing them sequentially reduces conflicts
+in `en.json` and `es.json`. PR 13 should land only after warning mode is clean.
+
+## Finding inventory
+
+### PR 2: Time presets and comparisons (37, completed)
+
+- 37 — `web-common/src/lib/time/config.ts`
+
+### PR 3: Canvas components and inspector (35)
+
+- 4 — `web-common/src/features/canvas/CanvasBuilder.svelte`
+- 3 — `web-common/src/features/canvas/components/kpi/KPI.svelte`
+- 2 — `web-common/src/features/canvas/components/markdown/index.ts`
+- 2 — `web-common/src/features/canvas/components/pivot/index.ts`
+- 2 — `web-common/src/features/canvas/inspector/ComponentTabs.svelte`
+- 2 — `web-common/src/features/canvas/inspector/LabelsInput.svelte`
+- 2 — `web-common/src/features/canvas/inspector/chart/MetricsSQLInput.svelte`
+- 13 — `web-common/src/features/canvas/inspector/chart/field-config/SortConfig.svelte`
+- 3 — `web-common/src/features/canvas/inspector/filters/DimensionFiltersInput.svelte`
+- 2 — `web-common/src/features/canvas/inspector/filters/TimeFiltersInput.svelte`
+
+### PR 4: Workspaces and Visual Metrics (18)
+
+- 1 — `web-common/src/features/workspaces/ParquetWorkspace.svelte`
+- 17 — `web-common/src/features/workspaces/VisualMetrics.svelte`
+
+### PR 5: Dashboard UI, pivot, filters, and charts (30)
+
+- 2 — `web-common/src/features/dashboards/dimension-search/GlobalDimensionSearchResults.svelte`
+- 2 — `web-common/src/features/dashboards/dimension-table/DimensionDisplay.svelte`
+- 1 — `web-common/src/features/dashboards/dimension-table/DimensionTable.svelte`
+- 4 — `web-common/src/features/dashboards/filters/measure-filters/measure-filter-options.ts`
+- 1 — `web-common/src/features/dashboards/leaderboard/Leaderboard.svelte`
+- 1 — `web-common/src/features/dashboards/pivot/PivotAutoArrangeZone.svelte`
+- 1 — `web-common/src/features/dashboards/pivot/PivotChip.svelte`
+- 3 — `web-common/src/features/dashboards/pivot/PivotEmpty.svelte`
+- 4 — `web-common/src/features/dashboards/pivot/PivotSidebar.svelte`
+- 1 — `web-common/src/features/dashboards/pivot/PivotTable.svelte`
+- 2 — `web-common/src/features/dashboards/state-managers/actions/dimension-filters.ts`
+- 2 — `web-common/src/features/dashboards/time-dimension-details/TDDHeader.svelte`
+- 2 — `web-common/src/features/dashboards/time-dimension-details/TimeDimensionDisplay.svelte`
+- 1 — `web-common/src/features/dashboards/time-series/ScreenshotContainer.svelte`
+- 1 — `web-common/src/features/dashboards/time-series/measure-chart/MeasureChartBody.svelte`
+- 2 — `web-common/src/features/dashboards/time-series/measure-chart/MeasureChartHoverTooltip.svelte`
+
+### PR 6: Resources, connectors, and models (16)
+
+- 3 — `web-common/src/features/connectors/explorer/DatabaseExplorer.svelte`
+- 5 — `web-common/src/features/connectors/explorer/DatabaseSchemaEntry.svelte`
+- 2 — `web-common/src/features/models/workspace/ModelWorkspaceCTAs.svelte`
+- 6 — `web-common/src/features/resources/ResourcesFilterableTable.svelte`
+
+### PR 7: Shared interaction surfaces (18)
+
+- 1 — `web-common/src/components/forms/Select.svelte`
+- 1 — `web-common/src/components/searchable-filter-menu/SearchableMenuContent.svelte`
+- 1 — `web-common/src/features/alerts/criteria-tab/AlertPreview.svelte`
+- 1 — `web-common/src/features/alerts/criteria-tab/CriteriaForm.svelte`
+- 1 — `web-common/src/features/alerts/criteria-tab/CriteriaGroup.svelte`
+- 4 — `web-common/src/features/alerts/delivery-tab/snooze.ts`
+- 3 — `web-common/src/features/chat/connect/ConnectClientPopover.svelte`
+- 4 — `web-common/src/features/chat/layouts/fullpage/ConversationSidebar.svelte`
+- 1 — `web-common/src/features/exports/pdf/CanvasPdfExportHeader.svelte`
+- 1 — `web-common/src/features/scheduled-reports/fields/RowsAndColumnsForm.svelte`
+
+### PR 8: Admin projects (29)
+
+- 3 — `web-admin/src/features/projects/ProjectCard.svelte`
+- 1 — `web-admin/src/features/projects/github/GithubConnectionDialog.svelte`
+- 1 — `web-admin/src/features/projects/status/overview/ClusterSize.svelte`
+- 1 — `web-admin/src/features/projects/status/resource-table/ActionsCell.svelte`
+- 5 — `web-admin/src/features/projects/status/resource-table/RefreshAllSourcesAndModelsConfirmDialog.svelte`
+- 2 — `web-admin/src/features/projects/status/resource-table/RefreshResourceConfirmDialog.svelte`
+- 7 — `web-admin/src/features/projects/status/tables/ModelActionsCell.svelte`
+- 1 — `web-admin/src/features/projects/status/tables/ProjectTables.svelte`
+- 3 — `web-admin/src/features/projects/user-management/OrgUserGroupSetRole.svelte`
+- 3 — `web-admin/src/features/projects/user-management/ProjectUserGroupSetRole.svelte`
+- 2 — `web-admin/src/features/projects/user-management/UsergroupSetRole.svelte`
+
+### PR 9: Admin edit sessions and branches (32)
+
+- 1 — `web-admin/src/features/branches/BranchesSection.svelte`
+- 4 — `web-admin/src/features/edit-session/CommitPopover.svelte`
+- 12 — `web-admin/src/features/edit-session/EditBranchDialog.svelte`
+- 1 — `web-admin/src/features/edit-session/ExitButton.svelte`
+- 14 — `web-admin/src/features/edit-session/MergePopover.svelte`
+
+### PR 10: Admin organizations, bookmarks, and view-as-user (19)
+
+- 1 — `web-admin/src/features/bookmarks/Bookmarks.svelte`
+- 1 — `web-admin/src/features/bookmarks/BookmarksMenuItem.svelte`
+- 3 — `web-admin/src/features/bookmarks/HomeBookmarkButton.svelte`
+- 2 — `web-admin/src/features/organizations/settings/FaviconSettings.svelte`
+- 2 — `web-admin/src/features/organizations/settings/LogoSettings.svelte`
+- 2 — `web-admin/src/features/organizations/settings/ThumbnailSettings.svelte`
+- 2 — `web-admin/src/features/organizations/user-management/dialogs/CreateUserGroupDialog.svelte`
+- 2 — `web-admin/src/features/organizations/user-management/dialogs/EditUserGroupDialog.svelte`
+- 4 — `web-admin/src/features/view-as-user/ViewAsUserPopover.svelte`
+
+### PR 11: Admin operational surfaces (18)
+
+- 1 — `web-admin/src/features/alerts/metadata/AlertFilterCriteria.svelte`
+- 1 — `web-admin/src/features/alerts/metadata/AlertFilters.svelte`
+- 4 — `web-admin/src/features/alerts/metadata/AlertMetadata.svelte`
+- 3 — `web-admin/src/features/personal-files/canvas/CanvasPersonalFile.svelte`
+- 1 — `web-admin/src/features/personal-files/canvas/PersonalCanvasCompositeCell.svelte`
+- 3 — `web-admin/src/features/public-urls/CreatePublicURLForm.svelte`
+- 2 — `web-admin/src/features/scheduled-reports/history/NoRunsYet.svelte`
+- 3 — `web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte`
+
+### PR 12: Admin routes and onboarding (18)
+
+- 1 — `web-admin/src/routes/+page.svelte`
+- 2 — `web-admin/src/routes/-/embed/+layout.svelte`
+- 1 — `web-admin/src/routes/-/github/connect/request/+page.svelte`
+- 1 — `web-admin/src/routes/-/github/connect/retry-install/+page.svelte`
+- 6 — `web-admin/src/routes/-/welcome/theme/+page.svelte`
+- 1 — `web-admin/src/routes/[organization]/-/create-project/+page.svelte`
+- 1 — `web-admin/src/routes/[organization]/[project]/+page.svelte`
+- 1 — `web-admin/src/routes/[organization]/[project]/-/dashboards/+page.svelte`
+- 1 — `web-admin/src/routes/[organization]/[project]/-/edit/(viz)/explore/[name]/+page.svelte`
+- 3 — `web-admin/src/routes/[organization]/[project]/-/request-access/[id]/approve/+page.svelte`
+
+## Final strict-mode gate
+
+After PRs 2–12 land:
+
+1. Re-run the guard and investigate any newly exposed or newly introduced
+   candidates.
+2. Verify every `i18n-ignore` is attached to an intentional literal and has a
+   clear reason in review.
+3. Run catalog integrity, generated-message build, tests, linting, and quality
+   checks.
+4. Change the quality pipeline to invoke `scripts/i18n-guard.js --strict`.
+5. Require the strict guard in CI for future changes.
diff --git a/web-common/src/lib/i18n/README.md b/web-common/src/lib/i18n/README.md
index 10c89d33fafb..e1a720892eca 100644
--- a/web-common/src/lib/i18n/README.md
+++ b/web-common/src/lib/i18n/README.md
@@ -90,9 +90,11 @@ rather than hand-rolled `count === 1 ? ... : ...` logic.
 
 ## Guard against new hardcoded strings
 
-`scripts/i18n-guard.js` scans already-migrated areas for hardcoded
-user-facing strings and runs in `npm run quality`. It is a heuristic and
+`scripts/i18n-guard.js` scans explicitly migrated Svelte areas and source files
+that import the generated message namespace for hardcoded user-facing strings.
+It checks Svelte markup plus common copy-bearing properties in scripts and
+TypeScript/JavaScript, and runs in `npm run quality`. It is a heuristic and
 currently **warning-only**; the final migration chunk flips it to `--strict`
-(fatal). Each migration chunk appends its directories to `MIGRATED_GLOBS` in
-that script. Suppress an intentional literal with an `i18n-ignore` comment on
-the line or the line above it.
+(fatal). Add any migrated leaf components without their own message import to
+`MIGRATED_GLOBS`. Suppress an intentional literal with an `i18n-ignore` comment
+on the line or the line above it.
diff --git a/web-common/src/lib/i18n/messages/en.json b/web-common/src/lib/i18n/messages/en.json
index 3937cc651e53..83d8ef6bb2d0 100644
--- a/web-common/src/lib/i18n/messages/en.json
+++ b/web-common/src/lib/i18n/messages/en.json
@@ -1848,12 +1848,21 @@
   "theme_system": "System",
   "time_ago": "{duration} ago",
   "time_all_time": "All time",
+  "time_all_time_title": "All Time",
   "time_comparing": "Comparing",
+  "time_comparison_custom_description": "Compare the current time range to a custom time range",
   "time_comparison_previous_day": "Previous day",
+  "time_comparison_previous_day_description": "Compare the current time range to the same time range the day before",
+  "time_comparison_previous_month_description": "Compare the current time range to the same time range the month before",
   "time_comparison_previous_period": "Previous period",
+  "time_comparison_previous_period_description": "Compare the current time range to the previous time range",
+  "time_comparison_previous_quarter_description": "Compare the current time range to the same time range the quarter before",
+  "time_comparison_previous_week_description": "Compare the current time range to the same time range the week before",
+  "time_comparison_previous_year_description": "Compare the current time range to the same time range the year before",
   "time_custom": "Custom",
   "time_custom_range": "Custom range",
   "time_custom_range_title": "Custom Range",
+  "time_default": "Default",
   "time_enter_time_range": "Enter a time range",
   "time_from_now": "{duration} from now",
   "time_grain_by": "by",
@@ -1862,6 +1871,7 @@
   "time_grain_days": "days",
   "time_grain_hour": "hour",
   "time_grain_hours": "hours",
+  "time_grain_millisecond": "millisecond",
   "time_grain_minute": "minute",
   "time_grain_minutes": "minutes",
   "time_grain_month": "month",
@@ -1877,7 +1887,12 @@
   "time_grain_years": "years",
   "time_just_now": "Just now",
   "time_last_duration": "Last {duration}",
+  "time_last_n_days": "Last {count} Days",
+  "time_last_n_hours": "Last {count} Hours",
+  "time_last_n_months": "Last {count} Months",
+  "time_last_n_weeks": "Last {count} Weeks",
   "time_month_to_date": "Month to date",
+  "time_month_to_date_title": "Month to Date",
   "time_n_days_ago": [
     {
       "declarations": ["input count", "local countPlural = count: plural"],
@@ -1945,6 +1960,7 @@
   "time_previous_week": "Previous week",
   "time_previous_year": "Previous year",
   "time_quarter_to_date": "Quarter to date",
+  "time_quarter_to_date_title": "Quarter to Date",
   "time_range_grain_to_date": "{grain} to date",
   "time_range_last_n_grains": "last {count} {grains}",
   "time_range_next_grain": "next {grain}",
@@ -1964,7 +1980,9 @@
   "time_unable_to_parse": "Unable to parse time string",
   "time_vs": "vs",
   "time_week_to_date": "Week to date",
+  "time_week_to_date_title": "Week to Date",
   "time_year_to_date": "Year to date",
+  "time_year_to_date_title": "Year to Date",
   "time_yesterday": "Yesterday",
   "users_access_changed_everyone": "Project access changed to everyone",
   "users_access_changed_invite_only": "Project access changed to invite-only",
diff --git a/web-common/src/lib/i18n/messages/es.json b/web-common/src/lib/i18n/messages/es.json
index c89cbe1f83b8..f8b4f4fa51dc 100644
--- a/web-common/src/lib/i18n/messages/es.json
+++ b/web-common/src/lib/i18n/messages/es.json
@@ -1857,12 +1857,21 @@
   "theme_system": "Sistema",
   "time_ago": "hace {duration}",
   "time_all_time": "Todo el período",
+  "time_all_time_title": "Todo el período",
   "time_comparing": "Comparando",
+  "time_comparison_custom_description": "Compara el rango de tiempo actual con un rango de tiempo personalizado",
   "time_comparison_previous_day": "Día anterior",
+  "time_comparison_previous_day_description": "Compara el rango de tiempo actual con el mismo rango del día anterior",
+  "time_comparison_previous_month_description": "Compara el rango de tiempo actual con el mismo rango del mes anterior",
   "time_comparison_previous_period": "Período anterior",
+  "time_comparison_previous_period_description": "Compara el rango de tiempo actual con el rango de tiempo anterior",
+  "time_comparison_previous_quarter_description": "Compara el rango de tiempo actual con el mismo rango del trimestre anterior",
+  "time_comparison_previous_week_description": "Compara el rango de tiempo actual con el mismo rango de la semana anterior",
+  "time_comparison_previous_year_description": "Compara el rango de tiempo actual con el mismo rango del año anterior",
   "time_custom": "Personalizado",
   "time_custom_range": "Rango personalizado",
   "time_custom_range_title": "Rango personalizado",
+  "time_default": "Predeterminado",
   "time_enter_time_range": "Ingresa un rango de tiempo",
   "time_from_now": "en {duration}",
   "time_grain_by": "por",
@@ -1871,6 +1880,7 @@
   "time_grain_days": "días",
   "time_grain_hour": "hora",
   "time_grain_hours": "horas",
+  "time_grain_millisecond": "milisegundo",
   "time_grain_minute": "minuto",
   "time_grain_minutes": "minutos",
   "time_grain_month": "mes",
@@ -1886,7 +1896,12 @@
   "time_grain_years": "años",
   "time_just_now": "Ahora mismo",
   "time_last_duration": "Últimos {duration}",
+  "time_last_n_days": "Últimos {count} días",
+  "time_last_n_hours": "Últimas {count} horas",
+  "time_last_n_months": "Últimos {count} meses",
+  "time_last_n_weeks": "Últimas {count} semanas",
   "time_month_to_date": "Mes actual",
+  "time_month_to_date_title": "Mes actual",
   "time_n_days_ago": [
     {
       "declarations": ["input count", "local countPlural = count: plural"],
@@ -1954,6 +1969,7 @@
   "time_previous_week": "Semana anterior",
   "time_previous_year": "Año anterior",
   "time_quarter_to_date": "Trimestre actual",
+  "time_quarter_to_date_title": "Trimestre actual",
   "time_range_grain_to_date": "{grain} hasta la fecha",
   "time_range_last_n_grains": "últimos {count} {grains}",
   "time_range_next_grain": "siguiente {grain}",
@@ -1973,7 +1989,9 @@
   "time_unable_to_parse": "No se pudo interpretar el rango de tiempo",
   "time_vs": "vs",
   "time_week_to_date": "Semana actual",
+  "time_week_to_date_title": "Semana actual",
   "time_year_to_date": "Año actual",
+  "time_year_to_date_title": "Año actual",
   "time_yesterday": "Ayer",
   "users_access_changed_everyone": "El acceso al proyecto cambió a todos",
   "users_access_changed_invite_only": "El acceso al proyecto cambió a solo por invitación",
diff --git a/web-common/src/lib/time/config.ts b/web-common/src/lib/time/config.ts
index ca1848a8de61..7ee1be36846c 100644
--- a/web-common/src/lib/time/config.ts
+++ b/web-common/src/lib/time/config.ts
@@ -34,7 +34,9 @@ export type TimeRangeMetaSet = Partial<Record<TimeRangePreset, TimeRangeMeta>>;
  */
 export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
   [TimeRangePreset.LAST_SIX_HOURS]: {
-    label: "Last 6 Hours",
+    get label() {
+      return m.time_last_n_hours({ count: 6 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.CONTIGUOUS,
@@ -63,7 +65,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
   },
 
   [TimeRangePreset.LAST_24_HOURS]: {
-    label: "Last 24 Hours",
+    get label() {
+      return m.time_last_n_hours({ count: 24 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.DAY,
@@ -91,7 +95,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
   },
 
   [TimeRangePreset.LAST_7_DAYS]: {
-    label: "Last 7 Days",
+    get label() {
+      return m.time_last_n_days({ count: 7 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.WEEK,
@@ -118,7 +124,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.LAST_14_DAYS]: {
-    label: "Last 14 Days",
+    get label() {
+      return m.time_last_n_days({ count: 14 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.CONTIGUOUS,
@@ -145,7 +153,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.LAST_4_WEEKS]: {
-    label: "Last 4 Weeks",
+    get label() {
+      return m.time_last_n_weeks({ count: 4 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.CONTIGUOUS,
@@ -172,7 +182,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.LAST_3_MONTHS]: {
-    label: "Last 3 Months",
+    get label() {
+      return m.time_last_n_months({ count: 3 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.CONTIGUOUS,
@@ -199,7 +211,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.LAST_12_MONTHS]: {
-    label: "Last 12 Months",
+    get label() {
+      return m.time_last_n_months({ count: 12 });
+    },
 
     rangePreset: RangePresetType.OFFSET_ANCHORED,
     defaultComparison: TimeComparisonOption.YEAR,
@@ -239,7 +253,9 @@ export const LATEST_WINDOW_TIME_RANGES: TimeRangeMetaSet = {
  */
 export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
   [TimeRangePreset.TODAY]: {
-    label: "Today",
+    get label() {
+      return m.time_today();
+    },
     defaultGrain: V1TimeGrain.TIME_GRAIN_HOUR,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
     defaultComparison: TimeComparisonOption.DAY,
@@ -265,7 +281,9 @@ export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.WEEK_TO_DATE]: {
-    label: "Week to Date",
+    get label() {
+      return m.time_week_to_date_title();
+    },
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
     defaultComparison: TimeComparisonOption.WEEK,
@@ -291,7 +309,9 @@ export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.MONTH_TO_DATE]: {
-    label: "Month to Date",
+    get label() {
+      return m.time_month_to_date_title();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -318,7 +338,9 @@ export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.QUARTER_TO_DATE]: {
-    label: "Quarter to Date",
+    get label() {
+      return m.time_quarter_to_date_title();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_WEEK,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -345,7 +367,9 @@ export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.YEAR_TO_DATE]: {
-    label: "Year to Date",
+    get label() {
+      return m.time_year_to_date_title();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -375,7 +399,9 @@ export const PERIOD_TO_DATE_RANGES: TimeRangeMetaSet = {
 
 export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
   [TimeRangePreset.YESTERDAY_COMPLETE]: {
-    label: "Yesterday",
+    get label() {
+      return m.time_yesterday();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_HOUR,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -405,7 +431,9 @@ export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.PREVIOUS_WEEK_COMPLETE]: {
-    label: "Previous week",
+    get label() {
+      return m.time_previous_week();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -435,7 +463,9 @@ export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.PREVIOUS_MONTH_COMPLETE]: {
-    label: "Previous month",
+    get label() {
+      return m.time_previous_month();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -465,7 +495,9 @@ export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.PREVIOUS_QUARTER_COMPLETE]: {
-    label: "Previous quarter",
+    get label() {
+      return m.time_previous_quarter();
+    },
 
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
@@ -495,7 +527,9 @@ export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
     },
   },
   [TimeRangePreset.PREVIOUS_YEAR_COMPLETE]: {
-    label: "Previous year",
+    get label() {
+      return m.time_previous_year();
+    },
     defaultGrain: V1TimeGrain.TIME_GRAIN_DAY,
     rangePreset: RangePresetType.PERIOD_ANCHORED,
     defaultComparison: TimeComparisonOption.CONTIGUOUS,
@@ -526,20 +560,26 @@ export const PREVIOUS_COMPLETE_DATE_RANGES: TimeRangeMetaSet = {
 };
 
 export const ALL_TIME = {
-  label: "All Time",
+  get label() {
+    return m.time_all_time_title();
+  },
   rangePreset: RangePresetType.ALL_TIME,
   // this comparison period is a no-op
   defaultComparison: TimeComparisonOption.CONTIGUOUS,
 };
 
 export const CUSTOM = {
-  label: "Custom",
+  get label() {
+    return m.time_custom();
+  },
   rangePreset: RangePresetType.FIXED_RANGE,
   defaultComparison: TimeComparisonOption.CONTIGUOUS,
 };
 
 export const DEFAULT = {
-  label: "Default",
+  get label() {
+    return m.time_default();
+  },
   rangePreset: RangePresetType.FIXED_RANGE,
   defaultComparison: TimeComparisonOption.CONTIGUOUS,
 };
@@ -569,7 +609,10 @@ export const DEFAULT_TIME_RANGES: TimeRangeMetaSet = {
 export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   TIME_GRAIN_MILLISECOND: {
     grain: V1TimeGrain.TIME_GRAIN_MILLISECOND,
-    label: "millisecond",
+    unit: "millisecond",
+    get label() {
+      return m.time_grain_millisecond();
+    },
     duration: Period.MILLISECOND,
     d3format: "%H:%M:%S.%L",
     formatDate: {
@@ -584,7 +627,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_SECOND: {
     grain: V1TimeGrain.TIME_GRAIN_SECOND,
-    label: "second",
+    unit: "second",
+    get label() {
+      return m.time_grain_second();
+    },
     duration: Period.SECOND,
     d3format: "%H:%M:%S",
     formatDate: {
@@ -598,7 +644,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_MINUTE: {
     grain: V1TimeGrain.TIME_GRAIN_MINUTE,
-    label: "minute",
+    unit: "minute",
+    get label() {
+      return m.time_grain_minute();
+    },
     duration: Period.MINUTE,
     d3format: "%M:%S",
     formatDate: {
@@ -611,7 +660,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_HOUR: {
     grain: V1TimeGrain.TIME_GRAIN_HOUR,
-    label: "hour",
+    unit: "hour",
+    get label() {
+      return m.time_grain_hour();
+    },
     duration: Period.HOUR,
     d3format: "%H:%M",
     formatDate: {
@@ -623,7 +675,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_DAY: {
     grain: V1TimeGrain.TIME_GRAIN_DAY,
-    label: "day",
+    unit: "day",
+    get label() {
+      return m.time_grain_day();
+    },
     duration: Period.DAY,
     d3format: "%b %d",
     formatDate: {
@@ -634,7 +689,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_WEEK: {
     grain: V1TimeGrain.TIME_GRAIN_WEEK,
-    label: "week",
+    unit: "week",
+    get label() {
+      return m.time_grain_week();
+    },
     duration: Period.WEEK,
     d3format: "%b %d",
     formatDate: {
@@ -645,7 +703,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_MONTH: {
     grain: V1TimeGrain.TIME_GRAIN_MONTH,
-    label: "month",
+    unit: "month",
+    get label() {
+      return m.time_grain_month();
+    },
     duration: Period.MONTH,
     d3format: "%b %Y",
     formatDate: {
@@ -655,7 +716,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_QUARTER: {
     grain: V1TimeGrain.TIME_GRAIN_QUARTER,
-    label: "quarter",
+    unit: "quarter",
+    get label() {
+      return m.time_grain_quarter();
+    },
     duration: Period.QUARTER,
     d3format: "Q%q %Y",
     formatDate: {
@@ -665,7 +729,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   },
   TIME_GRAIN_YEAR: {
     grain: V1TimeGrain.TIME_GRAIN_YEAR,
-    label: "year",
+    unit: "year",
+    get label() {
+      return m.time_grain_year();
+    },
     duration: Period.YEAR,
     d3format: "%Y",
     formatDate: {
@@ -678,7 +745,10 @@ export const TIME_GRAIN: Record<V1TimeGrain, TimeGrain> = {
   // but this entry prevents lookup failures in UI formatting code.
   TIME_GRAIN_UNSPECIFIED: {
     grain: V1TimeGrain.TIME_GRAIN_MINUTE,
-    label: "minute",
+    unit: "minute",
+    get label() {
+      return m.time_grain_minute();
+    },
     duration: Period.MINUTE,
     d3format: "%M:%S",
     formatDate: {
@@ -708,7 +778,9 @@ export const TIME_COMPARISON: Record<
       return m.time_comparison_previous_period();
     },
     shorthand: "prev. period",
-    description: "Compare the current time range to the previous time range",
+    get description() {
+      return m.time_comparison_previous_period_description();
+    },
     comparisonType: TimeComparisonOption.CONTIGUOUS,
     offsetIso: "",
     rillTimeOffset: "-1P",
@@ -718,7 +790,9 @@ export const TIME_COMPARISON: Record<
       return m.time_custom_range();
     },
     shorthand: "comparing",
-    description: "Compare the current time range to a custom time range",
+    get description() {
+      return m.time_comparison_custom_description();
+    },
     comparisonType: TimeComparisonOption.CUSTOM,
     offsetIso: "",
   },
@@ -727,8 +801,9 @@ export const TIME_COMPARISON: Record<
       return m.time_comparison_previous_day();
     },
     shorthand: "prev. day",
-    description:
-      "Compare the current time range to the same time range the day before",
+    get description() {
+      return m.time_comparison_previous_day_description();
+    },
     comparisonType: TimeComparisonOption.DAY,
     offsetIso: "P1D",
     rillTimeOffset: "-1D",
@@ -738,8 +813,9 @@ export const TIME_COMPARISON: Record<
       return m.time_previous_week();
     },
     shorthand: "prev. wk",
-    description:
-      "Compare the current time range to the same time range the week before",
+    get description() {
+      return m.time_comparison_previous_week_description();
+    },
     comparisonType: TimeComparisonOption.WEEK,
     offsetIso: "P1W",
     rillTimeOffset: "-1W",
@@ -749,8 +825,9 @@ export const TIME_COMPARISON: Record<
       return m.time_previous_month();
     },
     shorthand: "prev. month",
-    description:
-      "Compare the current time range to the same time range the month before",
+    get description() {
+      return m.time_comparison_previous_month_description();
+    },
     comparisonType: TimeComparisonOption.MONTH,
     // Setting this to P1M prevents month over month comparisons for 31-day months
     offsetIso: "P31D",
@@ -761,8 +838,9 @@ export const TIME_COMPARISON: Record<
       return m.time_previous_quarter();
     },
     shorthand: "prev. qtr",
-    description:
-      "Compare the current time range to the same time range the quarter before",
+    get description() {
+      return m.time_comparison_previous_quarter_description();
+    },
     comparisonType: TimeComparisonOption.QUARTER,
     offsetIso: "P3M",
     rillTimeOffset: "-1Q",
@@ -773,8 +851,9 @@ export const TIME_COMPARISON: Record<
       return m.time_previous_year();
     },
     shorthand: "prev. yr",
-    description:
-      "Compare the current time range to the same time range the year before",
+    get description() {
+      return m.time_comparison_previous_year_description();
+    },
     comparisonType: TimeComparisonOption.YEAR,
     offsetIso: "P1Y",
     rillTimeOffset: "-1Y",
diff --git a/web-common/src/lib/time/grains/index.spec.ts b/web-common/src/lib/time/grains/index.spec.ts
index 0537b0c7acb0..414b01d62ced 100644
--- a/web-common/src/lib/time/grains/index.spec.ts
+++ b/web-common/src/lib/time/grains/index.spec.ts
@@ -1,14 +1,35 @@
 import { V1TimeGrain } from "../../../runtime-client/gen/index.schemas";
-import { TIME_GRAIN } from "../config";
+import { overwriteGetLocale } from "@rilldata/web-common/lib/i18n/gen/runtime";
+import { DEFAULT_TIME_RANGES, TIME_COMPARISON, TIME_GRAIN } from "../config";
 import {
   durationToMillis,
   getAllowedTimeGrains,
   getDefaultTimeGrain,
   getValidatedTimeGrain,
+  unitToTimeGrain,
 } from "../grains";
+import { TimeComparisonOption, TimeRangePreset } from "../types";
 import { Interval, DateTime } from "luxon";
 import { parseRillTime } from "@rilldata/web-common/features/dashboards/url-state/time-ranges/parser";
-import { describe, it, expect } from "vitest";
+import { afterEach, describe, it, expect } from "vitest";
+
+afterEach(() => overwriteGetLocale(() => "en"));
+
+describe("localized time configuration", () => {
+  it("keeps Luxon units locale-independent while localizing display copy", () => {
+    overwriteGetLocale(() => "es");
+
+    expect(TIME_GRAIN.TIME_GRAIN_DAY.unit).toBe("day");
+    expect(TIME_GRAIN.TIME_GRAIN_DAY.label).toBe("día");
+    expect(unitToTimeGrain("day")).toBe(V1TimeGrain.TIME_GRAIN_DAY);
+    expect(DEFAULT_TIME_RANGES[TimeRangePreset.LAST_SIX_HOURS]?.label).toBe(
+      "Últimas 6 horas",
+    );
+    expect(TIME_COMPARISON[TimeComparisonOption.DAY].description).toBe(
+      "Compara el rango de tiempo actual con el mismo rango del día anterior",
+    );
+  });
+});
 
 const allowedGrainTests = [
   {
diff --git a/web-common/src/lib/time/grains/index.ts b/web-common/src/lib/time/grains/index.ts
index 6af8c359bfb5..cf8cf85d240e 100644
--- a/web-common/src/lib/time/grains/index.ts
+++ b/web-common/src/lib/time/grains/index.ts
@@ -13,7 +13,7 @@ import type { RillTime } from "@rilldata/web-common/features/dashboards/url-stat
 
 export function unitToTimeGrain(unit: string): V1TimeGrain {
   return (
-    Object.values(TIME_GRAIN).find((timeGrain) => timeGrain.label === unit)
+    Object.values(TIME_GRAIN).find((timeGrain) => timeGrain.unit === unit)
       ?.grain || V1TimeGrain.TIME_GRAIN_UNSPECIFIED
   );
 }
diff --git a/web-common/src/lib/time/types.ts b/web-common/src/lib/time/types.ts
index 872fff2865b0..f62538a5683c 100644
--- a/web-common/src/lib/time/types.ts
+++ b/web-common/src/lib/time/types.ts
@@ -171,8 +171,10 @@ export interface DashboardTimeControls extends TimeRange {
 export interface TimeGrain {
   /** the grain defined by the runtime */
   grain: V1TimeGrain;
-  /** a human-readable name, e.g. minute, second, etc. */
-  label: DateTimeUnit;
+  /** the locale-independent Luxon unit used for date arithmetic. */
+  unit: DateTimeUnit;
+  /** the localized human-readable name. */
+  label: string;
   /** the ISO8601 duration, e.g. P1D, PT6H */
   duration: Period;
   /** the d3 time format string that outputs a human-readable