Reword sync conflict explanation (#3221)

* Reword sync conflict explanation

* Preserve old string for now (dae)
This commit is contained in:
Abdo 2024-06-01 11:05:19 +03:00 committed by GitHub
parent f7b93a5012
commit d981a6e3c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions

View File

@ -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 AnkiWebs version. You will lose any changes you made on this device since your last sync.
- Select **{ sync-upload-to-ankiweb }** to overwrite AnkiWebs 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 =

View File

@ -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,
)