From 59e6c349f010c64b078c883abbaec81eb26c23ea Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 23 May 2020 07:35:25 +0530 Subject: [PATCH] String changes --- manual/creating_plugins.rst | 2 +- manual/faq.rst | 2 +- src/calibre/devices/interface.py | 2 +- src/calibre/devices/usbms/device.py | 6 +++--- src/calibre/gui2/preferences/look_feel.ui | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/manual/creating_plugins.rst b/manual/creating_plugins.rst index ec78006a51..c2e32ede36 100644 --- a/manual/creating_plugins.rst +++ b/manual/creating_plugins.rst @@ -140,7 +140,7 @@ calibre's plugin loading system defines a couple of built-in functions that allo **get_resources(name_or_list_of_names)** This function should be called with a list of paths to files inside the ZIP file. For example to access the file icon.png in the directory images in the ZIP file, you would use: ``images/icon.png``. Always use a forward slash as the path separator, - even on windows. When you pass in a single name, the function will return the raw bytes of that file or None if the name + even on Windows. When you pass in a single name, the function will return the raw bytes of that file or None if the name was not found in the ZIP file. If you pass in more than one name then it returns a dict mapping the names to bytes. If a name is not found, it will not be present in the returned dict. diff --git a/manual/faq.rst b/manual/faq.rst index 976aeb1ce3..12dd31489d 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -946,7 +946,7 @@ If you want to backup the calibre configuration/plugins, you have to backup the How do I use purchased EPUB books with calibre (or what do I do with .acsm files)? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Most purchased EPUB books have :doc:`DRM `. This prevents calibre from opening them. You can still use calibre to store and transfer them to your e-book reader. First, you must authorize your reader on a windows machine with Adobe Digital Editions. Once this is done, EPUB books transferred with calibre will work fine on your reader. When you purchase an epub book from a website, you will get an ".acsm" file. This file should be opened with Adobe Digital Editions, which will then download the actual ".epub" e-book. The e-book file will be stored in the folder "My Digital Editions", from where you can add it to calibre. +Most purchased EPUB books have :doc:`DRM `. This prevents calibre from opening them. You can still use calibre to store and transfer them to your e-book reader. First, you must authorize your reader on a Windows machine with Adobe Digital Editions. Once this is done, EPUB books transferred with calibre will work fine on your reader. When you purchase an epub book from a website, you will get an ".acsm" file. This file should be opened with Adobe Digital Editions, which will then download the actual ".epub" e-book. The e-book file will be stored in the folder "My Digital Editions", from where you can add it to calibre. I am getting a "Permission Denied" error? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py index ce523d53ee..1b1071d534 100644 --- a/src/calibre/devices/interface.py +++ b/src/calibre/devices/interface.py @@ -273,7 +273,7 @@ class DevicePlugin(Plugin): :param connected_device: The device that we are trying to open. It is a tuple of (vendor id, product id, bcd, manufacturer name, product name, device serial number). However, some devices have no serial - number and on windows only the first three fields are present, the + number and on Windows only the first three fields are present, the rest are None. :param library_uuid: The UUID of the current calibre library. Can be diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py index 9f1d93ee88..2a474fd1d2 100644 --- a/src/calibre/devices/usbms/device.py +++ b/src/calibre/devices/usbms/device.py @@ -86,17 +86,17 @@ class Device(DeviceConfig, DevicePlugin): VENDOR_NAME = None - #: String identifying the main memory of the device in the windows PnP id + #: String identifying the main memory of the device in the Windows PnP id #: strings #: This can be None, string, list of strings or compiled regex WINDOWS_MAIN_MEM = None - #: String identifying the first card of the device in the windows PnP id + #: String identifying the first card of the device in the Windows PnP id #: strings #: This can be None, string, list of strings or compiled regex WINDOWS_CARD_A_MEM = None - #: String identifying the second card of the device in the windows PnP id + #: String identifying the second card of the device in the Windows PnP id #: strings #: This can be None, string, list of strings or compiled regex WINDOWS_CARD_B_MEM = None diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui index c758319824..1b47365a83 100644 --- a/src/calibre/gui2/preferences/look_feel.ui +++ b/src/calibre/gui2/preferences/look_feel.ui @@ -221,7 +221,7 @@ - Disable popup notifications when calibre completes jobs such a conversion, sending to device etc. The notifications are sent via the operating system notification facility, if available. Note that on windows, you have to enable the system tray icon for notifications to work. + Disable popup notifications when calibre completes jobs such a conversion, sending to device etc. The notifications are sent via the operating system notification facility, if available. Note that on Windows, you have to enable the system tray icon for notifications to work. Disable n&otifications on job completion