bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-29 14:43:31 +00:00
Code Issues Releases Wiki Activity

resolve conflict with main branch

Browse Source
This commit is contained in:
John Harrington
2025-12-19 09:05:14 -07:00
parent 9c4291dec5
commit 82e78ab070
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/src/app/tools/import/import-desktop.component.html
View File

@@ -1,5 +1,5 @@
<bit-dialog #dialog [loading]="loading" dialogSize="large" background="alt">
<span bitDialogTitle>{{ "import" | i18n }}</span>
<span bitDialogTitle>{{ "importNoun" | i18n }}</span>
<ng-container bitDialogContent>
<tools-import
(formLoading)="this.loading = $event"
@@ -19,7 +19,7 @@
bitFormButton
buttonType="primary"
>
{{ "import" | i18n }}
{{ "importVerb" | i18n }}
</button>
<button type="button" bitButton bitFormButton buttonType="secondary" bitDialogClose>
{{ "cancel" | i18n }}