langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conflict handling -> Updates

Browse Source
This commit is contained in:
Damien Elmes 2023-10-28 12:48:02 +10:00
parent 55134435f2
commit 4a3785c03c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ftl/core/importing.ftl
View File

@ -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.

2
ts/import-anki-package/ImportAnkiPackagePage.svelte
View File

@ -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={() =>