diff --git a/Changelog.txt b/Changelog.txt index 0cbba97e8e..677b3547e8 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -251,7 +251,7 @@ Only works with output formats such as EPUB that support CSS transforms - Fix calibre-server not exiting on Ctrl+c on Windows -- [1897410] Content server OPDS feeds: Fix error if the metadata for a book contains particular unicode characters. +- [1897410] Content server OPDS feeds: Fix error if the metadata for a book contains particular Unicode characters. - [1898167] Edit book: Reports tool: Fix a regression that broke sorting. diff --git a/manual/conversion.rst b/manual/conversion.rst index 6728383dd2..848390c4d9 100644 --- a/manual/conversion.rst +++ b/manual/conversion.rst @@ -736,7 +736,7 @@ Some limitations of PDF input are: * Extraction of vector images and tables from within the document is also not supported. * Some PDFs use special glyphs to represent ll or ff or fi, etc. Conversion of these may or may not work depending on just how they are represented internally in the PDF. * Links and Tables of Contents are not supported - * PDFs that use embedded non-unicode fonts to represent non-English characters will result in garbled output for those characters + * PDFs that use embedded non-Unicode fonts to represent non-English characters will result in garbled output for those characters * Some PDFs are made up of photographs of the page with OCRed text behind them. In such cases calibre uses the OCRed text, which can be very different from what you see when you view the PDF file * PDFs that are used to display complex text, like right to left languages and math typesetting will not convert correctly diff --git a/manual/edit.rst b/manual/edit.rst index 32e6988720..2740b19fd9 100644 --- a/manual/edit.rst +++ b/manual/edit.rst @@ -689,7 +689,7 @@ Inserting special characters ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ You can insert characters that are difficult to type by using the -:guilabel:`Edit->Insert special character` tool. This shows you all unicode +:guilabel:`Edit->Insert special character` tool. This shows you all Unicode characters, simply click on the character you want to type. If you hold Ctrl while clicking, the window will close itself after inserting the selected character. This tool can be used to insert special characters into the main @@ -704,7 +704,7 @@ favorites by clicking the :guilabel:`Re-arrange favorites` button and then drag and dropping the characters in favorites around. You can also directly type in special characters using the keyboard. To do -this, you type the unicode code for the character (in hexadecimal) and then +this, you type the Unicode code for the character (in hexadecimal) and then press the :guilabel:`Alt+X` key which will convert the previously typed code into the corresponding character. For example, to type ΓΏ you would type ff and then Alt+X. To type a non-breaking space you would use a0 and then diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py index a22ab91f36..6f32723c52 100644 --- a/src/calibre/devices/smart_device_app/driver.py +++ b/src/calibre/devices/smart_device_app/driver.py @@ -310,7 +310,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): _('Use this option if you want to force the driver to listen on a ' 'particular IP address. The driver will listen only on the ' 'entered address, and this address will be the one advertized ' - 'over mDNS (bonjour).') + '

', + 'over mDNS (BonJour).') + '

', _('Replace books with same calibre ID') + ':::

' + _('Use this option to overwrite a book on the device if that book ' 'has the same calibre identifier as the book being sent. The file name of the ' diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py index 77dedb13b7..684806dd2d 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -529,9 +529,9 @@ OptionRecommendation(name='read_metadata_from_opf', OptionRecommendation(name='asciiize', recommended_value=False, level=OptionRecommendation.LOW, - help=(_('Transliterate unicode characters to an ASCII ' + help=(_('Transliterate Unicode characters to an ASCII ' 'representation. Use with care because this will replace ' - 'unicode characters with ASCII. For instance it will replace "%s" ' + 'Unicode characters with ASCII. For instance it will replace "%s" ' 'with "Mikhail Gorbachiov". Also, note that in ' 'cases where there are multiple representations of a character ' '(characters shared by Chinese and Japanese for instance) the ' diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui index a598fa8d34..594bebb8c5 100644 --- a/src/calibre/gui2/convert/look_and_feel.ui +++ b/src/calibre/gui2/convert/look_and_feel.ui @@ -247,7 +247,7 @@ - &Transliterate unicode characters to ASCII + &Transliterate Unicode characters to ASCII diff --git a/src/calibre/gui2/preferences/template_functions.py b/src/calibre/gui2/preferences/template_functions.py index de1783917a..c2ff065e76 100644 --- a/src/calibre/gui2/preferences/template_functions.py +++ b/src/calibre/gui2/preferences/template_functions.py @@ -31,7 +31,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): functions are usable. The function must be named evaluate, and must have the signature shown below.

evaluate(self, formatter, kwargs, mi, locals, your parameters) - → returning a unicode string

+ → returning a Unicode string

The parameters of the evaluate function are: