mirror of
https://github.com/ankitects/anki.git
synced 2025-09-21 15:32:23 -04:00
tweak formatting
This commit is contained in:
parent
3e3f04ee8f
commit
ac735c9a34
1 changed files with 3 additions and 2 deletions
|
@ -2194,8 +2194,9 @@ it to your friends.
|
||||||
|
|
||||||
def onConflict(self, deckName):
|
def onConflict(self, deckName):
|
||||||
diag = ui.utils.askUserDialog(_("""\
|
diag = ui.utils.askUserDialog(_("""\
|
||||||
<b>%s</b> has been changed on both the local<br>
|
<b>%s</b> has been changed on both
|
||||||
and remote side. What do you want to do?""" % deckName),
|
the local and remote side. What do
|
||||||
|
you want to do?""" % deckName),
|
||||||
[_("Keep Local"),
|
[_("Keep Local"),
|
||||||
_("Keep Remote"),
|
_("Keep Remote"),
|
||||||
_("Cancel")])
|
_("Cancel")])
|
||||||
|
|
Loading…
Reference in a new issue