diff --git a/jslib b/jslib index 2858724f44..212a2e3745 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 2858724f4431038be190fc0b748efe287dd1bae6 +Subproject commit 212a2e3745e6e0e2b3057ed308c47daf6aeefbc8 diff --git a/resources/appx/BadgeLogo.png b/resources/appx/BadgeLogo.png index 3cbf841c77..f4043de9a2 100644 Binary files a/resources/appx/BadgeLogo.png and b/resources/appx/BadgeLogo.png differ diff --git a/resources/appx/SplashScreen.png b/resources/appx/SplashScreen.png index b44114f718..ae593f8116 100644 Binary files a/resources/appx/SplashScreen.png and b/resources/appx/SplashScreen.png differ diff --git a/resources/appx/Square150x150Logo.png b/resources/appx/Square150x150Logo.png index 668244a56b..912f49b923 100644 Binary files a/resources/appx/Square150x150Logo.png and b/resources/appx/Square150x150Logo.png differ diff --git a/resources/appx/Square44x44Logo.png b/resources/appx/Square44x44Logo.png index b08bf7fa77..99d45c500e 100644 Binary files a/resources/appx/Square44x44Logo.png and b/resources/appx/Square44x44Logo.png differ diff --git a/resources/appx/StoreLogo.png b/resources/appx/StoreLogo.png index 6bf4752aa3..7a111642a1 100644 Binary files a/resources/appx/StoreLogo.png and b/resources/appx/StoreLogo.png differ diff --git a/resources/appx/Wide310x150Logo.png b/resources/appx/Wide310x150Logo.png index cca6f7ca7f..cab6b888a2 100644 Binary files a/resources/appx/Wide310x150Logo.png and b/resources/appx/Wide310x150Logo.png differ diff --git a/resources/dmg.icns b/resources/dmg.icns index f2eb2f4d78..936ae4cd38 100644 Binary files a/resources/dmg.icns and b/resources/dmg.icns differ diff --git a/resources/dmg.iconset/icon_128x128.png b/resources/dmg.iconset/icon_128x128.png index 1db1d88149..032e3a7bdb 100644 Binary files a/resources/dmg.iconset/icon_128x128.png and b/resources/dmg.iconset/icon_128x128.png differ diff --git a/resources/dmg.iconset/icon_128x128@2x.png b/resources/dmg.iconset/icon_128x128@2x.png index 720f0e9b65..23b4d2447d 100644 Binary files a/resources/dmg.iconset/icon_128x128@2x.png and b/resources/dmg.iconset/icon_128x128@2x.png differ diff --git a/resources/dmg.iconset/icon_16x16.png b/resources/dmg.iconset/icon_16x16.png index 072d5d4351..c2d9f33f73 100644 Binary files a/resources/dmg.iconset/icon_16x16.png and b/resources/dmg.iconset/icon_16x16.png differ diff --git a/resources/dmg.iconset/icon_16x16@2x.png b/resources/dmg.iconset/icon_16x16@2x.png index 0e8584e8e1..9bcd22b6b3 100644 Binary files a/resources/dmg.iconset/icon_16x16@2x.png and b/resources/dmg.iconset/icon_16x16@2x.png differ diff --git a/resources/dmg.iconset/icon_256x256.png b/resources/dmg.iconset/icon_256x256.png index 720f0e9b65..b52a826526 100644 Binary files a/resources/dmg.iconset/icon_256x256.png and b/resources/dmg.iconset/icon_256x256.png differ diff --git a/resources/dmg.iconset/icon_256x256@2x.png b/resources/dmg.iconset/icon_256x256@2x.png index bdd9c22efb..3f89a1aa2e 100644 Binary files a/resources/dmg.iconset/icon_256x256@2x.png and b/resources/dmg.iconset/icon_256x256@2x.png differ diff --git a/resources/dmg.iconset/icon_32x32.png b/resources/dmg.iconset/icon_32x32.png index 0e8584e8e1..6f91f5a38b 100644 Binary files a/resources/dmg.iconset/icon_32x32.png and b/resources/dmg.iconset/icon_32x32.png differ diff --git a/resources/dmg.iconset/icon_32x32@2x.png b/resources/dmg.iconset/icon_32x32@2x.png index 555e45ef5b..3d4aa29ee4 100644 Binary files a/resources/dmg.iconset/icon_32x32@2x.png and b/resources/dmg.iconset/icon_32x32@2x.png differ diff --git a/resources/dmg.iconset/icon_512x512.png b/resources/dmg.iconset/icon_512x512.png index bdd9c22efb..51ebc7bed8 100644 Binary files a/resources/dmg.iconset/icon_512x512.png and b/resources/dmg.iconset/icon_512x512.png differ diff --git a/resources/dmg.iconset/icon_512x512@2x.png b/resources/dmg.iconset/icon_512x512@2x.png index 6b6593acc7..0d6635c229 100644 Binary files a/resources/dmg.iconset/icon_512x512@2x.png and b/resources/dmg.iconset/icon_512x512@2x.png differ diff --git a/resources/icon.icns b/resources/icon.icns index fe78aea6a4..f1ffc36ba3 100644 Binary files a/resources/icon.icns and b/resources/icon.icns differ diff --git a/resources/icon.ico b/resources/icon.ico index 1f5beb6ed2..b5d2ff46cf 100644 Binary files a/resources/icon.ico and b/resources/icon.ico differ diff --git a/resources/icon.iconset/icon_128x128.png b/resources/icon.iconset/icon_128x128.png index 8d39f53237..14929da914 100644 Binary files a/resources/icon.iconset/icon_128x128.png and b/resources/icon.iconset/icon_128x128.png differ diff --git a/resources/icon.iconset/icon_128x128@2x.png b/resources/icon.iconset/icon_128x128@2x.png index 16e1a5ef32..2abe771367 100644 Binary files a/resources/icon.iconset/icon_128x128@2x.png and b/resources/icon.iconset/icon_128x128@2x.png differ diff --git a/resources/icon.iconset/icon_16x16.png b/resources/icon.iconset/icon_16x16.png index 1bc2341be5..a4e7b6b98b 100644 Binary files a/resources/icon.iconset/icon_16x16.png and b/resources/icon.iconset/icon_16x16.png differ diff --git a/resources/icon.iconset/icon_16x16@2x.png b/resources/icon.iconset/icon_16x16@2x.png index ea0254cc2b..de461f0770 100644 Binary files a/resources/icon.iconset/icon_16x16@2x.png and b/resources/icon.iconset/icon_16x16@2x.png differ diff --git a/resources/icon.iconset/icon_256x256.png b/resources/icon.iconset/icon_256x256.png index 16e1a5ef32..2abe771367 100644 Binary files a/resources/icon.iconset/icon_256x256.png and b/resources/icon.iconset/icon_256x256.png differ diff --git a/resources/icon.iconset/icon_256x256@2x.png b/resources/icon.iconset/icon_256x256@2x.png index 3728dc3ae4..e566f3aea6 100644 Binary files a/resources/icon.iconset/icon_256x256@2x.png and b/resources/icon.iconset/icon_256x256@2x.png differ diff --git a/resources/icon.iconset/icon_32x32.png b/resources/icon.iconset/icon_32x32.png index 2364cd98cb..de461f0770 100644 Binary files a/resources/icon.iconset/icon_32x32.png and b/resources/icon.iconset/icon_32x32.png differ diff --git a/resources/icon.iconset/icon_32x32@2x.png b/resources/icon.iconset/icon_32x32@2x.png index bb1e7ee3f2..5b9d09d51d 100644 Binary files a/resources/icon.iconset/icon_32x32@2x.png and b/resources/icon.iconset/icon_32x32@2x.png differ diff --git a/resources/icon.iconset/icon_512x512.png b/resources/icon.iconset/icon_512x512.png index 3728dc3ae4..e566f3aea6 100644 Binary files a/resources/icon.iconset/icon_512x512.png and b/resources/icon.iconset/icon_512x512.png differ diff --git a/resources/icon.iconset/icon_512x512@2x.png b/resources/icon.iconset/icon_512x512@2x.png index 2e1192be18..8a127f78ea 100644 Binary files a/resources/icon.iconset/icon_512x512@2x.png and b/resources/icon.iconset/icon_512x512@2x.png differ diff --git a/resources/icon.png b/resources/icon.png index 2e1192be18..6873acee03 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/icons/128x128.png b/resources/icons/128x128.png index 8d39f53237..e128ba9c54 100644 Binary files a/resources/icons/128x128.png and b/resources/icons/128x128.png differ diff --git a/resources/icons/16x16.png b/resources/icons/16x16.png index 1bc2341be5..a4e7b6b98b 100644 Binary files a/resources/icons/16x16.png and b/resources/icons/16x16.png differ diff --git a/resources/icons/256x256.png b/resources/icons/256x256.png index 16e1a5ef32..6de1a7439a 100644 Binary files a/resources/icons/256x256.png and b/resources/icons/256x256.png differ diff --git a/resources/icons/32x32.png b/resources/icons/32x32.png index 2364cd98cb..de461f0770 100644 Binary files a/resources/icons/32x32.png and b/resources/icons/32x32.png differ diff --git a/resources/icons/48x48.png b/resources/icons/48x48.png index d146216967..82f2642de0 100644 Binary files a/resources/icons/48x48.png and b/resources/icons/48x48.png differ diff --git a/resources/icons/512x512.png b/resources/icons/512x512.png index 3728dc3ae4..1febfb1e2f 100644 Binary files a/resources/icons/512x512.png and b/resources/icons/512x512.png differ diff --git a/resources/icons/64x64.png b/resources/icons/64x64.png index caa0472821..ac1bcdc0dc 100644 Binary files a/resources/icons/64x64.png and b/resources/icons/64x64.png differ diff --git a/resources/installerSidebar.bmp b/resources/installerSidebar.bmp index 398e3dc941..313f776758 100644 Binary files a/resources/installerSidebar.bmp and b/resources/installerSidebar.bmp differ diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html index b0b8db38ee..28c3865d87 100644 --- a/src/app/vault/view.component.html +++ b/src/app/vault/view.component.html @@ -272,7 +272,7 @@ -
+
diff --git a/src/images/icon-highlight.png b/src/images/icon-highlight.png index ffae960711..6cfa837250 100644 Binary files a/src/images/icon-highlight.png and b/src/images/icon-highlight.png differ diff --git a/src/images/icon-highlight@2x.png b/src/images/icon-highlight@2x.png index 3b4c7966cc..e2b9486938 100644 Binary files a/src/images/icon-highlight@2x.png and b/src/images/icon-highlight@2x.png differ diff --git a/src/images/icon-template.png b/src/images/icon-template.png index f2c07580ea..9eff66254a 100644 Binary files a/src/images/icon-template.png and b/src/images/icon-template.png differ diff --git a/src/images/icon-template@2x.png b/src/images/icon-template@2x.png index 1affdbd1a8..3bde303826 100644 Binary files a/src/images/icon-template@2x.png and b/src/images/icon-template@2x.png differ diff --git a/src/images/icon.ico b/src/images/icon.ico index 1f5beb6ed2..a18e8341b5 100644 Binary files a/src/images/icon.ico and b/src/images/icon.ico differ diff --git a/src/images/icon.png b/src/images/icon.png index 54fd8903cc..6636b04b61 100644 Binary files a/src/images/icon.png and b/src/images/icon.png differ diff --git a/src/images/logo-dark@2x.png b/src/images/logo-dark@2x.png index 0266e85122..3fc3c6d7a5 100644 Binary files a/src/images/logo-dark@2x.png and b/src/images/logo-dark@2x.png differ diff --git a/src/images/logo-white@2x.png b/src/images/logo-white@2x.png index 6042588c60..519cbc75e1 100644 Binary files a/src/images/logo-white@2x.png and b/src/images/logo-white@2x.png differ diff --git a/src/locales/da/messages.json b/src/locales/da/messages.json index d785df0629..99b4bdc3c6 100644 --- a/src/locales/da/messages.json +++ b/src/locales/da/messages.json @@ -113,10 +113,10 @@ "description": "Copy value to clipboard" }, "minimizeOnCopyToClipboard": { - "message": "Minimize when copying to clipboard" + "message": "Minimér, når du kopierer til udklipsholder" }, "minimizeOnCopyToClipboardDesc": { - "message": "Minimize when copying an item's data to the clipboard." + "message": "Minimér, når du kopierer et elements data til udklipsholderen." }, "toggleVisibility": { "message": "Slå synlighed til/fra" @@ -343,7 +343,7 @@ "message": "Er du sikker på, at du vil slette dette element?" }, "deletedItem": { - "message": "Slettede element" + "message": "Element sendt til papirkurven" }, "overwritePasswordConfirmation": { "message": "Er du sikker på, at du vil overskrive den aktuelle adgangskode?" @@ -776,10 +776,10 @@ "message": "To-trins login" }, "vaultTimeout": { - "message": "Vault Timeout" + "message": "Boks timeout" }, "vaultTimeoutDesc": { - "message": "Choose when your vault will timeout and perform the selected action." + "message": "Vælg timeout for din boks, hvorefter den vil udføre den valgte handling." }, "immediately": { "message": "Straks" @@ -1287,50 +1287,50 @@ "message": "Én eller flere organisationspolitikker påvirker dine generatorindstillinger." }, "vaultTimeoutAction": { - "message": "Vault Timeout Action" + "message": "Boks timeout-handling" }, "vaultTimeoutActionLockDesc": { - "message": "A locked vault requires that you re-enter your master password to access it again." + "message": "En låst boks kræver at du gentaster din hovedadgangskode for at tilgå den igen." }, "vaultTimeoutActionLogOutDesc": { - "message": "A logged out vault requires that you re-authenticate to access it again." + "message": "En boks der er logget ud kræver, at du godkender igen for at få adgang til den." }, "lock": { - "message": "Lock", + "message": "Lås", "description": "Verb form: to make secure or inaccesible by" }, "trash": { - "message": "Trash", + "message": "Papirkurv", "description": "Noun: a special folder to hold deleted items" }, "searchTrash": { - "message": "Search trash" + "message": "Søg i papirkurven" }, "permanentlyDeleteItem": { - "message": "Permanently Delete Item" + "message": "Slet element permanent" }, "permanentlyDeleteItemConfirmation": { - "message": "Are you sure you want to permanently delete this item?" + "message": "Er du sikker på, at du vil slette dette element permanent?" }, "permanentlyDeletedItem": { - "message": "Permanently Deleted item" + "message": "Element slettet permanent" }, "restoreItem": { - "message": "Restore Item" + "message": "Gendan element" }, "restoreItemConfirmation": { - "message": "Are you sure you want to restore this item?" + "message": "Er du sikker på, at du vil gendanne dette element?" }, "restoredItem": { - "message": "Restored Item" + "message": "Element gendannet" }, "permanentlyDelete": { - "message": "Permanently Delete" + "message": "Slette permanent" }, "vaultTimeoutLogOutConfirmation": { - "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?" + "message": "Ved at logge ud fjernes al adgang til din boks og kræver online-godkendelse efter timeout-perioden. Er du sikker på, at du vil bruge denne indstilling?" }, "vaultTimeoutLogOutConfirmationTitle": { - "message": "Timeout Action Confirmation" + "message": "Bekræft timeout-handling" } } diff --git a/src/locales/pt_PT/messages.json b/src/locales/pt_PT/messages.json index 8f287d2571..6cf0f50522 100644 --- a/src/locales/pt_PT/messages.json +++ b/src/locales/pt_PT/messages.json @@ -776,10 +776,10 @@ "message": "Início de sessão de dois passos" }, "vaultTimeout": { - "message": "Vault Timeout" + "message": "Tempo de expiração do Cofre" }, "vaultTimeoutDesc": { - "message": "Choose when your vault will timeout and perform the selected action." + "message": "Escolha quando o seu cofre irá de expirar e a ação que irá executar." }, "immediately": { "message": "Imediatamente" @@ -1287,13 +1287,13 @@ "message": "Uma ou mais políticas de organização estão a afetar as suas definições do gerador." }, "vaultTimeoutAction": { - "message": "Vault Timeout Action" + "message": "Ação de expiração do Cofre" }, "vaultTimeoutActionLockDesc": { - "message": "A locked vault requires that you re-enter your master password to access it again." + "message": "Um cofre bloqueado requer que você reinsira a sua palavra-passe mestra para o aceder novamente." }, "vaultTimeoutActionLogOutDesc": { - "message": "A logged out vault requires that you re-authenticate to access it again." + "message": "Um cofre com a sessão desligada requer que você se autentique novamente para o poder aceder." }, "lock": { "message": "Bloquear", @@ -1331,6 +1331,6 @@ "message": "Terminar sessão irá remover todos os acessos ao seu cofre e requer autenticação online após o período de espera. Tem a certeza de que pretende utilizar esta definição?" }, "vaultTimeoutLogOutConfirmationTitle": { - "message": "Timeout Action Confirmation" + "message": "Confirmação de expiração do Cofre" } } diff --git a/src/locales/zh_CN/messages.json b/src/locales/zh_CN/messages.json index a9e928aec3..325f2d6032 100644 --- a/src/locales/zh_CN/messages.json +++ b/src/locales/zh_CN/messages.json @@ -116,7 +116,7 @@ "message": "复制到剪贴板时最小化" }, "minimizeOnCopyToClipboardDesc": { - "message": "复制项目数据到剪贴板时最小化" + "message": "复制项目数据到剪贴板时最小化。" }, "toggleVisibility": { "message": "切换可见性" @@ -1290,10 +1290,10 @@ "message": "密码库超时操作" }, "vaultTimeoutActionLockDesc": { - "message": "已锁定的密码库需要重新输入主密码才能再次访问" + "message": "已锁定的密码库需要重新输入主密码才能再次访问。" }, "vaultTimeoutActionLogOutDesc": { - "message": "已登出的密码库需要重新输入主密码才能再次访问" + "message": "已注销的密码库需要重新输入主密码才能再次访问。" }, "lock": { "message": "锁定", @@ -1310,7 +1310,7 @@ "message": "永久删除项目" }, "permanentlyDeleteItemConfirmation": { - "message": "您确定要永久删除此项目？" + "message": "您确定要永久删除此项目吗？" }, "permanentlyDeletedItem": { "message": "已永久删除项目" @@ -1319,7 +1319,7 @@ "message": "恢复项目" }, "restoreItemConfirmation": { - "message": "确定要恢复此项目？" + "message": "您确定要恢复此项目吗？" }, "restoredItem": { "message": "已恢复项目" @@ -1328,7 +1328,7 @@ "message": "永久删除" }, "vaultTimeoutLogOutConfirmation": { - "message": "登出将会在超时后删除您访问密码库的所有权限，并且需要进行在线认证。 您确定要使用此设置吗？" + "message": "注销时将会移除密码库的所有访问权限，并且需要在超时后进行在线认证。 您确定要使用此设置吗？" }, "vaultTimeoutLogOutConfirmationTitle": { "message": "超时操作确认" diff --git a/src/main/powerMonitor.main.ts b/src/main/powerMonitor.main.ts index 32ad1972da..7c4e130f89 100644 --- a/src/main/powerMonitor.main.ts +++ b/src/main/powerMonitor.main.ts @@ -23,8 +23,8 @@ export class PowerMonitorMain { powerMonitor.on('suspend', async () => { const options = await this.getVaultTimeoutOptions(); if (options[0] === -3) { - options[1] === 'lock' ? this.main.messagingService.send('lockVault') : - this.main.messagingService.send('logout', { expired: false }); + options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) : + this.main.messagingService.send('lockVault'); } }); } @@ -34,8 +34,8 @@ export class PowerMonitorMain { powerMonitor.on('lock-screen', async () => { const options = await this.getVaultTimeoutOptions(); if (options[0] === -2) { - options[1] === 'lock' ? this.main.messagingService.send('lockVault') : - this.main.messagingService.send('logout', { expired: false }); + options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) : + this.main.messagingService.send('lockVault'); } }); } @@ -51,8 +51,8 @@ export class PowerMonitorMain { const options = await this.getVaultTimeoutOptions(); if (options[0] === -4) { - options[1] === 'lock' ? this.main.messagingService.send('lockVault') : - this.main.messagingService.send('logout', { expired: false }); + options[1] === 'logOut' ? this.main.messagingService.send('logout', { expired: false }) : + this.main.messagingService.send('lockVault'); } } diff --git a/src/package.json b/src/package.json index 49499d0ff0..e5bc38c91f 100644 --- a/src/package.json +++ b/src/package.json @@ -2,7 +2,7 @@ "name": "bitwarden", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "1.17.2", + "version": "1.18.0", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0",