From 8d1b8ea79501e74af76d4053309f795b33aba8b0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 8 May 2017 09:46:57 +0530 Subject: [PATCH] String changes --- manual/faq.rst | 2 +- src/calibre/debug.py | 2 +- src/calibre/gui2/__init__.py | 2 +- src/calibre/gui2/actions/copy_to_library.py | 4 ++-- src/calibre/gui2/dialogs/match_books.ui | 2 +- src/calibre/gui2/dialogs/plugin_updater.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index ccafad3f78..25b3169b8f 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -493,7 +493,7 @@ The most common problem is if you are sending email directly (without a mail rel that does not come from a well known relay. The most robust way to setup email sending in calibre is to do the following: * Create a free GMX account at `GMX `_. - * Goto :guilabel:`Preferences->Sharing->Sharing by email` in calibre and click the :guilabel:`Use GMX` button and fill in the information asked for. + * Goto :guilabel:`Preferences->Sharing->Sharing books by email` in calibre and click the :guilabel:`Use GMX` button and fill in the information asked for. * Log into your GMX account on the website and enable SMTP sending (`Settings->POP3 & IMAP->Send and receive emails via external program`) * calibre will then be able to use GMX to send the mail. * If you are sending to your Kindle, remember to update the email preferences diff --git a/src/calibre/debug.py b/src/calibre/debug.py index 6bd4de87fe..779183cf04 100644 --- a/src/calibre/debug.py +++ b/src/calibre/debug.py @@ -44,7 +44,7 @@ Everything after the -- is passed to the script. ' specified path. For internal use only, use the -g' ' option to run the GUI in debug mode')) parser.add_option('-w', '--viewer', default=False, action='store_true', - help=_('Run the e-book viewer in debug mode')) + help=_('Run the E-book viewer in debug mode')) parser.add_option('--paths', default=False, action='store_true', help=_('Output the paths necessary to setup the calibre environment')) parser.add_option('--add-simple-plugin', default=None, diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 9dfaf05f0a..53ade5a5e5 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -403,7 +403,7 @@ def info_dialog(parent, title, msg, det_msg='', show=False, def show_restart_warning(msg, parent=None): d = warning_dialog(parent, _('Restart needed'), msg, show_copy_button=False) - b = d.bb.addButton(_('Restart calibre now'), d.bb.AcceptRole) + b = d.bb.addButton(_('&Restart calibre now'), d.bb.AcceptRole) b.setIcon(QIcon(I('lt.png'))) d.do_restart = False diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py index 2e9880952f..40fad7bf9a 100644 --- a/src/calibre/gui2/actions/copy_to_library.py +++ b/src/calibre/gui2/actions/copy_to_library.py @@ -508,7 +508,7 @@ class CopyToLibraryAction(InterfaceAction): if delete_after: msg += ' ' + _('No books were deleted from this library.') msg += ' ' + _('The best way to resume this operation is to re-copy all the books with the option to' - ' "Check for duplicates when copying to library" in Preferences->Import/Export->Adding books turned on.') + ' "Check for duplicates when copying to library" in Preferences->Import/export->Adding books turned on.') warning_dialog(self.gui, _('Canceled'), msg, show=True) return @@ -531,7 +531,7 @@ class CopyToLibraryAction(InterfaceAction): 'records in the target library. Click "Show ' 'details" to see which ones. This behavior is ' 'controlled by the Automerge option in ' - 'Preferences->Import/Export->Adding books.'), det_msg=books, + 'Preferences->Import/export->Adding books.'), det_msg=books, show=True) if delete_after and self.worker.processed: v = self.gui.library_view diff --git a/src/calibre/gui2/dialogs/match_books.ui b/src/calibre/gui2/dialogs/match_books.ui index 4da7038316..2c128ab660 100644 --- a/src/calibre/gui2/dialogs/match_books.ui +++ b/src/calibre/gui2/dialogs/match_books.ui @@ -17,7 +17,7 @@ - Match Books + Match books diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 2eee95456f..464c1ed66a 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -733,7 +733,7 @@ class PluginUpdaterDialog(SizePersistedDialog): ' {1} plugins. You may have to restart calibre ' 'for the plugin to take effect.').format(plugin.name, plugin.type), show_copy_button=False) - b = d.bb.addButton(_('Restart calibre now'), d.bb.AcceptRole) + b = d.bb.addButton(_('&Restart calibre now'), d.bb.AcceptRole) b.setIcon(QIcon(I('lt.png'))) d.do_restart = False