From 4a3785c03cba737d97a5e90ed30ddef6b970ad4b Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Sat, 28 Oct 2023 12:48:02 +1000
Subject: [PATCH] Conflict handling -> Updates

---
 ftl/core/importing.ftl                              | 2 +-
 ts/import-anki-package/ImportAnkiPackagePage.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftl/core/importing.ftl b/ftl/core/importing.ftl
index 6859b54ea..05659bfed 100644
--- a/ftl/core/importing.ftl
+++ b/ftl/core/importing.ftl
@@ -51,7 +51,7 @@ importing-notes-skipped-update-due-to-notetype = Notes not updated, as notetype
 importing-notes-updated-as-file-had-newer = Notes updated, as file had newer version: { $val }
 importing-include-reviews = Include reviews
 importing-also-import-progress = Also import any learning progress
-importing-conflict-handling = Conflict handling
+importing-updates = Updates
 importing-include-reviews-help =
     If enabled, any previous reviews that the deck sharer included will also be imported.
     Otherwise, all cards will be imported as new cards.
diff --git a/ts/import-anki-package/ImportAnkiPackagePage.svelte b/ts/import-anki-package/ImportAnkiPackagePage.svelte
index dab033f9e..b0fc4ff8e 100644
--- a/ts/import-anki-package/ImportAnkiPackagePage.svelte
+++ b/ts/import-anki-package/ImportAnkiPackagePage.svelte
@@ -85,7 +85,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             </SwitchRow>
 
             <details>
-                <summary>{tr.importingConflictHandling()}</summary>
+                <summary>{tr.importingUpdates()}</summary>
                 <SwitchRow bind:value={options.mergeNotetypes} defaultValue={false}>
                     <SettingTitle
                         on:click={() =>