From d981a6e3c6e3f8f6c1e3aec23f5578c4338e7f91 Mon Sep 17 00:00:00 2001 From: Abdo Date: Sat, 1 Jun 2024 11:05:19 +0300 Subject: [PATCH] Reword sync conflict explanation (#3221) * Reword sync conflict explanation * Preserve old string for now (dae) --- ftl/core/sync.ftl | 8 ++++++++ qt/aqt/sync.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ftl/core/sync.ftl b/ftl/core/sync.ftl index 79594bb78..4684b6682 100644 --- a/ftl/core/sync.ftl +++ b/ftl/core/sync.ftl @@ -35,6 +35,14 @@ sync-conflict-explanation = If you choose upload, Anki will send this device's data to AnkiWeb, and any changes that are waiting on AnkiWeb will be lost. After all devices are in sync, future reviews and added cards can be merged automatically. +sync-conflict-explanation2 = + There is a conflict between decks on this device and AnkiWeb. You must choose which version to keep: + + - Select **{ sync-download-from-ankiweb }** to replace decks here with AnkiWeb’s version. You will lose any changes you made on this device since your last sync. + - Select **{ sync-upload-to-ankiweb }** to overwrite AnkiWeb’s versions with decks from this device, and delete any changes on AnkiWeb. + + Once the conflict is resolved, syncing will work as usual. + sync-ankiweb-id-label = AnkiWeb ID: sync-password-label = Password: sync-account-required = diff --git a/qt/aqt/sync.py b/qt/aqt/sync.py index 21386f067..92416beb4 100644 --- a/qt/aqt/sync.py +++ b/qt/aqt/sync.py @@ -157,11 +157,12 @@ def full_sync( on_done() ask_user_dialog( - tr.sync_conflict_explanation(), + tr.sync_conflict_explanation2(), callback=callback, buttons=button_labels, default_button=2, parent=mw, + textFormat=Qt.TextFormat.MarkdownText, )