Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

String changes

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-28 21:02:17 +05:30
parent 5f7e5bf155
commit 336fff3fd6
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/customize.rst
View File

@ -44,7 +44,7 @@ Environment variables
* ``http_proxy``, ``https_proxy`` - Used on linux to specify an HTTP(S) proxy
See `How to set environment variables in Windows <https://www.computerhope.com/issues/ch000549.htm>`_ or
`How to set environment variables in macOS <http://www.dowdandassociates.com/blog/content/howto-set-an-environment-variable-in-mac-os-x-launchd-plist/>`_.
`How to set environment variables in macOS <https://www.dowdandassociates.com/blog/content/howto-set-an-environment-variable-in-mac-os-x-launchd-plist/>`_.
Tweaks
------------

10
manual/faq.rst
View File

@ -668,7 +668,7 @@ then import it on another computer. First let's see how to export the data:
folder to your new computer and follow the instructions below to import the
data.
* Install calibre on your new computer and run through the Welcome Wizard, it
* Install calibre on your new computer and run through the :guilabel:`Welcome wizard`, it
does not matter what you do there, as you will be importing your old
settings in the next step. You will now have an empty calibre, with just
the :guilabel:`Getting Started` guide in your library. Once again, right
@ -693,9 +693,9 @@ then import it on another computer. First let's see how to export the data:
you will see the path to the current calibre library.
Now on the new computer, start calibre for the first time. It will run the
Welcome Wizard asking you for the location of the calibre library. Point it
:guilabel:`Welcome wizard` asking you for the location of the calibre library. Point it
to the previously copied folder. If the computer you are transferring to
already has a calibre installation, then the Welcome wizard wont run. In
already has a calibre installation, then the :guilabel:`Welcome wizard` wont run. In
that case, right-click the calibre icon in the toolbar and point it to the
newly copied directory. You will now have two calibre libraries on your
computer and you can switch between them by clicking the calibre icon on
@ -820,7 +820,7 @@ There can be several causes for this:
* If you get an error about a Python function terminating unexpectedly after upgrading calibre, first uninstall calibre, then delete the folders (if they exists)
:file:`C:\\Program Files\\Calibre` and :file:`C:\\Program Files\\Calibre2`. Now re-install and you should be fine.
* If you get an error in the welcome wizard on an initial run of calibre, try choosing a folder like :file:`C:\\library` as the calibre library (calibre sometimes
* If you get an error in the :guilabel:`Welcome wizard` on an initial run of calibre, try choosing a folder like :file:`C:\\library` as the calibre library (calibre sometimes
has trouble with library locations if the path contains non-English characters, or only numbers, etc.)
* Try running it as Administrator (Right click on the icon and select "Run as Administrator")
@ -939,7 +939,7 @@ I downloaded the installer, but it is not working?
Downloading from the Internet can sometimes result in a corrupted download. If the calibre installer you downloaded is not opening, try downloading it again. If re-downloading it does not work, download it from `an alternate location <https://github.com/kovidgoyal/calibre/releases/latest>`_. If the installer still doesn't work, then something on your computer is preventing it from running.
* Try temporarily disabling your antivirus program (Microsoft Security Essentials, or Kaspersky or Norton or McAfee or whatever). This is most likely the culprit if the upgrade process is hanging in the middle.
* Try rebooting your computer and running a registry cleaner like `Wise registry cleaner <http://www.wisecleaner.com>`_.
* Try rebooting your computer and running a registry cleaner like `Wise registry cleaner <https://www.wisecleaner.com>`_.
* Try a clean install. That is, uninstall calibre, delete :file:`C:\\Program Files\\Calibre2` (or wherever you previously chose to install calibre). Then re-install calibre. Note that uninstalling does not touch your books or settings.
* Try downloading the installer with an alternate browser. For example if you are using Internet Explorer, try using Firefox or Chrome instead.
* If you get an error about a missing DLL on Windows, then most likely, the

2
manual/gui.rst
View File

@ -281,7 +281,7 @@ Preferences
|cbi| The :guilabel:`Preferences` action allows you to change the way various aspects of calibre work. It has four variations, accessed by doing a right-click on the button.
1. **Preferences**: Allows you to change the way various aspects of calibre work. Clicking the button also performs this action.
2. **Run welcome wizard**: Allows you to start the Welcome Wizard which appeared the first time you started calibre.
2. **Run Welcome wizard**: Allows you to start the :guilabel:`Welcome wizard` which appeared the first time you started calibre.
3. **Get plugins to enhance calibre**: Opens a new window that shows plugins for calibre. These plugins are developed by third parties to extend calibre's functionality.
4. **Restart in debug mode**: Allows you to enable a debugging mode that can assist the calibre developers in solving problems you encounter with the program. For most users this should remain disabled unless instructed by a developer to enable it.

2
manual/simple_index.rst
View File

@ -9,7 +9,7 @@ You've just started calibre. What do you do now? Before calibre can do anything
.. image:: images/added_books.png
Once you've admired the list of books you just added to your heart's content, you'll probably want to read one. In order to do that you'll have to convert the book to a format your reader understands. When first running calibre, the Welcome Wizard starts and will set up calibre for your reader device. Conversion is a breeze. Just select the book you want to convert then click the "Convert books" button. Ignore all the options for now and click "OK". The little icon in the bottom right corner will start spinning. Once it's finished spinning, your converted book is ready. Click the "View" button to read the book.
Once you've admired the list of books you just added to your heart's content, you'll probably want to read one. In order to do that you'll have to convert the book to a format your reader understands. When first running calibre, the :guilabel:`Welcome wizard` starts and will set up calibre for your reader device. Conversion is a breeze. Just select the book you want to convert then click the "Convert books" button. Ignore all the options for now and click "OK". The little icon in the bottom right corner will start spinning. Once it's finished spinning, your converted book is ready. Click the "View" button to read the book.
If you want to read the book on your reader, connect it to the computer, wait till calibre detects it (10-20 seconds) and then click the "Send to device" button. Once the icon stops spinning again, disconnect your reader and read away! If you didn't convert the book in the previous step, calibre will auto convert it to the format your reader device understands.

2
src/calibre/gui2/actions/preferences.py
View File

@ -27,7 +27,7 @@ class PreferencesAction(InterfaceAction):
cm = partial(self.create_menu_action, pm)
if isosx:
pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
cm('welcome wizard', _('Run welcome &wizard'),
cm('welcome wizard', _('Run Welcome &wizard'),
icon='wizard.png', triggered=self.gui.run_wizard)
cm('plugin updater', _('Get plugins to enhance calibre'),
icon='plugins/plugin_updater.png', triggered=self.get_plugins)

5
src/calibre/gui2/preferences/main.py
View File

@ -239,7 +239,7 @@ class Preferences(QDialog):
self.bb.button(self.bb.Discard).clicked.connect(self.reject)
self.bb.button(self.bb.RestoreDefaults).setIcon(QIcon(I('clear_left.png')))
self.bb.button(self.bb.RestoreDefaults).clicked.connect(self.restore_defaults)
self.wizard_button = self.bb.addButton(_('Run welcome &wizard'), self.bb.ActionRole)
self.wizard_button = self.bb.addButton(_('Run Welcome &wizard'), self.bb.ActionRole)
self.wizard_button.setIcon(QIcon(I('wizard.png')))
self.wizard_button.clicked.connect(self.run_wizard, type=Qt.QueuedConnection)
self.wizard_button.setAutoDefault(False)
@ -311,8 +311,7 @@ class Preferences(QDialog):
self.scroll_area.setWidget(self.showing_widget)
self.stack.setCurrentIndex(1)
self.showing_widget.show()
self.setWindowTitle(__appname__ + ' - ' + _('Preferences') + ' - ' +
plugin.gui_name)
self.setWindowTitle(__appname__ + ' - ' + _('Preferences') + ' - ' + plugin.gui_name)
self.showing_widget.restart_now.connect(self.restart_now)
self.title_bar.show_plugin(plugin)
self.setWindowIcon(QIcon(plugin.icon))

5
src/calibre/gui2/wizard/__init__.py
View File

@ -726,8 +726,7 @@ class LibraryPage(QWizardPage, LibraryUI):
x = choose_dir(self, 'database location dialog',
_('Select location for books'))
if x:
if (iswindows and len(x) >
LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
if (iswindows and len(x) > LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT):
return error_dialog(self, _('Too long'),
_('Path to library too long. Must be less than'
' %d characters.')%(LibraryDatabase.WINDOWS_LIBRARY_PATH_LIMIT),
@ -852,7 +851,7 @@ class Wizard(QWizard):
def __init__(self, parent):
QWizard.__init__(self, parent)
self.setWindowTitle(__appname__+' '+_('welcome wizard'))
self.setWindowTitle(__appname__+' '+_('Welcome wizard'))
self.setPixmap(self.LogoPixmap, QIcon(I('library.png')).pixmap(48, 48))
self.setWizardStyle(self.ModernStyle)
self.device_page = DevicePage()