Merge branch 'master' of https://github.com/bitwarden/desktop into feature/hide-passwords

jslib

@@ -1 +1 @@
-Subproject commit 2858724f4431038be190fc0b748efe287dd1bae6
+Subproject commit 212a2e3745e6e0e2b3057ed308c47daf6aeefbc8

src/app/vault/view.component.html

@@ -272,7 +272,7 @@
         </div>
     </div>
 </div>
-<div class="footer">
+<div class="footer" *ngIf="cipher">
     <button appBlurClick class="primary" (click)="edit()" appA11yTitle="{{'edit' | i18n}}" *ngIf="!cipher.isDeleted">
         <i class="fa fa-pencil fa-fw fa-lg" aria-hidden="true"></i>
     </button>

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"
   }
 }

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"
   }
 }

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": "超时操作确认"

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');
                 }
             }
 

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. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",