GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

tweak sync conflict message

Browse source
This commit is contained in:
Damien Elmes 2021-09-08 19:19:23 +10:00
parent 6279015509
commit 48ff84f7a6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ftl/core/sync.ftl
View file

@ -29,9 +29,9 @@ sync-confirm-empty-download = Local collection has no cards. Download from AnkiW
sync-conflict-explanation = sync-conflict-explanation =
Your decks here and on AnkiWeb differ in such a way that they can't be merged together, so it's necessary to overwrite the decks on one side with the decks from the other. Your decks here and on AnkiWeb differ in such a way that they can't be merged together, so it's necessary to overwrite the decks on one side with the decks from the other.
If you choose download, Anki will download the collection from AnkiWeb, and any changes you have made on your computer since the last sync will be lost. If you choose download, Anki will fetch the collection from AnkiWeb, and any changes you have made on this device since the last sync will be lost.
If you choose upload, Anki will upload your collection to AnkiWeb, and any changes you have made on AnkiWeb or your other devices since the last sync to this device will be lost. 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. After all devices are in sync, future reviews and added cards can be merged automatically.
sync-ankiweb-id-label = AnkiWeb ID: sync-ankiweb-id-label = AnkiWeb ID: