Merge branch 'main' into PM-26250-Explore-options-to-enable-direct-importer-for-mac-app-store-build

apps/desktop/src/locales/fr/messages.json

@@ -70,7 +70,7 @@
     }
   },
   "noEditPermissions": {
-    "message": "You don't have permission to edit this item"
+    "message": "Vous n'avez pas l'autorisation de modifier cet élément"
   },
   "welcomeBack": {
     "message": "Content de vous revoir"
@@ -4195,33 +4195,33 @@
     "message": "Numéro de carte"
   },
   "upgradeNow": {
-    "message": "Upgrade now"
+    "message": "Mettre à niveau maintenant"
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "Authentificateur intégré"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "Stockage sécurisé de fichier"
   },
   "emergencyAccess": {
-    "message": "Emergency access"
+    "message": "Accès d'urgence"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "Surveillance des fuites"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "Et encore plus !"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "Sécurité en ligne complète"
   },
   "upgradeToPremium": {
-    "message": "Upgrade to Premium"
+    "message": "Mettre à niveau vers Premium"
   },
   "sessionTimeoutSettingsAction": {
-    "message": "Timeout action"
+    "message": "Action à l’expiration"
   },
   "sessionTimeoutHeader": {
-    "message": "Session timeout"
+    "message": "Délai d'expiration de la session"
   }
 }

apps/desktop/src/locales/he/messages.json

@@ -4195,33 +4195,33 @@
     "message": "מספר כרטיס"
   },
   "upgradeNow": {
-    "message": "Upgrade now"
+    "message": "שדרג עכשיו"
   },
   "builtInAuthenticator": {
-    "message": "Built-in authenticator"
+    "message": "מאמת מובנה"
   },
   "secureFileStorage": {
-    "message": "Secure file storage"
+    "message": "אחסון קבצים מאובטח"
   },
   "emergencyAccess": {
-    "message": "Emergency access"
+    "message": "גישת חירום"
   },
   "breachMonitoring": {
-    "message": "Breach monitoring"
+    "message": "ניטור פרצות"
   },
   "andMoreFeatures": {
-    "message": "And more!"
+    "message": "ועוד!"
   },
   "planDescPremium": {
-    "message": "Complete online security"
+    "message": "השלם אבטחה מקוונת"
   },
   "upgradeToPremium": {
-    "message": "Upgrade to Premium"
+    "message": "שדרג לפרימיום"
   },
   "sessionTimeoutSettingsAction": {
-    "message": "Timeout action"
+    "message": "פעולת פסק זמן"
   },
   "sessionTimeoutHeader": {
-    "message": "Session timeout"
+    "message": "פסק זמן להפעלה"
   }
 }

apps/desktop/src/locales/sk/messages.json

@@ -1692,7 +1692,7 @@
     "description": "Default URI match detection for auto-fill."
   },
   "toggleOptions": {
-    "message": "Voľby prepínača"
+    "message": "Zobraziť/skryť možnosti"
   },
   "organization": {
     "message": "Organizácia",
@@ -2425,7 +2425,7 @@
     "message": "Hlavné heslo bolo úspešne nastavené"
   },
   "updatedMasterPassword": {
-    "message": "Hlavné heslo aktualizované"
+    "message": "Hlavné heslo bolo aktualizované"
   },
   "updateMasterPassword": {
     "message": "Aktualizovať hlavné heslo"
@@ -2476,7 +2476,7 @@
     "message": "Použiť PIN kód"
   },
   "useBiometrics": {
-    "message": "Použiť biometrické údaje"
+    "message": "Použiť biometriu"
   },
   "enterVerificationCodeSentToEmail": {
     "message": "Zadajte overovací kód, ktorý vám bol zaslaný na e-mail."
@@ -2574,7 +2574,7 @@
     "message": "Táto organizácia má podnikovú politiku, ktorá vás automaticky zaregistruje na obnovenie hesla. Registrácia umožní správcom organizácie zmeniť vaše hlavné heslo."
   },
   "vaultExportDisabled": {
-    "message": "Export trezoru je zakázaný"
+    "message": "Export trezoru bol odstránený"
   },
   "personalVaultExportPolicyInEffect": {
     "message": "Jedna alebo viacero zásad organizácie vám bráni exportovať váš osobný trezor."
@@ -2619,7 +2619,7 @@
     "message": "Predvoľby"
   },
   "appPreferences": {
-    "message": "Nastavenia aplikácie (Všetky účty)"
+    "message": "Nastavenia aplikácie (všetky účty)"
   },
   "accountSwitcherLimitReached": {
     "message": "Dosiahnutý limit počtu účtov. Odhláste sa z účtu aby ste mohli pridať ďalší."
@@ -2790,7 +2790,7 @@
     "message": "Použiť možnosti subadresovania svojho poskytovateľa e-mailu."
   },
   "catchallEmail": {
-    "message": "Catch-all Email"
+    "message": "E-mail Catch-all"
   },
   "catchallEmailDesc": {
     "message": "Použiť doručenú poštu typu catch-all nastavenú na doméne."
@@ -2843,7 +2843,7 @@
     "description": "Guidance provided for email forwarding services that support multiple email domains."
   },
   "forwarderError": {
-    "message": "$SERVICENAME$ chyba: $ERRORMESSAGE$",
+    "message": "Chyba $SERVICENAME$: $ERRORMESSAGE$",
     "description": "Reports an error returned by a forwarding service to the user.",
     "placeholders": {
       "servicename": {
@@ -2959,7 +2959,7 @@
     }
   },
   "forwarderUnknownForwarder": {
-    "message": "Nepodporovaná služba: '$SERVICENAME$'.",
+    "message": "Neznáme presmerovanie: '$SERVICENAME$'.",
     "description": "Displayed when the forwarding service is not supported.",
     "placeholders": {
       "servicename": {
@@ -2976,7 +2976,7 @@
     "message": "Prístupový token API"
   },
   "apiKey": {
-    "message": "API kľúč"
+    "message": "Kľúč API"
   },
   "premiumSubcriptionRequired": {
     "message": "Vyžaduje sa predplatné Prémium"

apps/desktop/src/locales/zh_CN/messages.json

@@ -1503,7 +1503,7 @@
     "message": "优先客户支持。"
   },
   "premiumSignUpFuture": {
-    "message": "所有未来的高级功能。即将推出！"
+    "message": "未来的更多高级版功能。敬请期待！"
   },
   "premiumPurchase": {
     "message": "购买高级版"
@@ -2029,7 +2029,7 @@
     "message": "Bitwarden 可以存储并填充两步验证码。选择相机图标来拍摄此网站的验证器二维码，或将密钥复制并粘贴到此字段。"
   },
   "premium": {
-    "message": "高级会员",
+    "message": "高级版",
     "description": "Premium membership"
   },
   "freeOrgsCannotUseAttachments": {

apps/desktop/src/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2025.11.1",
+  "version": "2025.11.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2025.11.1",
+      "version": "2025.11.2",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-napi": "file:../desktop_native/napi"

apps/desktop/src/package.json

@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2025.11.1",
+  "version": "2025.11.2",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",

apps/desktop/src/platform/popup-modal-styles.ts

@@ -63,19 +63,12 @@ export function applyMainWindowStyles(window: BrowserWindow, existingWindowState
       }
     }
 
-    if (
-      typeof existingWindowState.x === "number" &&
-      typeof existingWindowState.y === "number" &&
-      Number.isFinite(existingWindowState.x) &&
-      Number.isFinite(existingWindowState.y)
-    ) {
-      try {
-        // Ensure values are integers as Electron expects integer pixel values
-        window.setPosition(Math.round(existingWindowState.x), Math.round(existingWindowState.y));
-      } catch {
-        // Silently fail - window will use default position
-      }
-    }
+  if (existingWindowState?.width && existingWindowState?.height) {
+    window.setSize(Math.floor(existingWindowState.width), Math.floor(existingWindowState.height));
+  }
+
+  if (existingWindowState?.x && existingWindowState?.y) {
+    window.setPosition(Math.floor(existingWindowState.x), Math.floor(existingWindowState.y));
   }
 
   window.setWindowButtonVisibility?.(true);