Merge remote-tracking branch 'upstream/dev' into feat/windows-arm64-support

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opencode-ai/desktop",
   "private": true,
-  "version": "1.2.19",
+  "version": "1.2.22",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/desktop/src/i18n/index.ts

@@ -77,6 +77,7 @@ function detectLocale(): Locale {
   const languages = navigator.languages?.length ? navigator.languages : [navigator.language]
   for (const language of languages) {
     if (!language) continue
+    if (language.toLowerCase().startsWith("en")) return "en"
     if (language.toLowerCase().startsWith("zh")) {
       if (language.toLowerCase().includes("hant")) return "zht"
       return "zh"