From 08887c9a2713a08f6ea4e9b539d1f89d4211a19f Mon Sep 17 00:00:00 2001 From: Tom Scholl Date: Mon, 28 Mar 2011 21:17:32 +0000 Subject: [PATCH 01/19] Minor fixes to news recipes idnes and smith --- recipes/idnes.recipe | 2 +- recipes/smith.recipe | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/idnes.recipe b/recipes/idnes.recipe index 0bd4de2327..238c90694c 100644 --- a/recipes/idnes.recipe +++ b/recipes/idnes.recipe @@ -34,7 +34,7 @@ class iHeuteRecipe(BasicNewsRecipe): dict(name='table', attrs={'class':['video-16ku9']})] remove_tags_after = [dict(name='div',attrs={'id':['related','related2']})] - keep_only_tags = [dict(name='div', attrs={'class':['art-full adwords-text','dil-day']}) + keep_only_tags = [dict(name='div', attrs={'class':['art-full adwords-text','dil-day','art-full']}) ,dict(name='table',attrs={'class':['kemel-box']})] def print_version(self, url): diff --git a/recipes/smith.recipe b/recipes/smith.recipe index 98f7d98517..06075b8d1b 100644 --- a/recipes/smith.recipe +++ b/recipes/smith.recipe @@ -7,6 +7,7 @@ class SmithsonianMagazine(BasicNewsRecipe): __author__ = 'Krittika Goyal' oldest_article = 31#days max_articles_per_feed = 50 + use_embedded_content = False #encoding = 'latin1' recursions = 1 match_regexps = ['&page=[2-9]$'] From 50cf91b836fdfdad8d2354ed77754d1d1dd9def6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Apr 2011 11:41:27 -0600 Subject: [PATCH 02/19] version 0.7.53 --- Changelog.yaml | 69 ++++++++++++++++++++++++++++++++++++++++ src/calibre/constants.py | 2 +- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index 2298912ecf..f6493d48a9 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -19,6 +19,75 @@ # new recipes: # - title: +- version: 0.7.53 + date: 2011-04-01 + + new features: + - title: "Email delivery: You can now specify a subject that calibre will use when sending emails per email account, configured in Preferences->Sending by email. The subject is a template of the same kind used in Save to Disk, etc. So youcan specift the title/authors/series/whatever in the template." + tickets: [743535] + + - title: "Apple driver: When an iDevice is detected, inform the user about the Connect to iTunes method instead of trying to connect directly to the device, as the latter can be buggy. See http://www.mobileread.com/forums/showthread.php?t=127883 for details" + + - title: "SONY driver: Search for books on the device in all directories not just database/media/books. This can be turned off by customizing the SONY plugin in Preferences->Plugins" + + - title: "EPUB Output: Remove any margins specified via an Adobe page template in the input document. This means that the margins psecified in calibre are more likely to be the actual margins used." + + - title: "When reading metadata from filenames, allow publisher and published date to be read from the filename" + tickets: [744020] + + - title: "Remove the option to show a second tool bar from Preferences->Look & Feel. Instead go to Preferences->Toolbars and add items to the second toolbar to control exactly what is visible there." + tickets: [742686] + + - title: "Add a tweak that can be used to have the calibre content server listen for IPv6 connections." + tickets: [743486] + + - title: "When clicking Next or Previous in the edit metadata dialog, then active book in the main book list is also changed" + tickets: [743533] + + - title: "Remember the previously used setting for Match all/Match any under the Tag Browser when calibre restarts" + tickets: [743645] + + - title: "FB2 Output: Option to set the FB2 genre explicitly." + tickets: [743178] + + bug fixes: + - title: "Fix text color in the search bar set to black instead of the system font color" + tickets: [746846] + + - title: "Workaround for Word bug where Word uses gb2312 as the encoding when exporting CHinese docs to HTML istead of gbk" + tickets: [745428] + + - title: "Make sorting on the device view faster and more robust." + tickets: [742626] + + - title: "E-book viewer: Fix viewer losing place in very long single file documents when window resized." + tickets: [745001] + + - title: "MOBI Output: Workaround for Amazon's MOBI renderer not rendering top margins on ul and ol tags." + tickets: [744365] + + - title: "EPUB Input: Workaround for invalid EPUBs produced by someone named 'ibooks, Inc.'." + tickets: [744122] + + - title: "RTF Input: Handle RTF files with too many levels of list nesting." + tickets: [743243] + + improved recipes: + - Irish Times + - LifeHacker + - Estadao + - Folha de Sao Paulo + + new recipes: + - title: Financieele Dagblad + author: marvin_2 + + - title: "Prost Amerika, WV Hooligan and SB Nation" + author: rylsfan + + - title: "Cracked.com" + author: Nudgenudge + - version: 0.7.52 date: 2011-03-25 diff --git a/src/calibre/constants.py b/src/calibre/constants.py index ff9895657d..10782f85c8 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -2,7 +2,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = 'calibre' -__version__ = '0.7.52' +__version__ = '0.7.53' __author__ = "Kovid Goyal " import re, importlib From 04f67b272b0953790c0c9fe11e5a8dcb0d87da23 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Apr 2011 13:12:41 -0600 Subject: [PATCH 03/19] IGN:Tag release --- setup/upload.py | 2 +- src/calibre/ebooks/pdf/reflow.cpp | 2 +- src/calibre/translations/calibre.pot | 1065 ++++++++++++++------------ 3 files changed, 556 insertions(+), 513 deletions(-) diff --git a/setup/upload.py b/setup/upload.py index 4fd388ce43..57c8e4cd54 100644 --- a/setup/upload.py +++ b/setup/upload.py @@ -356,7 +356,7 @@ class UploadUserManual(Command): # {{{ zf.write(os.path.join(x, y)) bname = self.b(path) + '_plugin.zip' dest = '%s/%s'%(DOWNLOADS, bname) - subprocess.check_call(['scp', f.name, dest]) + subprocess.check_call(['scp', f.name, 'divok:'+dest]) def run(self, opts): path = self.j(self.SRC, 'calibre', 'manual', 'plugin_examples') diff --git a/src/calibre/ebooks/pdf/reflow.cpp b/src/calibre/ebooks/pdf/reflow.cpp index c9d42dd671..65b5de6ae0 100644 --- a/src/calibre/ebooks/pdf/reflow.cpp +++ b/src/calibre/ebooks/pdf/reflow.cpp @@ -721,7 +721,7 @@ Reflow::render(int first_page, int last_page) { globalParams->setTextEncoding(encoding); int doc_pages = doc->getNumPages(); - if (last_page < 1 or last_page > doc_pages) last_page = doc_pages; + if (last_page < 1 || last_page > doc_pages) last_page = doc_pages; if (first_page < 1) first_page = 1; if (first_page > last_page) first_page = last_page; diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 4c6f30f4d9..e7dceffcf1 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: calibre 0.7.52\n" -"POT-Creation-Date: 2011-03-25 19:03+MDT\n" -"PO-Revision-Date: 2011-03-25 19:03+MDT\n" +"Project-Id-Version: calibre 0.7.53\n" +"POT-Creation-Date: 2011-04-01 11:59+MDT\n" +"PO-Revision-Date: 2011-04-01 11:59+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -15,11 +15,11 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:43 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56 msgid "Does absolutely nothing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:46 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:59 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:87 #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:88 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74 @@ -30,7 +30,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:71 #: /home/kovid/work/calibre/src/calibre/devices/prs500/books.py:267 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:660 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:461 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:467 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:98 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:101 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56 @@ -47,9 +47,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:31 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:32 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:74 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:424 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:429 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:426 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:431 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:36 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/ereader.py:61 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54 @@ -69,7 +69,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:91 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rtf.py:101 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/snb.py:16 -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:34 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:35 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/google.py:81 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txt.py:18 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/txtz.py:23 @@ -115,19 +115,19 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:102 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:313 #: /home/kovid/work/calibre/src/calibre/ebooks/rtf/input.py:315 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:308 -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:315 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:311 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:318 #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:155 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:332 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:335 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:334 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:337 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/convert/__init__.py:42 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:151 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:153 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1108 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1111 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1116 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:56 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:68 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47 @@ -135,12 +135,12 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:185 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:734 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:366 -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:235 -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:430 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:449 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:999 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:236 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:252 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:429 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:448 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1013 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1187 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:185 @@ -151,11 +151,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/database2.py:495 #: /home/kovid/work/calibre/src/calibre/library/database2.py:503 #: /home/kovid/work/calibre/src/calibre/library/database2.py:514 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1776 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1900 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2889 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2891 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3024 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1777 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1901 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2890 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2892 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3025 #: /home/kovid/work/calibre/src/calibre/library/server/mobile.py:233 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:156 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:159 @@ -169,46 +169,46 @@ msgstr "" msgid "Unknown" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:64 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:77 msgid "Base" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:135 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148 msgid "Customize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:143 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:156 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:42 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:47 msgid "Cannot configure" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:305 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:318 msgid "File type" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:341 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:354 msgid "Metadata reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:371 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:384 msgid "Metadata writer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:401 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:414 msgid "Catalog generator" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:510 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:523 msgid "User Interface Action" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:536 +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:557 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:18 #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:23 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:190 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:280 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:302 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:307 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206 msgid "Preferences" msgstr "" @@ -312,7 +312,7 @@ msgid "Add/remove your own columns to the calibre book list" msgstr "" #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:856 -msgid "Customize the toolbar" +msgid "Toolbar" msgstr "" #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:862 @@ -320,7 +320,7 @@ msgid "Customize the toolbars and context menus, changing which actions are avai msgstr "" #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:868 -msgid "Customize searching" +msgid "Searching" msgstr "" #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874 @@ -606,35 +606,31 @@ msgstr "" msgid "This profile is intended for the Sanda Bambook." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:35 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26 msgid "Installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:36 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27 msgid "Mapping for filetype plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:37 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28 msgid "Local plugin customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:38 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29 msgid "Disabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:39 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30 msgid "Enabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:94 -msgid "No valid plugin found in " -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:476 msgid "Initialization of plugin %s failed with traceback:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:554 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:509 msgid "" " %prog options\n" "\n" @@ -642,27 +638,27 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:560 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:515 msgid "Add a plugin by specifying the path to the zip file containing it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:562 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:517 msgid "Remove a custom plugin by name. Has no effect on builtin plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:564 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:519 msgid "Customize plugin. Specify name of plugin and customization string separated by a comma." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:566 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:521 msgid "List all installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:568 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523 msgid "Enable the named plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:570 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:525 msgid "Disable the named plugin" msgstr "" @@ -682,104 +678,108 @@ msgstr "" msgid "Communicate with S60 phones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:52 -msgid "Use Series as Category in iTunes/iBooks" +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:47 +msgid "

If you do not want calibre to recognize your Apple iDevice when it is connected to your computer, click Disable Apple Driver.

To transfer books to your iDevice, click Disable Apple Driver, then use the 'Connect to iTunes' method recommended in the Calibre + iDevices FAQ, using the Connect/Share|Connect to iTunes menu item.

Enabling the Apple driver for direct connection to iDevices is an unsupported advanced user mode.

" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:53 -msgid "Enable to use the series name as the iTunes Genre, iBooks Category" +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:65 +msgid "Disable Apple driver" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:55 -msgid "Cache covers from iTunes/iBooks" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:57 -msgid "Enable to cache and display covers from iTunes/iBooks" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:58 -msgid "Skip 'Connect to iTunes' recommendation" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:60 -msgid "Enable to skip the 'Connect to iTunes' recommendation dialog" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:115 -msgid "Apple device" +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:69 +msgid "Enable Apple driver" msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:117 +msgid "Use Series as Category in iTunes/iBooks" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:118 +msgid "Enable to use the series name as the iTunes Genre, iBooks Category" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:120 +msgid "Cache covers from iTunes/iBooks" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:122 +msgid "Enable to cache and display covers from iTunes/iBooks" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:176 +msgid "Apple device" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:178 msgid "Communicate with iTunes/iBooks." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:128 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:190 msgid "Apple device detected, launching iTunes, please wait ..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:130 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:192 msgid "Cannot copy books directly from iDevice. Drag from iTunes Library to desktop, then add to calibre's Library window." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:290 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:293 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:352 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:355 msgid "Updating device metadata listing..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:369 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:408 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:986 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1026 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3010 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3050 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:431 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:470 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1044 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1084 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3068 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3108 msgid "%d of %d" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:415 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1031 -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3056 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1089 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3114 msgid "finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:600 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:662 msgid "" "Some books not found in iTunes database.\n" "Delete using the iBooks app.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:950 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1008 msgid "" "Some cover art could not be converted.\n" "Click 'Show Details' for a list." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2592 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2650 #: /home/kovid/work/calibre/src/calibre/devices/nook/driver.py:100 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:447 #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:470 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:909 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:915 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:945 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:73 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445 #: /home/kovid/work/calibre/src/calibre/library/database2.py:294 #: /home/kovid/work/calibre/src/calibre/library/database2.py:307 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2753 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2754 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159 msgid "News" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2593 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2651 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:65 #: /home/kovid/work/calibre/src/calibre/library/catalog.py:634 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2715 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2733 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2716 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2734 msgid "Catalog" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2914 +#: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2972 msgid "Communicate with iTunes." msgstr "" @@ -819,20 +819,20 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:70 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:73 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:232 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:120 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:123 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:126 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:190 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:197 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:220 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:122 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:125 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:128 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:196 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:203 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:226 msgid "Getting list of books on device..." msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:264 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:268 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:279 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:249 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:251 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:255 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:257 msgid "Transferring books to device..." msgstr "" @@ -840,8 +840,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:299 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:349 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:384 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:273 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:304 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:279 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310 msgid "Adding books to device metadata listing..." msgstr "" @@ -851,8 +851,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:113 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:301 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:333 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:310 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:328 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:316 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:334 msgid "Removing books from device..." msgstr "" @@ -860,17 +860,17 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:329 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:337 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:344 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:335 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:340 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:341 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:346 msgid "Removing books from device metadata listing..." msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:397 -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:370 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:376 msgid "Sending metadata to device..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:132 +#: /home/kovid/work/calibre/src/calibre/devices/bambook/libbambookcore.py:129 msgid "Bambook SDK has not been installed." msgstr "" @@ -1155,46 +1155,54 @@ msgstr "" msgid "Communicate with all the Sony eBook readers." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:61 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62 msgid "All by title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:62 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:63 msgid "All by author" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:65 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:66 msgid "Comma separated list of metadata fields to turn into collections on the device. Possibilities include: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:68 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:69 msgid ". Two special collections are available: %s:%s and %s:%s. Add these values to the list to enable them. The collections will be given the name provided after the \":\" character." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:72 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73 msgid "Upload separate cover thumbnails for books (newer readers)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:73 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:74 msgid "Normally, the SONY readers get the cover image from the ebook 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. WARNING: This option should only be used with newer SONY readers: 350, 650, 950 and newer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80 msgid "Refresh separate covers when using automatic management (newer readers)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:81 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:82 msgid "Set this option to have separate book covers uploaded every time you connect your device. Unset this option if you have so many books on the reader that performance is unacceptable." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86 msgid "Preserve cover aspect ratio when building thumbnails" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:87 +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88 msgid "Set this option if you want the cover thumbnails to have the same aspect ratio (width to height) as the cover. Unset it if you want the thumbnail to be the maximum size, ignoring aspect ratio." msgstr "" +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92 +msgid "Search for books in all folders" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:94 +msgid "Setting this option tells calibre to look for books in all folders on the device and its cards. This permits calibre to find books put on the device by other software and by wireless download." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/devices/prs505/sony_cache.py:190 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/structure.py:69 msgid "Unnamed" @@ -1323,7 +1331,7 @@ msgstr "" msgid "Communicate with an eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:92 +#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:94 msgid "Get device information..." msgstr "" @@ -1789,7 +1797,7 @@ msgstr "" msgid "Running transforms on ebook..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1030 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:1032 msgid "Creating" msgstr "" @@ -1871,10 +1879,14 @@ msgstr "" msgid "Do not insert a Table of Contents at the beginning of the book." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:22 +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:149 msgid "Specify the sectionization of elements. A value of \"nothing\" turns the book into a single section. A value of \"files\" turns each file into a separate section; use this if your device is having trouble. A value of \"Table of Contents\" turns the entries in the Table of Contents into titles and creates sections; if it fails, adjust the \"Structure Detection\" and/or \"Table of Contents\" settings (turn on \"Force use of auto-generated Table of Contents)." msgstr "" +#: /home/kovid/work/calibre/src/calibre/ebooks/fb2/output.py:159 +msgid "for a complete list with descriptions." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/ebooks/html/input.py:248 msgid "Traverse links in HTML files breadth first. Normally, they are traversed depth first." msgstr "" @@ -2194,105 +2206,105 @@ msgstr "" msgid "TEMPLATE ERROR" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561 msgid "No" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:589 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:591 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:63 #: /home/kovid/work/calibre/src/calibre/gui2/custom_column_widgets.py:561 msgid "Yes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:673 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:45 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:127 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:75 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:427 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1004 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:64 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:426 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1018 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574 msgid "Title" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:674 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:432 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1005 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:431 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1019 msgid "Author(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:675 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71 msgid "Publisher" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:676 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:678 #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:49 msgid "Producer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:677 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:41 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:247 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:129 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:79 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:389 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:211 msgid "Comments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:679 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:170 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:31 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:377 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1207 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:72 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1202 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:171 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:761 msgid "Tags" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:681 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:683 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:168 #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:30 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:74 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:65 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:114 msgid "Series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:682 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684 msgid "Language" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:684 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1199 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1194 msgid "Timestamp" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:686 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:271 msgid "Published" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:688 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:690 msgid "Rights" msgstr "" @@ -2655,7 +2667,7 @@ msgstr "" msgid "Amazon timed out. Try again later." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:93 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/base.py:94 msgid "Metadata source" msgstr "" @@ -2784,7 +2796,7 @@ msgid "HTML TOC generation options." msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:169 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:66 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759 msgid "Rating" @@ -2940,6 +2952,7 @@ msgid "Author" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/pdf/manipulate/info.py:47 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27 msgid "Subject" msgstr "" @@ -3158,128 +3171,132 @@ msgstr "" msgid "Do not remove image references within the document. This is only useful when paired with a txt-output-formatting option that is not none because links are always removed with plain text output." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:72 msgid "Send file to storage card instead of main memory by default" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:73 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:74 msgid "Confirm before deleting" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:75 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:76 msgid "Main window geometry" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:77 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:78 msgid "Notify when a new version is available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:79 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:80 msgid "Use Roman numerals for series number" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:82 msgid "Sort tags list by name, popularity, or rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:84 +msgid "Match tags by any or all." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:86 msgid "Number of covers to show in the cover browsing mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:88 msgid "Defaults for conversion to LRF" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90 msgid "Options for the LRF ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93 msgid "Formats that are viewed using the internal viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95 msgid "Columns to be displayed in the book list" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:96 msgid "Automatically launch content server on application startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97 msgid "Oldest news kept in database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:98 msgid "Show system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:97 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:100 msgid "Upload downloaded news to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:99 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:102 msgid "Delete books from library after uploading to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:104 msgid "Show the cover flow in a separate window instead of in the main calibre window" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:106 msgid "Disable notifications from the system tray icon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:108 msgid "Default action to perform when send to device button is clicked" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:110 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113 msgid "Start searching as you type. If this is disabled then search will only take place when the Enter or Return key is pressed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:113 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:116 msgid "When searching, show all books with search results highlighted instead of showing only the matches. You can use the N or F3 keys to go to the next match." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:134 msgid "Maximum number of waiting worker processes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:136 msgid "Download social metadata (tags/rating/etc.)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:138 msgid "Overwrite author and title with new metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:140 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:101 msgid "Automatically download the cover, if available" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:142 msgid "Limit max simultaneous jobs to number of CPUs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:144 msgid "The layout of the user interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:146 msgid "Show the average rating per item indication in the tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:148 msgid "Disable UI animations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:153 msgid "tag browser categories not to display" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:420 +#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:423 msgid "Choose Files" msgstr "" @@ -3477,8 +3494,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:127 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:127 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:188 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:190 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:92 msgid "No books selected" msgstr "" @@ -3669,7 +3686,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:312 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:150 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:689 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:692 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:972 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:101 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:186 @@ -3731,7 +3748,7 @@ msgid "Bulk convert" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:86 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:514 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:517 msgid "Cannot convert" msgstr "" @@ -3739,7 +3756,7 @@ msgstr "" msgid "Starting conversion of %d book(s)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:171 msgid "Empty output file, probably the conversion process crashed" msgstr "" @@ -3911,7 +3928,7 @@ msgid "Stop Content Server" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:77 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:96 msgid "Email to" msgstr "" @@ -3919,32 +3936,32 @@ msgstr "" msgid "Email to and delete from library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:90 msgid "(delete from library)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:105 msgid "Setup email based sharing of books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123 msgid "D" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:123 msgid "Send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:142 msgid "Connect/share" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:84 msgid "Stopping" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/device.py:176 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:85 msgid "Stopping server, this could take upto a minute, please wait..." msgstr "" @@ -4031,48 +4048,48 @@ msgid "Downloading {0} for {1} book(s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:126 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:187 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:189 msgid "Cannot edit metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:224 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:229 msgid "Cannot merge books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:230 msgid "At least two books must be selected for merging" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:233 msgid "You are about to merge more than 5 books. Are you sure you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:239 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:241 msgid "Book formats and metadata from the selected books will be added to the first selected book (%s). ISBN will not be merged.

The second and subsequently selected books will not be deleted or changed.

Please confirm you want to proceed." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:251 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:253 msgid "Book formats from the selected books will be merged into the first selected book (%s). Metadata in the first selected book will not be changed.Author, Title, ISBN and all other metadata will not be merged.

After merger the second and subsequently selected books, with any metadata they have will be deleted.

All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently deleted from your calibre library.

Are you sure you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:269 msgid "Book formats and metadata from the selected books will be merged into the first selected book (%s). ISBN will not be merged.

After merger the second and subsequently selected books will be deleted.

All book formats of the first selected book will be kept and any duplicate formats in the second and subsequently selected books will be permanently deleted from your calibre library.

Are you sure you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19 msgid "F" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:17 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:19 msgid "Fetch news" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:52 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:54 msgid "Fetching news from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:81 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/fetch_news.py:83 msgid " fetched." msgstr "" @@ -4137,7 +4154,7 @@ msgid "Ctrl+P" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/preferences.py:24 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:206 msgid "Run welcome wizard" msgstr "" @@ -4370,7 +4387,7 @@ msgid "The specified directory could not be processed." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/add.py:274 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:838 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:841 msgid "No books" msgstr "" @@ -4558,8 +4575,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:147 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:384 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1197 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1192 msgid "Path" msgstr "" @@ -4569,17 +4586,17 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:149 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:150 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:153 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:383 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:63 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:144 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:124 msgid "Formats" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:29 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1008 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1200 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1022 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1195 msgid "Collections" msgstr "" @@ -4589,25 +4606,25 @@ msgid "Click to open" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:57 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:376 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:382 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:388 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1206 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1210 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:375 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:381 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1201 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1205 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:48 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts_ui.py:83 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:344 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:350 msgid "None" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:158 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:237 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:243 msgid "Paste Cover" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:159 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:238 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:244 msgid "Copy Cover" msgstr "" @@ -4665,7 +4682,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/debug_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/convert/epub_output_ui.py:56 #: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_input_ui.py:33 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:44 #: /home/kovid/work/calibre/src/calibre/gui2/convert/heuristics_ui.py:112 #: /home/kovid/work/calibre/src/calibre/gui2/convert/look_and_feel_ui.py:137 #: /home/kovid/work/calibre/src/calibre/gui2/convert/lrf_output_ui.py:120 @@ -4688,14 +4705,14 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:72 #: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:77 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:40 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:64 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:130 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns_ui.py:86 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/custom_columns_ui.py:81 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:139 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:86 @@ -5287,10 +5304,14 @@ msgstr "" msgid "FB2 Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:45 msgid "Sectionize:" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/convert/fb2_output_ui.py:46 +msgid "Genre" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/convert/font_key_ui.py:104 msgid "Font rescaling wizard" msgstr "" @@ -5856,7 +5877,7 @@ msgid "Regex:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136 msgid "Test" msgstr "" @@ -6428,93 +6449,93 @@ msgstr "" msgid "Error communicating with device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:628 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1158 -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:299 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:631 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1166 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:307 msgid "No suitable formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:644 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:647 msgid "Select folder to open as device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:695 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:698 msgid "Error talking to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:696 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:699 msgid "There was a temporary error talking to the device. Please unplug and reconnect the device and or reboot." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:739 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:742 msgid "Device: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:741 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:744 msgid " detected." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:839 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:842 msgid "selected to send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:858 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861 msgid "%i of %i Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:861 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:864 msgid "0 of %i Books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:862 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:865 msgid "Choose format to send to device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:870 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:873 msgid "No device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:871 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874 msgid "Cannot send: No device is connected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:874 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:877 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:881 msgid "No card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:875 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:879 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:878 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:882 msgid "Cannot send: Device has no storage card" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:935 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1018 -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1152 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:943 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1026 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1160 msgid "Auto convert the following books before uploading to the device?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:964 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:972 msgid "Sending catalogs to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1065 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1073 msgid "Sending news to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1119 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1127 msgid "Sending books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1159 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1167 msgid "Could not upload the following books to the device, as no suitable formats were found. Convert the book(s) to a format supported by your device first." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1231 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1239 msgid "No space on device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1232 +#: /home/kovid/work/calibre/src/calibre/gui2/device.py:1240 msgid "

Cannot upload books to device there is no more free space available " msgstr "" @@ -6778,7 +6799,7 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_device_ui.py:49 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1196 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1191 msgid "Format" msgstr "" @@ -6917,7 +6938,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comments_dialog.py:25 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:31 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231 msgid "&Cancel" msgstr "" @@ -6969,8 +6990,8 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:69 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1006 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1020 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:32 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:241 @@ -7001,13 +7022,13 @@ msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:128 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1421 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1433 msgid "Invalid author name" msgstr "" #: #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/edit_authors_dialog.py:129 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1422 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1434 msgid "Author names cannot contain & characters." msgstr "" @@ -7191,22 +7212,22 @@ msgid "Working" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:260 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:414 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:420 msgid "Lower Case" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:261 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:413 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:419 msgid "Upper Case" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:262 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:416 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:422 msgid "Title Case" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:263 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:417 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:423 msgid "Capitalize" msgstr "" @@ -8587,12 +8608,12 @@ msgid "%s (was %s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:85 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1367 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1379 msgid "Item is blank" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor.py:86 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1368 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1380 msgid "An item cannot be set to nothing. Delete it instead." msgstr "" @@ -8659,7 +8680,7 @@ msgid "Send test mail from %s to:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/test_email_ui.py:58 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134 msgid "&Test" msgstr "" @@ -8879,60 +8900,60 @@ msgstr "" msgid "Failed to download from %r with error: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:146 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:147 msgid "Email %s to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:189 msgid "News:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:190 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:191 msgid "Attached is the %s periodical downloaded by calibre." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:242 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:244 msgid "E-book:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:245 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:253 msgid "Attached, you will find the e-book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:246 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:254 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:185 msgid "by" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:247 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:255 msgid "in the %s format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:262 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:270 msgid "Sending email to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:301 msgid "Auto convert the following books before sending via email?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:300 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:308 msgid "Could not email the following books as no suitable formats were found:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:306 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:314 msgid "Failed to email book" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:309 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:317 msgid "sent" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/email.py:334 +#: /home/kovid/work/calibre/src/calibre/gui2/email.py:342 msgid "Sent news to" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129 msgid "" "

\n" "

Set a regular expression pattern to use when trying to guess ebook metadata from filenames.

\n" @@ -8940,67 +8961,85 @@ msgid "" "

Use the Test functionality below to test your regular expression on a few sample filenames (remember to include the file extension). The group names for the various metadata entries are documented in tooltips.

" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133 msgid "Regular &expression" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135 msgid "File &name:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137 msgid "Title:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:138 msgid "Regular expression (?P<title>)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:125 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:128 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:134 -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:148 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:154 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:157 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:108 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:112 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:117 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:122 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:130 msgid "No match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:140 msgid "Authors:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:141 msgid "Regular expression (?P)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:143 msgid "Series:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:144 msgid "Regular expression (?P)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:146 msgid "Series index:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:147 msgid "Regular expression (?P)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149 msgid "ISBN:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:136 +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:150 msgid "Regular expression (?P)" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:152 +msgid "Publisher:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:153 +msgid "Regular expression (?P)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:155 +msgid "Published:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:156 +msgid "Regular expression (?P)" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/init.py:105 msgid "Cover Browser" msgstr "" @@ -9205,48 +9244,48 @@ msgstr "" msgid "Edit template" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:65 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:251 msgid "On Device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:68 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:67 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:311 msgid "Size (MB)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:395 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:394 msgid "Book %s of %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:762 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1316 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:784 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:761 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1311 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:796 msgid "The lookup/search name is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:768 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1318 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:767 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1313 msgid "This book's UUID is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1003 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1017 msgid "In Library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1007 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1021 msgid "Size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1216 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1211 msgid "Book %s of %s." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1296 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1291 msgid "Marked for deletion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1299 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1294 msgid "Double click to edit me

" msgstr "" @@ -9319,7 +9358,7 @@ msgid "No matches for the search phrase %s were found." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:160 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:500 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:503 msgid "No matches found" msgstr "" @@ -9336,12 +9375,12 @@ msgid "LRF Viewer toolbar" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:539 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:558 msgid "Next Page" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:540 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:559 msgid "Previous Page" msgstr "" @@ -10153,23 +10192,27 @@ msgstr "" msgid "&Remove email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27 msgid "Auto send" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:27 msgid "Email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:32 msgid "Formats to email. The first matching format will be sent." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:30 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:33 +msgid "Subject of the email to use when sending. When left blank the title will be used for the subject. Also, the same templates used for \"Save to disk\" such as {title} and {author_sort} can be used here." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:37 msgid "If checked, downloaded news will be automatically mailed
to this email address (provided it is in one of the listed formats)." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:115 msgid "new email address" msgstr "" @@ -10181,91 +10224,91 @@ msgstr "" msgid "Wide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52 msgid "Medium" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:52 msgid "Small" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:54 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:53 msgid "Large" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56 msgid "Always" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:56 msgid "Automatic" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:58 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:57 msgid "Never" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60 msgid "By first letter" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:60 msgid "Disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:62 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:61 msgid "Partitioned" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:140 msgid "User Interface &layout (needs restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:141 msgid "&Number of covers to show in browse mode (needs restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:142 msgid "Choose &language (requires restart):" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:143 msgid "Show &average ratings in the tags browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:144 msgid "Disable all animations. Useful if you have a slow/old computer." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:145 msgid "Disable &animations" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:146 msgid "Enable system &tray icon (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:147 msgid "Show &splash screen at startup" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:148 msgid "Disable ¬ifications in system tray" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:149 msgid "Use &Roman numerals for series" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:153 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:150 msgid "Show cover &browser in a separate window (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:154 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:151 msgid "Tags browser category &partitioning method:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:155 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:152 msgid "" "Choose how tag browser subcategories are displayed when\n" "there are more items than the limit. Select by first\n" @@ -10274,21 +10317,21 @@ msgid "" "if you never want subcategories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:157 msgid "&Collapse when more items than:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:158 msgid "" "If a Tag Browser category has more than this number of items, it is divided\n" "up into sub-categories. If the partition method is set to disable, this value is ignored." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:163 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:160 msgid "Categories with &hierarchical items:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:161 msgid "" "A comma-separated list of columns in which items containing\n" "periods are displayed in the tag browser trees. For example, if\n" @@ -10298,60 +10341,56 @@ msgid "" "then the tags will be displayed each on their own line." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:167 msgid "&Toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:168 msgid "&Icon size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:172 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:169 msgid "Show &text under icons:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:173 -msgid "&Split the toolbar into two toolbars" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:170 msgid "Interface font:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:171 msgid "Change &font (needs restart)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:228 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:96 msgid "&Apply" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:235 msgid "Restore &defaults" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:236 msgid "Save changes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:232 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:237 msgid "Cancel and return to overview" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:293 msgid "Restoring to defaults not supported for" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:323 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:328 msgid "Some of the changes you made require a restart. Please restart calibre as soon as possible." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:326 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331 msgid "The changes you have made require calibre be restarted immediately. You will not be allowed set any more preferences, until you restart." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:331 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:336 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:132 msgid "Restart needed" msgstr "" @@ -11004,30 +11043,34 @@ msgid "The main toolbar" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:211 -msgid "The main toolbar when a device is connected" +msgid "The optional second toolbar" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:212 +msgid "The main toolbar when a device is connected" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:213 msgid "The context menu for the books in the calibre library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:215 msgid "The context menu for the books on the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:248 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249 msgid "Cannot add" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:249 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:250 msgid "Cannot add the actions %s to this location" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268 msgid "Cannot remove" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:268 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:269 msgid "Cannot remove the actions %s from this location" msgstr "" @@ -11114,7 +11157,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:93 #: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:277 -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:646 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652 #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280 msgid "Search" msgstr "" @@ -11207,164 +11250,164 @@ msgstr "" msgid "&Alternate shortcut:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:332 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:362 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:391 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:344 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:374 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:403 msgid "Rename %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:336 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:348 msgid "Edit sort for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:343 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:355 msgid "Add %s to user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:356 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:368 msgid "Children of %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:366 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378 msgid "Delete search %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:371 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383 msgid "Remove %s from category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:378 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:390 msgid "Search for %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:383 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395 msgid "Search for everything but %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:395 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:407 msgid "Add sub-category to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:399 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:411 msgid "Delete user category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:416 msgid "Hide category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:408 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:420 msgid "Show category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:418 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:430 msgid "Search for books in category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:424 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:436 msgid "Search for books not in category %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:433 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:438 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:445 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:450 msgid "Manage %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:441 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453 msgid "Manage Saved Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:449 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:453 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:461 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:465 msgid "Manage User Categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:460 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:472 msgid "Show all categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:463 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:475 msgid "Change sub-categorization scheme" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:779 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:791 msgid "The grouped search term name is \"{0}\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1051 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1063 msgid "Changing the authors for several books can take a while. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1056 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1068 msgid "Changing the metadata for that many books can take a while. Are you sure?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1139 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1151 #: /home/kovid/work/calibre/src/calibre/library/database2.py:413 msgid "Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1373 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1393 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1402 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1385 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1405 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1414 msgid "Rename user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1374 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1386 msgid "You cannot use periods in the name when renaming user categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1394 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1403 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1406 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1415 msgid "The name %s is already used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1426 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1438 msgid "Duplicate search name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1427 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1439 msgid "The saved search name %s is already used." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1829 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1841 msgid "New Category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1880 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1883 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1892 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1895 msgid "Delete user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1881 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1893 msgid "%s is not a user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1884 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1896 msgid "%s contains items. Do you really want to delete it?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1917 msgid "Remove category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1906 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1918 msgid "User category %s does not exist" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1925 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1937 msgid "Add to user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1926 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1938 msgid "A user category %s does not exist" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2049 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061 msgid "Find item in tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2052 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2064 msgid "" "Search for items. This is a \"contains\" search; items containing the\n" "text anywhere in the name will be found. You can limit the search\n" @@ -11374,59 +11417,59 @@ msgid "" "containing the text \"foo\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2061 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073 msgid "ALT+f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2065 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2077 msgid "F&ind" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2066 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2078 msgid "Find the first/next matching item" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2071 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2083 msgid "Collapse all categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2107 msgid "No More Matches.

Click Find again to go to first match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120 msgid "Sort by name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2108 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2120 msgid "Sort by popularity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2109 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2121 msgid "Sort by average rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2112 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2124 msgid "Set the sort order for entries in the Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131 msgid "Match all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2118 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2131 msgid "Match any" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2123 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136 msgid "When selecting multiple entries in the Tag Browser match any or all of them" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2127 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2140 msgid "Manage &user categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2130 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143 msgid "Add your own categories to the Tag Browser" msgstr "" @@ -11492,34 +11535,34 @@ msgstr "" msgid "You have started calibre in debug mode. After you quit calibre, the debug log will be available in the file: %s

The log will be displayed automatically." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:502 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:505 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:525 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:528 msgid "Recipe Disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:541 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:544 msgid "Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:574 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577 msgid "There are active jobs. Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:577 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:580 msgid "" " is communicating with the device!
\n" " Quitting may cause corruption on the device.
\n" " Are you sure you want to quit?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:584 msgid "Active jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:650 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653 msgid "will keep running in the system tray. To close it, choose Quit in the context menu of the system tray." msgstr "" @@ -11710,7 +11753,7 @@ msgid "Options to customize the ebook viewer" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:47 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:783 msgid "Remember last used window size" msgstr "" @@ -11783,36 +11826,36 @@ msgstr "" msgid "You are in the middle of editing a keyboard shortcut first complete that, by clicking outside the shortcut editing box." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:515 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534 msgid "&Lookup in dictionary" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:518 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:141 msgid "Go to..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:530 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:549 msgid "Next Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:531 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:550 msgid "Previous Section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:533 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:552 msgid "Document Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:534 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:553 msgid "Document End" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:536 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:555 msgid "Section Start" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:537 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:556 msgid "Section End" msgstr "" @@ -11888,71 +11931,71 @@ msgstr "" msgid "Clear list of recently opened books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:358 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:361 msgid "Connecting to dict.org to lookup: %s…" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:464 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:467 msgid "Choose ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:465 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:468 msgid "Ebooks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:501 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:504 msgid "No matches found for: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:538 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:541 msgid "Loading flow..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:576 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:579 msgid "Laying out %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:607 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:610 msgid "Bookmark #%d" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:611 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:614 msgid "Add bookmark" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:612 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:615 msgid "Enter title for bookmark:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:622 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:625 msgid "Manage Bookmarks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:662 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:665 msgid "Loading ebook..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:674 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:677 msgid "Could not open ebook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:767 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:770 msgid "Options to control the ebook viewer" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:774 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777 msgid "If specified, viewer window will try to come to the front when started." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:777 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:780 msgid "If specified, viewer window will try to open full screen when started." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:782 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:785 msgid "Print javascript alert and console messages to the console" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:788 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:791 msgid "" "%prog [options] file\n" "\n" @@ -12027,27 +12070,27 @@ msgstr "" msgid "Print eBook" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:412 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:418 msgid "Change Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:415 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:421 msgid "Swap Case" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:955 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:961 msgid "Drag to resize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:990 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:996 msgid "Show" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:997 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1003 msgid "Hide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1034 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:1040 msgid "Toggle" msgstr "" @@ -13112,11 +13155,11 @@ msgid "" "For help on an individual command: %%prog command --help\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:589 +#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591 msgid "No label was provided" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:591 +#: /home/kovid/work/calibre/src/calibre/library/custom_columns.py:593 msgid "The label must contain only lower case letters, digits and underscores, and start with a letter" msgstr "" @@ -13128,15 +13171,15 @@ msgstr "" msgid "Main" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3050 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3051 msgid "

Migrating old database to ebook library in %s

" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3079 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3080 msgid "Copying %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3096 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3097 msgid "Compacting database" msgstr "" @@ -14008,99 +14051,99 @@ msgstr "" msgid "Unknown News Source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:629 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:630 msgid "The \"%s\" recipe needs a username and password." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:735 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:736 msgid "Download finished" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:737 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738 msgid "Failed to download the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:743 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:744 msgid "Failed to download parts of the following articles:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:745 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:746 msgid " from " msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:748 msgid "\tFailed links:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:842 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:843 msgid "Could not fetch article." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:844 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:845 msgid "The debug traceback is available earlier in this log" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:846 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:847 msgid "Run with -vv to see the reason" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:870 msgid "Fetching feeds..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:875 msgid "Got feeds from index page" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:883 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:884 msgid "Trying to download cover..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:885 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:886 msgid "Generating masthead..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:966 msgid "Starting download [%d thread(s)]..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:981 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:982 msgid "Feeds downloaded to %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:990 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:991 msgid "Could not download cover: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:999 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1000 msgid "Downloading cover from %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1045 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1046 msgid "Masthead image downloaded" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1213 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1214 msgid "Untitled Article" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1284 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1285 msgid "Article downloaded: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1295 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1296 msgid "Article download failed: %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1312 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1313 msgid "Fetching feed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1459 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1460 msgid "Failed to log in, check your username and password for the calibre Periodicals service." msgstr "" -#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1474 +#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1475 msgid "You do not have permission to download this issue. Either your subscription has expired or you have exceeded the maximum allowed downloads for today." msgstr "" From 7fcc5132cd9c64d69aa53847b439d90ae23736ad Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Apr 2011 14:18:47 -0600 Subject: [PATCH 04/19] ... --- setup/publish.py | 1 - src/calibre/manual/news.rst | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/setup/publish.py b/setup/publish.py index 6aa2aa0e06..5c6b5563e9 100644 --- a/setup/publish.py +++ b/setup/publish.py @@ -45,7 +45,6 @@ class Stage3(Command): sub_commands = ['upload_user_manual', 'upload_demo', 'sdist', 'upload_to_sourceforge', 'upload_to_google_code', 'tag_release', 'upload_to_server', - 'upload_to_mobileread', ] class Stage4(Command): diff --git a/src/calibre/manual/news.rst b/src/calibre/manual/news.rst index ed306a168e..ac74b6c766 100644 --- a/src/calibre/manual/news.rst +++ b/src/calibre/manual/news.rst @@ -263,20 +263,18 @@ Tips for developing new recipes The best way to develop new recipes is to use the command line interface. Create the recipe using your favorite python editor and save it to a file say :file:`myrecipe.recipe`. The `.recipe` extension is required. You can download content using this recipe with the command:: - ebook-convert myrecipe.recipe output_dir --test -vv + ebook-convert myrecipe.recipe .epub --test -vv --debug-pipeline debug -The :command:`ebook-convert` will download all the webpages and save them to the directory :file:`output_dir`, creating it if necessary. The :option:`-vv` makes ebook-convert spit out a lot of information about what it is doing. The :option:`--test` makes it download only a couple of articles from at most two feeds. +The :command:`ebook-convert` will download all the webpages and save them to the EPUB file :file:`my_recipe.epub`, creating it if necessary. The :option:`-vv` makes ebook-convert spit out a lot of information about what it is doing. The :option:`--test` makes it download only a couple of articles from at most two feeds. In addition, ebook-convert will put the downloaded HTML into the ``debug/input`` directory, where ``debug`` is the directory you specified in the :option:`--debug-pipeline` option. -Once the download is complete, you can look at the downloaded :term:`HTML` by opening the file :file:`index.html` in a browser. Once you're satisfied that the download and preprocessing is happening correctly, you can generate ebooks in different formats as shown below:: +Once the download is complete, you can look at the downloaded :term:`HTML` by opening the file :file:`debug/input/index.html` in a browser. Once you're satisfied that the download and preprocessing is happening correctly, you can generate ebooks in different formats as shown below:: ebook-convert myrecipe.recipe myrecipe.epub ebook-convert myrecipe.recipe myrecipe.mobi ... -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, add a comment to the ticket http://bugs.calibre-ebook.com/ticket/405 - -Alternatively, you could just post your recipe in the calibre forum at http://www.mobileread.com/forums/forumdisplay.php?f=166 to share it with other calibre users. +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 forum at http://www.mobileread.com/forums/forumdisplay.php?f=166 to share it with other calibre users. .. seealso:: From ee447c7f05ed760af3b18c4b40b2af7f10d9d222 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Apr 2011 14:45:54 -0600 Subject: [PATCH 05/19] Fix #747766 (Globe and Mail recipe correction / wrong feed names on sports and auto) --- recipes/globe_and_mail.recipe | 4 ++-- src/calibre/manual/news.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/globe_and_mail.recipe b/recipes/globe_and_mail.recipe index 22cb6fa5bb..03061a2329 100644 --- a/recipes/globe_and_mail.recipe +++ b/recipes/globe_and_mail.recipe @@ -35,8 +35,8 @@ class AdvancedUserRecipe1287083651(BasicNewsRecipe): (u'Arts', u'http://www.theglobeandmail.com/news/arts/?service=rss'), (u'Life', u'http://www.theglobeandmail.com/life/?service=rss'), (u'Real Estate', u'http://www.theglobeandmail.com/real-estate/?service=rss'), - (u'Auto', u'http://www.theglobeandmail.com/sports/?service=rss'), - (u'Sports', u'http://www.theglobeandmail.com/auto/?service=rss') + (u'Sports', u'http://www.theglobeandmail.com/sports/?service=rss'), + (u'Drive', u'http://www.theglobeandmail.com/auto/?service=rss') ] preprocess_regexps = [ diff --git a/src/calibre/manual/news.rst b/src/calibre/manual/news.rst index ac74b6c766..52dc5a7166 100644 --- a/src/calibre/manual/news.rst +++ b/src/calibre/manual/news.rst @@ -265,7 +265,7 @@ The best way to develop new recipes is to use the command line interface. Create ebook-convert myrecipe.recipe .epub --test -vv --debug-pipeline debug -The :command:`ebook-convert` will download all the webpages and save them to the EPUB file :file:`my_recipe.epub`, creating it if necessary. The :option:`-vv` makes ebook-convert spit out a lot of information about what it is doing. The :option:`--test` makes it download only a couple of articles from at most two feeds. In addition, ebook-convert will put the downloaded HTML into the ``debug/input`` directory, where ``debug`` is the directory you specified in the :option:`--debug-pipeline` option. +The command :command:`ebook-convert` will download all the webpages and save them to the EPUB file :file:`myrecipe.epub`. The :option:`-vv` makes ebook-convert spit out a lot of information about what it is doing. The :option:`--test` makes it download only a couple of articles from at most two feeds. In addition, ebook-convert will put the downloaded HTML into the ``debug/input`` directory, where ``debug`` is the directory you specified in the :option:`--debug-pipeline` option. Once the download is complete, you can look at the downloaded :term:`HTML` by opening the file :file:`debug/input/index.html` in a browser. Once you're satisfied that the download and preprocessing is happening correctly, you can generate ebooks in different formats as shown below:: @@ -274,7 +274,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 forum at http://www.mobileread.com/forums/forumdisplay.php?f=166 to share it with other calibre users. +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 `_ to share it with other calibre users. .. seealso:: From c75ca49df7998f75db335687e00a96954ab2dba1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Apr 2011 15:29:59 -0600 Subject: [PATCH 06/19] ... --- Changelog.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog.yaml b/Changelog.yaml index f6493d48a9..96237e3c8b 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -23,14 +23,14 @@ date: 2011-04-01 new features: - - title: "Email delivery: You can now specify a subject that calibre will use when sending emails per email account, configured in Preferences->Sending by email. The subject is a template of the same kind used in Save to Disk, etc. So youcan specift the title/authors/series/whatever in the template." + - title: "Email delivery: You can now specify a subject that calibre will use when sending emails per email account, configured in Preferences->Sending by email. The subject is a template of the same kind used in Save to Disk, etc. So you can specift the title/authors/series/whatever in the template." tickets: [743535] - title: "Apple driver: When an iDevice is detected, inform the user about the Connect to iTunes method instead of trying to connect directly to the device, as the latter can be buggy. See http://www.mobileread.com/forums/showthread.php?t=127883 for details" - title: "SONY driver: Search for books on the device in all directories not just database/media/books. This can be turned off by customizing the SONY plugin in Preferences->Plugins" - - title: "EPUB Output: Remove any margins specified via an Adobe page template in the input document. This means that the margins psecified in calibre are more likely to be the actual margins used." + - title: "EPUB Output: Remove any margins specified via an Adobe page template in the input document. This means that the margins specified in calibre are more likely to be the actual margins used." - title: "When reading metadata from filenames, allow publisher and published date to be read from the filename" tickets: [744020] @@ -49,6 +49,8 @@ - title: "FB2 Output: Option to set the FB2 genre explicitly." tickets: [743178] + + - title: "Plugin developers: calibre now has a new plugin API, see http://calibre-ebook.com/user_manual/creating_plugins.html. Your existing plugins should continue to work, but it would be good to test them to make sure." bug fixes: - title: "Fix text color in the search bar set to black instead of the system font color" From f3a522ff5594ba9d04bf103dd838f9651868caba Mon Sep 17 00:00:00 2001 From: Tom Scholl Date: Fri, 1 Apr 2011 21:51:59 +0000 Subject: [PATCH 07/19] Removed spammy ticket adverts from guardian recipe --- recipes/guardian.recipe | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/guardian.recipe b/recipes/guardian.recipe index a4329d279e..6211997b06 100644 --- a/recipes/guardian.recipe +++ b/recipes/guardian.recipe @@ -36,6 +36,7 @@ class Guardian(BasicNewsRecipe): remove_tags = [ dict(name='div', attrs={'class':["video-content","videos-third-column"]}), dict(name='div', attrs={'id':["article-toolbox","subscribe-feeds",]}), + dict(name='div', attrs={'class':["guardian-tickets promo-component",]}), dict(name='ul', attrs={'class':["pagination"]}), dict(name='ul', attrs={'id':["content-actions"]}), #dict(name='img'), From 778ed36afaca1a687e7918ab2293988dc0047860 Mon Sep 17 00:00:00 2001 From: Tom Scholl Date: Sat, 2 Apr 2011 16:23:40 +0000 Subject: [PATCH 08/19] Fixes for International Herald Tribune recipe --- recipes/iht.recipe | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/recipes/iht.recipe b/recipes/iht.recipe index 040ff83927..85a87ccba4 100644 --- a/recipes/iht.recipe +++ b/recipes/iht.recipe @@ -15,10 +15,10 @@ class InternationalHeraldTribune(BasicNewsRecipe): language = 'en' oldest_article = 1 - max_articles_per_feed = 10 + max_articles_per_feed = 30 no_stylesheets = True - remove_tags = [dict(name='div', attrs={'class':'footer'}), + remove_tags = [dict(name='div', attrs={'class':['footer','header']}), dict(name=['form'])] preprocess_regexps = [ (re.compile(r'