From 69b9cc5637d9abb4bc11b323fdd7dbb94a05a71a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 29 Jul 2017 11:23:15 +0530 Subject: [PATCH] String changes --- src/calibre/devices/hanvon/driver.py | 11 +++++------ src/calibre/devices/iliad/driver.py | 2 +- src/calibre/devices/irexdr/driver.py | 3 +-- src/calibre/devices/jetbook/driver.py | 4 +--- src/calibre/devices/kindle/driver.py | 6 +++--- src/calibre/devices/nook/driver.py | 4 ++-- src/calibre/devices/nuut2/driver.py | 4 +--- src/calibre/devices/prst1/driver.py | 2 +- src/calibre/devices/sne/driver.py | 4 +--- src/calibre/devices/usbms/driver.py | 2 +- src/calibre/gui2/dialogs/quickview.py | 2 +- src/calibre/gui2/lrf_renderer/main.ui | 2 +- src/calibre/library/database2.py | 2 +- 13 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py index 90258862cc..c701477706 100644 --- a/src/calibre/devices/hanvon/driver.py +++ b/src/calibre/devices/hanvon/driver.py @@ -22,7 +22,7 @@ class N516(USBMS): name = 'N516 driver' gui_name = 'N516' - description = _('Communicate with the Hanvon N520 eBook reader.') + description = _('Communicate with the Hanvon N520 e-book reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] @@ -49,7 +49,7 @@ class KIBANO(N516): name = 'Kibano driver' gui_name = 'Kibano' - description = _('Communicate with the Kibano eBook reader.') + description = _('Communicate with the Kibano e-book reader.') FORMATS = ['epub', 'pdf', 'txt'] BCD = [0x323] @@ -90,7 +90,7 @@ class ALEX(N516): name = 'Alex driver' gui_name = 'SpringDesign Alex' - description = _('Communicate with the SpringDesign Alex eBook reader.') + description = _('Communicate with the SpringDesign Alex e-book reader.') author = 'Kovid Goyal' FORMATS = ['epub', 'fb2', 'pdf'] @@ -172,7 +172,7 @@ class AZBOOKA(ALEX): class EB511(USBMS): name = 'Elonex EB 511 driver' gui_name = 'EB 511' - description = _('Communicate with the Elonex EB 511 eBook reader.') + description = _('Communicate with the Elonex EB 511 e-book reader.') author = 'Kovid Goyal' supported_platforms = ['windows', 'osx', 'linux'] @@ -193,7 +193,7 @@ class EB511(USBMS): class ODYSSEY(N516): name = 'Cybook Odyssey driver' gui_name = 'Odyssey' - description = _('Communicate with the Cybook Odyssey eBook reader.') + description = _('Communicate with the Cybook Odyssey e-book reader.') BCD = [0x316] VENDOR_NAME = ['LINUX', 'BOOKEEN'] @@ -207,4 +207,3 @@ class ODYSSEY(N516): if for_upload: return self.EBOOK_DIR_MAIN return '' - diff --git a/src/calibre/devices/iliad/driver.py b/src/calibre/devices/iliad/driver.py index 24d8610dce..29342de696 100644 --- a/src/calibre/devices/iliad/driver.py +++ b/src/calibre/devices/iliad/driver.py @@ -14,7 +14,7 @@ from calibre.devices.usbms.driver import USBMS class ILIAD(USBMS): name = 'IRex Iliad Device Interface' - description = _('Communicate with the IRex Iliad eBook reader.') + description = _('Communicate with the IRex Iliad e-book reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] diff --git a/src/calibre/devices/irexdr/driver.py b/src/calibre/devices/irexdr/driver.py index c75e56f164..8e53afa841 100644 --- a/src/calibre/devices/irexdr/driver.py +++ b/src/calibre/devices/irexdr/driver.py @@ -14,7 +14,7 @@ from calibre.devices.usbms.driver import USBMS class IREXDR1000(USBMS): name = 'IRex Digital Reader 1000 Device Interface' - description = _('Communicate with the IRex Digital Reader 1000 eBook ' + description = _('Communicate with the IRex Digital Reader 1000 e-book ' 'reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] @@ -49,4 +49,3 @@ class IREXDR800(IREXDR1000): EBOOK_DIR_MAIN = '' DELETE_EXTS = [] SUPPORTS_SUB_DIRS = True - diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index ebae2e56a4..ffceb338e8 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -18,7 +18,7 @@ from calibre.ebooks.metadata import string_to_authors class JETBOOK(USBMS): name = 'Ectaco JetBook Device Interface' - description = _('Communicate with the JetBook eBook reader.') + description = _('Communicate with the JetBook e-book reader.') author = 'James Ralston' supported_platforms = ['windows', 'osx', 'linux'] @@ -152,5 +152,3 @@ set([(u'0x951', EBOOK_DIR_MAIN = 'My Books' SUPPORTS_SUB_DIRS = True - - diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py index 3a293c07a4..326df80f50 100644 --- a/src/calibre/devices/kindle/driver.py +++ b/src/calibre/devices/kindle/driver.py @@ -43,7 +43,7 @@ class KINDLE(USBMS): name = 'Kindle Device Interface' gui_name = 'Amazon Kindle' icon = I('devices/kindle.png') - description = _('Communicate with the Kindle eBook reader.') + description = _('Communicate with the Kindle e-book reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] @@ -319,7 +319,7 @@ class KINDLE(USBMS): class KINDLE2(KINDLE): name = 'Kindle 2/3/4/Touch/PaperWhite/Voyage Device Interface' - description = _('Communicate with the Kindle 2/3/4/Touch/PaperWhite/Voyage eBook reader.') + description = _('Communicate with the Kindle 2/3/4/Touch/PaperWhite/Voyage e-book reader.') FORMATS = ['azw', 'mobi', 'azw3', 'prc', 'azw1', 'tpz', 'azw4', 'kfx', 'pobi', 'pdf', 'txt'] DELETE_EXTS = KINDLE.DELETE_EXTS + ['.mbp1', '.mbs', '.sdr', '.han'] @@ -552,7 +552,7 @@ class KINDLE2(KINDLE): class KINDLE_DX(KINDLE2): name = 'Kindle DX Device Interface' - description = _('Communicate with the Kindle DX eBook reader.') + description = _('Communicate with the Kindle DX e-book reader.') FORMATS = ['azw', 'mobi', 'prc', 'azw1', 'tpz', 'azw4', 'pobi', 'pdf', 'txt'] PRODUCT_ID = [0x0003] diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py index 7ee1919b52..96dc7c73a5 100644 --- a/src/calibre/devices/nook/driver.py +++ b/src/calibre/devices/nook/driver.py @@ -20,7 +20,7 @@ class NOOK(USBMS): name = 'Nook Device Interface' gui_name = _('The Nook') - description = _('Communicate with the Nook eBook reader.') + description = _('Communicate with the Nook e-book reader.') author = 'John Schember' icon = I('devices/nook.png') supported_platforms = ['windows', 'linux', 'osx'] @@ -85,7 +85,7 @@ class NOOK(USBMS): class NOOK_COLOR(NOOK): name = 'Nook Color Device Interface' - description = _('Communicate with the Nook Color, TSR, Glowlight and Tablet eBook readers.') + description = _('Communicate with the Nook Color, TSR, Glowlight and Tablet e-book readers.') PRODUCT_ID = [ 0x002, 0x003, 0x004, diff --git a/src/calibre/devices/nuut2/driver.py b/src/calibre/devices/nuut2/driver.py index 05bf8b3276..9cb85bf66f 100644 --- a/src/calibre/devices/nuut2/driver.py +++ b/src/calibre/devices/nuut2/driver.py @@ -15,7 +15,7 @@ class NUUT2(USBMS): name = 'Nuut2 Device Interface' gui_name = 'NeoLux Nuut2' - description = _('Communicate with the Nuut2 eBook reader.') + description = _('Communicate with the Nuut2 e-book reader.') author = _('Kovid Goyal') supported_platforms = ['windows', 'osx', 'linux'] @@ -37,5 +37,3 @@ class NUUT2(USBMS): EBOOK_DIR_MAIN = 'books' SUPPORTS_SUB_DIRS = True - - diff --git a/src/calibre/devices/prst1/driver.py b/src/calibre/devices/prst1/driver.py index 408e557051..083991d1a6 100644 --- a/src/calibre/devices/prst1/driver.py +++ b/src/calibre/devices/prst1/driver.py @@ -74,7 +74,7 @@ class PRST1(USBMS): 'series, tags, authors', _('Upload separate cover thumbnails for books') + ':::'+_('Normally, the SONY readers get the cover image from the' - ' ebook file itself. With this option, calibre will send a ' + ' e-book file itself. With this option, calibre will send a ' 'separate cover image to the reader, useful if you are ' 'sending DRMed books in which you cannot change the cover.'), _('Refresh separate covers when using automatic management') + diff --git a/src/calibre/devices/sne/driver.py b/src/calibre/devices/sne/driver.py index 0195b03fe2..1b0b09cc1a 100644 --- a/src/calibre/devices/sne/driver.py +++ b/src/calibre/devices/sne/driver.py @@ -15,7 +15,7 @@ class SNE(USBMS): name = 'Samsung SNE Device Interface' gui_name = 'Samsung SNE' - description = _('Communicate with the Samsung SNE eBook reader.') + description = _('Communicate with the Samsung SNE e-book reader.') author = 'Kovid Goyal' supported_platforms = ['windows', 'osx', 'linux'] @@ -35,5 +35,3 @@ class SNE(USBMS): EBOOK_DIR_MAIN = EBOOK_DIR_CARD_A = 'Books' SUPPORTS_SUB_DIRS = True - - diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index ef93196818..abd9228f75 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -81,7 +81,7 @@ class USBMS(CLI, Device): sending/getting/updating metadata/caching metadata/etc. ''' - description = _('Communicate with an eBook reader.') + description = _('Communicate with an e-book reader.') author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] diff --git a/src/calibre/gui2/dialogs/quickview.py b/src/calibre/gui2/dialogs/quickview.py index 34bc7cf723..43e8cba572 100644 --- a/src/calibre/gui2/dialogs/quickview.py +++ b/src/calibre/gui2/dialogs/quickview.py @@ -485,7 +485,7 @@ class Quickview(QDialog, Ui_Quickview): tt = ('

' + _('Double click on a book to change the selection in the library view or ' 'change the column shown in the left-hand pane. ' - 'Shift- or control-double-click to edit the metadata of a book, ' + 'Shift- or Control- double click to edit the metadata of a book, ' 'which also changes the selected book.' ) + '

') for row, b in enumerate(books): diff --git a/src/calibre/gui2/lrf_renderer/main.ui b/src/calibre/gui2/lrf_renderer/main.ui index c37eff4451..f499e311ba 100644 --- a/src/calibre/gui2/lrf_renderer/main.ui +++ b/src/calibre/gui2/lrf_renderer/main.ui @@ -187,7 +187,7 @@ :/images/document_open.png:/images/document_open.png - Open ebook + Open e-book diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py index 14a77a3492..1f635bd763 100644 --- a/src/calibre/library/database2.py +++ b/src/calibre/library/database2.py @@ -3653,7 +3653,7 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns): def migrate_old(self, db, progress): from PyQt5.QtCore import QCoreApplication - header = _(u'

Migrating old database to ebook library in %s

')%self.library_path + header = u'

Migrating old database to ebook library in %s

'%self.library_path progress.setValue(0) progress.setLabelText(header) QCoreApplication.processEvents()