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 2017-06-18 22:45:30 +05:30
parent c7a98a0efc
commit 30f3edb45a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
9 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manual/creating_plugins.rst
View File

@ -35,7 +35,7 @@ the directory in which you created :file:`__init__.py`::
calibre-customize -b .
.. note::
On OS X, the command line tools are inside the calibre bundle, for example,
On macOS, the command line tools are inside the calibre bundle, for example,
if you installed calibre in :file:`/Applications` the command line tools
are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`.

4
manual/customize.rst
View File

@ -44,7 +44,7 @@ Environment variables
* ``http_proxy`` - Used on linux to specify an HTTP proxy
See `How to set environment variables in Windows <http://www.computerhope.com/issues/ch000549.htm>`_ or
`How to set environment variables in OS X <http://www.dowdandassociates.com/blog/content/howto-set-an-environment-variable-in-mac-os-x-launchd-plist/>`_.
`How to set environment variables in macOS <http://www.dowdandassociates.com/blog/content/howto-set-an-environment-variable-in-mac-os-x-launchd-plist/>`_.
Tweaks
------------
@ -67,7 +67,7 @@ calibre allows you to override the static resources, like icons, javascript and
templates for the metadata jacket, catalogs, etc. with customized versions that
you like. All static resources are stored in the resources sub-folder of the
calibre install location. On Windows, this is usually :file:`C:\\Program Files\\Calibre2\\resources`.
On OS X, :file:`/Applications/calibre.app/Contents/Resources/resources/`. On linux, if
On macOS, :file:`/Applications/calibre.app/Contents/Resources/resources/`. On linux, if
you are using the binary installer from the calibre website it will be
:file:`/opt/calibre/resources`. These paths can change depending on where you
choose to install calibre.

4
manual/develop.rst
View File

@ -186,7 +186,7 @@ near the top of the file. Now run the command :command:`calibredb`. The very fir
You can also setup a calibre development environment inside the free Microsoft
Visual Studio, if you like, following the instructions `here <https://www.mobileread.com/forums/showthread.php?t=251201>`_.
OS X development environment
macOS development environment
------------------------------
.. note:: You must also get the calibre source code separately as described above.
@ -225,7 +225,7 @@ Linux development environment
calibre is primarily developed on Linux. You have two choices in setting up the development environment. You can install the
calibre binary as normal and use that as a runtime environment to do your development. This approach is similar to that
used in Windows and OS X. Alternatively, you can install calibre from source. Instructions for setting up a development
used in Windows and macOS. Alternatively, you can install calibre from source. Instructions for setting up a development
environment from source are in the INSTALL file in the source tree. Here we will address using the binary as a runtime, which is the
recommended method.

16
manual/faq.rst
View File

@ -213,7 +213,7 @@ Follow these steps to find the problem:
You can tell what version of calibre you are currently running by looking
at the bottom line of the main calibre window.
* Ensure your operating system is seeing the device. That is, the device
should show up in Windows Explorer (in Windows) or Finder (in OS X).
should show up in Windows Explorer (in Windows) or Finder (in macOS).
* In calibre, go to :guilabel:`Preferences->Ignored Devices` and check that your device
is not being ignored
* If all the above steps fail, go to :guilabel:`Preferences->Miscellaneous` and click
@ -380,8 +380,8 @@ With the USB cable + iTunes
Use the 'Connect to iTunes' method in the 'Getting started' instructions in `Calibre + Apple iDevices: Start here <https://www.mobileread.com/forums/showthread.php?t=118559>`_.
This method only works on Windows Vista and higher, and OS X up to 10.8. Linux
is not supported (iTunes is not available in linux) and OS X newer than 10.8 is
This method only works on Windows Vista and higher, and macOS up to 10.8. Linux
is not supported (iTunes is not available in linux) and macOS newer than 10.8 is
not supported, as Apple removed the facility to use iTunes to manage books,
replacing it with iBooks.
@ -817,11 +817,11 @@ Take your pick:
calibre is pronounced as cal-i-ber *not* ca-li-bre. If you're wondering, calibre is the British/commonwealth spelling for caliber. Being Indian, that's the natural spelling for me.
Why does calibre show only some of my fonts on OS X?
Why does calibre show only some of my fonts on macOS?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
calibre embeds fonts in e-book files it creates. E-book files support embedding
only TrueType and OpenType (.ttf and .otf) fonts. Most fonts on OS X systems
only TrueType and OpenType (.ttf and .otf) fonts. Most fonts on macOS systems
are in .dfont format, thus they cannot be embedded. calibre shows only TrueType
and OpenType fonts found on your system. You can obtain many such fonts on the
web. Simply download the .ttf/.otf files and add them to the Library/Fonts
@ -939,10 +939,10 @@ some functionality, such as drag and drop to not work.
Finally, some users have reported that disabling UAC fixes the problem.
calibre is not starting/crashing on OS X?
calibre is not starting/crashing on macOS?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
One common cause of failures on OS X is the use of accessibility technologies
One common cause of failures on macOS is the use of accessibility technologies
that are incompatible with the graphics toolkit calibre uses. Try turning off
VoiceOver if you have it on. Also go to System Preferences->System->Universal
Access and turn off the setting for enabling access for assistive devices in
@ -957,7 +957,7 @@ be printed to it. If the debug output contains a line that looks like::
then the problem is probably a corrupted font cache. You can clear the cache by following these
`instructions <http://www.macworld.com/article/1139383/fontcacheclear.html>`_. If that doesn't
solve it, look for a corrupted font file on your system, in ~/Library/Fonts or the like. An easy way to
check for corrupted fonts in OS X is to start the "Font Book" application, select all fonts and then in the File
check for corrupted fonts in macOS is to start the "Font Book" application, select all fonts and then in the File
menu, choose "Validate fonts".

6
manual/gui.rst
View File

@ -271,7 +271,7 @@ Remove books
6. **Remove matching books from device**: Allows you to remove e-book files from a connected device that match the books that are selected in the book list.
.. note::
Note that when you use :guilabel:`Remove books` to delete books from your calibre library, the book record is permanently deleted, but on Windows and OS X the files are placed into the recycle bin. This allows you to recover them if you change your mind.
Note that when you use :guilabel:`Remove books` to delete books from your calibre library, the book record is permanently deleted, but on Windows and macOS the files are placed into the recycle bin. This allows you to recover them if you change your mind.
.. _configuration:
@ -640,7 +640,7 @@ calibre has several keyboard shortcuts to save you time and mouse movement. Thes
* - Keyboard shortcut
- Action
* - :kbd:`F2 (Enter in OS X)`
* - :kbd:`F2 (Enter in macOS)`
- Edit the metadata of the currently selected field in the book list.
* - :kbd:`A`
- Add Books
@ -674,7 +674,7 @@ calibre has several keyboard shortcuts to save you time and mouse movement. Thes
- Edit book
* - :kbd:`V`
- View
* - :kbd:`Alt+V/Cmd+V in OS X`
* - :kbd:`Alt+V/Cmd+V in macOS`
- View specific format
* - :kbd:`Alt+Shift+J`
- Toggle jobs list

2
manual/news.rst
View File

@ -309,7 +309,7 @@ Once the download is complete, you can look at the downloaded :term:`HTML` by op
If you're satisfied with your recipe, and you feel there is enough demand to justify its inclusion into the set of built-in recipes, post your recipe in the `calibre recipes forum <https://www.mobileread.com/forums/forumdisplay.php?f=228>`_ to share it with other calibre users.
.. note::
On OS X, the command line tools are inside the calibre bundle, for example,
On macOS, the command line tools are inside the calibre bundle, for example,
if you installed calibre in :file:`/Applications` the command line tools
are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`.

2
manual/simple_index.rst
View File

@ -3,7 +3,7 @@
calibre User Manual
===============================================
calibre is an e-book library manager. It can view, convert and catalog e-books in most of the major e-book formats. It can also talk to many e-book reader devices. It can go out to the Internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient reading. It is cross platform, running on Linux, Windows and OS X.
calibre is an e-book library manager. It can view, convert and catalog e-books in most of the major e-book formats. It can also talk to many e-book reader devices. It can go out to the Internet and fetch metadata for your books. It can download newspapers and convert them into e-books for convenient reading. It is cross platform, running on Linux, Windows and macOS.
You've just started calibre. What do you do now? Before calibre can do anything with your e-books, it first has to know about them. Drag and drop a few e-book files into calibre, or click the "Add books" button and browse for the e-books you want to work with. Once you've added the books, they will show up in the main view looking something like this:

2
manual/viewer.rst
View File

@ -15,7 +15,7 @@ Starting the E-book viewer
You can view any of the books in your calibre library by selecting the book and pressing the :guilabel:`View` button. This
will open up the book in the E-book viewer. You can also launch the E-book viewer by itself from the Start menu in Windows
or using the command :command:`ebook-viewer` in Linux and OS X (you have to install the command line tools on OS X
or using the command :command:`ebook-viewer` in Linux and macOS (you have to install the command line tools on macOS
first by going to :guilabel:`Preferences->Advanced->Miscellaneous`).
Navigating around an e-book

2
src/calibre/ebooks/conversion/plugins/txt_output.py
View File

@ -27,7 +27,7 @@ class TXTOutput(OutputFormatPlugin):
short_switch='n', choices=NEWLINE_TYPES,
help=_('Type of newline to use. Options are %s. Default is \'system\'. '
'Use \'old_mac\' for compatibility with Mac OS 9 and earlier. '
'For Mac OS X use \'unix\'. \'system\' will default to the newline '
'For macOS use \'unix\'. \'system\' will default to the newline '
'type used by this OS.') % sorted(NEWLINE_TYPES)),
OptionRecommendation(name='txt_output_encoding', recommended_value='utf-8',
level=OptionRecommendation.LOW,