Merge remote-tracking branch 'origin/main' into HEAD

# Conflicts:
#	webui/src/components/settings/SettingsView.tsx

webui/src/tests/i18n.test.tsx

@@ -66,6 +66,7 @@ const LOCALIZED_SETTINGS_COPY_KEYS = [
   "settings.sections.webuiSafety",
   "settings.sections.capabilities",
   "settings.sections.apps",
+  "settings.sections.about",
   "settings.rows.theme",
   "settings.rows.language",
   "settings.rows.density",
@@ -101,6 +102,10 @@ const LOCALIZED_SETTINGS_COPY_KEYS = [
   "settings.status.upToDate",
   "settings.actions.save",
   "settings.actions.saving",
+  "settings.about.checking",
+  "settings.about.checkForUpdates",
+  "settings.about.upToDate",
+  "settings.about.updateAvailable",
 ];
 function isRecord(value: unknown): value is Record<string, unknown> {
   return !!value && typeof value === "object" && !Array.isArray(value);
@@ -244,6 +249,7 @@ describe("webui i18n", () => {
       for (const key of SETTINGS_NAV_KEYS) {
         expect(common.settings.nav[key as keyof typeof common.settings.nav]).toBeTruthy();
       }
+      expect(common.settings.sections.about).toBeTruthy();
       expect(common.settings.rows.theme).toBeTruthy();
       expect(common.settings.status.loading).toBeTruthy();
       expect(common.settings.actions.save).toBeTruthy();
@@ -255,6 +261,9 @@ describe("webui i18n", () => {
       expect(common.settings.byok.showApiKey).toBeTruthy();
       expect(common.settings.byok.hideApiKey).toBeTruthy();
       expect(common.settings.byok.configuredKeyHint).toBeTruthy();
+      expect(common.settings.about.version).toBeTruthy();
+      expect(common.settings.about.checkForUpdates).toBeTruthy();
+      expect(common.settings.about.updateAvailable).toContain("{{version}}");
     }
   });