From 82e78ab070d0e7920a3c8a4ea539775a75821c20 Mon Sep 17 00:00:00 2001
From: John Harrington <84741727+harr1424@users.noreply.github.com>
Date: Fri, 19 Dec 2025 09:05:14 -0700
Subject: [PATCH] resolve conflict with main branch

---
 .../src/app/tools/import/import-desktop.component.html        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/app/tools/import/import-desktop.component.html b/apps/desktop/src/app/tools/import/import-desktop.component.html
index 70f64c74574..a3a33ed43bc 100644
--- a/apps/desktop/src/app/tools/import/import-desktop.component.html
+++ b/apps/desktop/src/app/tools/import/import-desktop.component.html
@@ -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 }}