bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-22 19:23:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/bitwarden/browser into feature/safari-webext

Browse Source 
# Conflicts:
#	src/background/runtime.background.ts
This commit is contained in:
Hinton
2020-12-11 14:33:46 +01:00
parent 35d1d5d723 c95230fc48
commit 25a2af903a
12 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/popup/settings/export.component.html
View File

@@ -21,6 +21,7 @@
<select id="format" name="Format" [(ngModel)]="format">
<option value="json">.json</option>
<option value="csv">.csv</option>
<option value="encrypted_json">.json (Encrypted)</option>
</select>
</div>
<div class="box-content-row box-content-row-flex" appBoxRow>
@@ -40,7 +41,13 @@
</div>
<div class="box-footer">
<p>{{'exportMasterPassword' | i18n}}</p>
<strong>{{'warning' | i18n}}</strong>: {{'exportWarningDesc' | i18n}}
<strong>{{'warning' | i18n}}</strong>:
<span *ngIf="!encryptedFormat">
{{'exportWarningDesc' | i18n}}
</span>
<span *ngIf="encryptedFormat">
{{'encExportWarningDesc' | i18n}}
</span>
</div>
</div>
</content>