String changes

This commit is contained in:
Kovid Goyal 2017-06-19 18:23:02 +05:30
parent 1d3c4f31a0
commit 0e173abfbf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
10 changed files with 15 additions and 16 deletions

View File

@ -1175,7 +1175,7 @@
- title: "Amazon metadata download: Recognize common patterns of embedding the series name after the title and remove it automatically" - title: "Amazon metadata download: Recognize common patterns of embedding the series name after the title and remove it automatically"
- title: "Edit book: Add support for EPUB 3 to the Table of Contents tool. Now when editing EPUB 3 files using the tool will automatically generate both the EPUB 3 navigation document and the NCX table of contents for backwards compatibility" - title: "Edit book: Add support for EPUB 3 to the Table of Contents tool. Now when editing EPUB 3 files using the tool will automatically generate both the EPUB 3 navigation document and the NCX Table of Contents for backwards compatibility"
- title: "EPUB input: Implement reading of Table of Contents from EPUB 3 files that do not specify a fallback NCX ToC" - title: "EPUB input: Implement reading of Table of Contents from EPUB 3 files that do not specify a fallback NCX ToC"

View File

@ -458,9 +458,9 @@ maximum_cover_size = (1650, 2200)
# the files will be sent to the location with the most free space. # the files will be sent to the location with the most free space.
send_news_to_device_location = "main" send_news_to_device_location = "main"
#: Unified toolbar on OS X #: Unified toolbar on macOS
# If you enable this option and restart calibre, the toolbar will be 'unified' # If you enable this option and restart calibre, the toolbar will be 'unified'
# with the titlebar as is normal for OS X applications. However, doing this has # with the titlebar as is normal for macOS applications. However, doing this has
# various bugs, for instance the minimum width of the toolbar becomes twice # various bugs, for instance the minimum width of the toolbar becomes twice
# what it should be and it causes other random bugs on some systems, so turn it # what it should be and it causes other random bugs on some systems, so turn it
# on at your own risk! # on at your own risk!

View File

@ -62,7 +62,7 @@ class USBDevice:
return False return False
if man == self.manufacturer and prod == self.product: if man == self.manufacturer and prod == self.product:
return True return True
# As of OS X 10.11.4 Apple started mangling the names returned via the # As of macOS 10.11.4 Apple started mangling the names returned via the
# IOKit registry. See # IOKit registry. See
# https://www.mobileread.com/forums/showthread.php?t=273213 # https://www.mobileread.com/forums/showthread.php?t=273213
m = osx_sanitize_name_pat.sub('_', (self.manufacturer or '')) m = osx_sanitize_name_pat.sub('_', (self.manufacturer or ''))
@ -101,7 +101,7 @@ class Device(DeviceConfig, DevicePlugin):
#: Used by the new driver detection to disambiguate main memory from #: Used by the new driver detection to disambiguate main memory from
#: storage cards. Should be a regular expression that matches the #: storage cards. Should be a regular expression that matches the
#: main memory mount point assigned by OS X #: main memory mount point assigned by macOS
OSX_MAIN_MEM_VOL_PAT = None OSX_MAIN_MEM_VOL_PAT = None
OSX_EJECT_COMMAND = ['diskutil', 'eject'] OSX_EJECT_COMMAND = ['diskutil', 'eject']

View File

@ -65,7 +65,7 @@ class IncorrectToc(BaseError):
self.HELP = _('There is no item with id="%s" in the manifest.') % bad_idref self.HELP = _('There is no item with id="%s" in the manifest.') % bad_idref
else: else:
msg = _('The item identified as the Table of Contents has an incorrect media-type (%s)') % bad_mimetype msg = _('The item identified as the Table of Contents has an incorrect media-type (%s)') % bad_mimetype
self.HELP = _('The media type for the table of contents must be %s') % guess_type('a.ncx') self.HELP = _('The media type for the Table of Contents must be %s') % guess_type('a.ncx')
BaseError.__init__(self, msg, name, lnum) BaseError.__init__(self, msg, name, lnum)

View File

@ -379,7 +379,7 @@ def from_xpaths(container, xpaths):
Generate a Table of Contents from a list of XPath expressions. Each Generate a Table of Contents from a list of XPath expressions. Each
expression in the list corresponds to a level of the generate ToC. For expression in the list corresponds to a level of the generate ToC. For
example: :code:`['//h:h1', '//h:h2', '//h:h3']` will generate a three level example: :code:`['//h:h1', '//h:h2', '//h:h3']` will generate a three level
table of contents from the ``<h1>``, ``<h2>`` and ``<h3>`` tags. Table of Contents from the ``<h1>``, ``<h2>`` and ``<h3>`` tags.
''' '''
tocroot = TOC() tocroot = TOC()
xpaths = [XPath(xp) for xp in xpaths] xpaths = [XPath(xp) for xp in xpaths]
@ -771,7 +771,7 @@ def toc_to_html(toc, container, toc_name, title, lang=None):
def create_inline_toc(container, title=None): def create_inline_toc(container, title=None):
''' '''
Create an inline (HTML) Table of Contents from an existing NCX table of contents. Create an inline (HTML) Table of Contents from an existing NCX Table of Contents.
:param title: The title for this table of contents. :param title: The title for this table of contents.
''' '''

View File

@ -139,7 +139,7 @@ if iswindows:
# }}} # }}}
elif isosx: elif isosx:
# OS X {{{ # macOS {{{
oprefs = JSONConfig('osx_open_with') oprefs = JSONConfig('osx_open_with')
from calibre.utils.open_with.osx import find_programs, get_icon, entry_to_cmdline, get_bundle_data from calibre.utils.open_with.osx import find_programs, get_icon, entry_to_cmdline, get_bundle_data
@ -171,7 +171,7 @@ elif isosx:
app = get_bundle_data(ans) app = get_bundle_data(ans)
if app is None: if app is None:
return error_dialog(parent, _('Invalid Application'), _( return error_dialog(parent, _('Invalid Application'), _(
'%s is not a valid OS X application bundle.') % ans, show=True) '%s is not a valid macOS application bundle.') % ans, show=True)
return app return app
if not os.access(ans, os.X_OK): if not os.access(ans, os.X_OK):
error_dialog(parent, _('Cannot execute'), _( error_dialog(parent, _('Cannot execute'), _(

View File

@ -88,7 +88,7 @@
<item row="0" column="1" colspan="2"> <item row="0" column="1" colspan="2">
<widget class="QGroupBox" name="groupBox_2"> <widget class="QGroupBox" name="groupBox_2">
<property name="title"> <property name="title">
<string>Downloaded metadata fields</string> <string>Metadata fields to download</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">

View File

@ -316,7 +316,7 @@ class SearchDialog(QDialog, Ui_Dialog):
v = QVBoxLayout(d) v = QVBoxLayout(d)
button_box.accepted.connect(d.accept) button_box.accepted.connect(d.accept)
button_box.rejected.connect(d.reject) button_box.rejected.connect(d.reject)
d.setWindowTitle(_('Customize get books search')) d.setWindowTitle(_('Customize Get books search'))
tab_widget = QTabWidget(d) tab_widget = QTabWidget(d)
v.addWidget(tab_widget) v.addWidget(tab_widget)
@ -437,6 +437,7 @@ class SearchDialog(QDialog, Ui_Dialog):
self.do_search() self.do_search()
return QDialog.exec_(self) return QDialog.exec_(self)
if __name__ == '__main__': if __name__ == '__main__':
from calibre.gui2 import Application from calibre.gui2 import Application
from calibre.gui2.preferences.main import init_gui from calibre.gui2.preferences.main import init_gui
@ -447,5 +448,3 @@ if __name__ == '__main__':
s = SearchDialog(gui, query=' '.join(sys.argv[1:])) s = SearchDialog(gui, query=' '.join(sys.argv[1:]))
s.exec_() s.exec_()

View File

@ -831,7 +831,7 @@ class InsertSemantics(Dialog):
d = info_dialog(self, _('About semantics'), _( d = info_dialog(self, _('About semantics'), _(
'Semantics refer to additional information about specific locations in the book.' 'Semantics refer to additional information about specific locations in the book.'
' For example, you can specify that a particular location is the dedication or the preface' ' For example, you can specify that a particular location is the dedication or the preface'
' or the table of contents and so on.\n\nFirst choose the type of semantic information, then' ' or the Table of Contents and so on.\n\nFirst choose the type of semantic information, then'
' choose a file and optionally a location within the file to point to.\n\nThe' ' choose a file and optionally a location within the file to point to.\n\nThe'
' semantic information will be written in the <guide> section of the opf file.')) ' semantic information will be written in the <guide> section of the opf file.'))
d.resize(d.sizeHint()) d.resize(d.sizeHint())

View File

@ -1139,7 +1139,7 @@ def main():
def cli_index_strings(): def cli_index_strings():
return _('Command Line Interface'), _( return _('Command Line Interface'), _(
'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' ' if you installed calibre in :file:`/Applications` the command line tools'
' are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`.'), _( ' are in :file:`/Applications/calibre.app/Contents/console.app/Contents/MacOS/`.'), _(
'Documented commands'), _('Undocumented commands'), _( 'Documented commands'), _('Undocumented commands'), _(