Merge branch 'viewer_still_editing_shortcut' of https://github.com/keatsandyeats/calibre

This commit is contained in:
Kovid Goyal 2018-12-19 09:05:05 +05:30
commit e35dbe4401
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -397,8 +397,8 @@ class ConfigDialog(QDialog, Ui_Dialog):
if self.shortcut_config.is_editing:
from calibre.gui2 import info_dialog
info_dialog(self, _('Still editing'),
_('You are in the middle of editing a keyboard shortcut'
' first complete that, by clicking outside the '
_('You are in the middle of editing a keyboard shortcut.'
' First complete that by clicking outside the'
' shortcut editing box.'), show=True)
return
self.save_options(config())