From bd3b77029705b35f07b38e9d8c98c7149e67b9fd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 09:36:08 -0600 Subject: [PATCH 1/7] version 0.7.56 --- Changelog.yaml | 39 +++++++++++++++++++++++++++++++++++++++ src/calibre/constants.py | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/Changelog.yaml b/Changelog.yaml index c750c4a5f3..24ec402a49 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -19,6 +19,45 @@ # new recipes: # - title: +- version: 0.7.56 + date: 2011-04-17 + + new features: + - title: "This is primarily a bug fix release that fixes a bug in 0.7.55 that caused calibre to rescan the files on the device every time the device is connected. If you updated to 0.7.55 it is highly recommended you update to 0.7.56" + + - title: "Device driver for Coby Kyros" + + - title: "Remove the quick access to search options from next to the search bar, as we now have a separate search highlights toggle button" + + - title: "MOBI Output: Ensure that MOBI files always have 8KB worth of null bytes at the end of record 0. This appears to be necessary for Amazon to be able to add DRM to calibre generated MOBI files sent to their publishing service." + + - title: "Add a tool to inspect MOBI files. To use: calibre-debug -m file.mobi" + + bug fixes: + - title: "Fixed regression taht caused calibre to rescan files on the device on every reconnect" + + - title: "Fix donate button causing the toolbar to be too large on OS X" + + - title: "MOBI Input: Fix detection of Table of Contents for MOBI files that have a page break between the location designated as the Table of Contents and the actual table of contents." + tickets: [763504] + + - title: "Comic Input: Fix handling of some CBZ files that have wrongly encoded non ASCII filenames on windows." + tickets: [763280] + + - title: "PML Input: Fix multi-line chapter title causing a spurious page break" + tickets: [763238] + + - title: "EPUB Input: Speed up processing of files with very large manifest/spines" + + - title: "Fix regression that broke cover:False searches in 0.7.55" + + improved recipes: + - Suedduetsche Zeitung + - Irish Times + - Big Oven + - NSPM + + - version: 0.7.55 date: 2011-04-15 diff --git a/src/calibre/constants.py b/src/calibre/constants.py index 820a38aeff..6f26a63940 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.55' +__version__ = '0.7.56' __author__ = "Kovid Goyal " import re, importlib From 8ee74bd2fb27ccec3e21b2de73e49fe12a0fadff Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 10:39:23 -0600 Subject: [PATCH 2/7] IGN:Tag release --- src/calibre/translations/calibre.pot | 744 +++++++++++++++++---------- 1 file changed, 462 insertions(+), 282 deletions(-) diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 9f38c7fb8b..8895eb64b3 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.55\n" -"POT-Creation-Date: 2011-04-15 09:45+MDT\n" -"PO-Revision-Date: 2011-04-15 09:45+MDT\n" +"Project-Id-Version: calibre 0.7.56\n" +"POT-Creation-Date: 2011-04-17 09:36+MDT\n" +"PO-Revision-Date: 2011-04-17 09:36+MDT\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:99 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/input.py:102 #: /home/kovid/work/calibre/src/calibre/ebooks/chm/metadata.py:56 -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:430 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:435 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/periodical.py:127 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:100 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:102 @@ -84,8 +84,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:125 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:159 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:667 -#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:883 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:885 +#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:887 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:49 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:51 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1001 @@ -151,7 +151,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:188 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download.py:112 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/bulk_download2.py:252 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:320 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:324 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:156 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:160 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:199 @@ -160,11 +160,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/database2.py:500 #: /home/kovid/work/calibre/src/calibre/library/database2.py:508 #: /home/kovid/work/calibre/src/calibre/library/database2.py:519 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1801 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1925 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2914 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2916 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3049 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1800 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1924 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2913 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2915 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3048 #: /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 @@ -222,6 +222,11 @@ msgstr "" msgid "Preferences" msgstr "" +#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:609 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search.py:346 +msgid "Store" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/customize/builtins.py:19 msgid "Follow all local links in an HTML file and create a ZIP file containing all linked files. This plugin is run every time you add an HTML file to the library." msgstr "" @@ -289,195 +294,251 @@ msgstr "" msgid "Set metadata from %s files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:872 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:880 msgid "Look and Feel" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:874 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:886 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:897 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:908 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:920 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:882 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:894 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:905 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:916 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:928 msgid "Interface" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:878 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:886 msgid "Adjust the look and feel of the calibre interface to suit your tastes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:884 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:892 msgid "Behavior" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:890 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:898 msgid "Change the way calibre behaves" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:895 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:903 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:218 msgid "Add your own columns" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:901 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:909 msgid "Add/remove your own columns to the calibre book list" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:906 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:914 msgid "Toolbar" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:912 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:920 msgid "Customize the toolbars and context menus, changing which actions are available in each" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:918 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:926 msgid "Searching" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:924 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:932 msgid "Customize the way searching for books works in calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:929 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:937 msgid "Input Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:931 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:942 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:953 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:939 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:950 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:961 msgid "Conversion" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:935 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:943 msgid "Set conversion options specific to each input format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:940 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:948 msgid "Common Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:946 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:954 msgid "Set conversion options common to all formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:951 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:959 msgid "Output Options" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:957 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:965 msgid "Set conversion options specific to each output format" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:962 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:970 msgid "Adding books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:964 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:976 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:988 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1000 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:972 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:984 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:996 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1008 msgid "Import/Export" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:968 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:976 msgid "Control how calibre reads metadata from files when adding books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:974 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:982 msgid "Saving books to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:980 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:988 msgid "Control how calibre exports files from its database to disk when using Save to disk" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:986 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:994 msgid "Sending books to devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:992 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1000 msgid "Control how calibre transfers files to your ebook reader" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:998 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1006 msgid "Metadata plugboards" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1004 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1012 msgid "Change metadata fields before saving/sending" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1009 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1017 msgid "Template Functions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1011 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1058 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1070 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1081 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1019 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1066 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1078 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1089 msgid "Advanced" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1015 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1023 msgid "Create your own template functions" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1020 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1028 msgid "Sharing books by email" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1022 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1034 -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1047 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1030 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1042 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1055 msgid "Sharing" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1026 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1034 msgid "Setup sharing of books via email. Can be used for automatic sending of downloaded news to your devices" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1032 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1040 msgid "Sharing over the net" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1038 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1046 msgid "Setup the calibre Content Server which will give you access to your calibre library from anywhere, on any device, over the internet" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1045 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1053 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fetch.py:57 msgid "Metadata download" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1051 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1059 msgid "Control how calibre downloads ebook metadata from the net" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1056 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:268 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1064 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:269 msgid "Plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1062 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1070 msgid "Add/remove/customize various bits of calibre functionality" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1068 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1076 msgid "Tweaks" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1074 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1082 msgid "Fine tune how calibre behaves in various contexts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1079 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1087 msgid "Miscellaneous" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1085 +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1093 msgid "Miscellaneous advanced configuration" msgstr "" +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1107 +msgid "Kindle books from Amazon" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1112 +msgid "Ebooks for readers." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1117 +msgid "Books, Textbooks, eBooks, Toys, Games and More." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1122 +msgid "Publishers of fine books." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1127 +msgid "World Famous eBook Store." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1132 +msgid "The digital bookstore." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1137 +msgid "entertain, enrich, inspire." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1142 +msgid "Read anywhere." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1147 +msgid "The first producer of free ebooks." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1152 +msgid "eReading: anytime. anyplace." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1157 +msgid "The best ebooks at the best price: free!" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1162 +msgid "Ebooks handcrafted with the utmost care" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1167 +msgid "One web page for every book." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:1172 +msgid "Your ebook. Your way." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/customize/conversion.py:102 msgid "Conversion Input" msgstr "" @@ -627,31 +688,31 @@ msgstr "" msgid "This profile is intended for the Sanda Bambook." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:26 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27 msgid "Installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:27 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28 msgid "Mapping for filetype plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29 msgid "Local plugin customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30 msgid "Disabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31 msgid "Enabled plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:490 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:502 msgid "Initialization of plugin %s failed with traceback:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:523 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:535 msgid "" " %prog options\n" "\n" @@ -659,31 +720,31 @@ msgid "" " " msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:529 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:541 msgid "Add a plugin by specifying the path to the zip file containing it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:531 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:543 msgid "Remove a custom plugin by name. Has no effect on builtin plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:533 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:545 msgid "Customize plugin. Specify name of plugin and customization string separated by a comma." msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:535 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:547 msgid "List all installed plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:537 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:549 msgid "Enable the named plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/customize/ui.py:539 +#: /home/kovid/work/calibre/src/calibre/customize/ui.py:551 msgid "Disable the named plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/debug.py:150 +#: /home/kovid/work/calibre/src/calibre/debug.py:152 msgid "Debug log" msgstr "" @@ -760,6 +821,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:477 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:1094 #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:3119 +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:106 msgid "finished" msgstr "" @@ -787,7 +849,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:445 #: /home/kovid/work/calibre/src/calibre/library/database2.py:299 #: /home/kovid/work/calibre/src/calibre/library/database2.py:312 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2778 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2777 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:159 msgid "News" msgstr "" @@ -795,8 +857,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/apple/driver.py:2656 #: /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:2740 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:2758 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2739 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:2757 msgid "Catalog" msgstr "" @@ -1356,83 +1418,83 @@ msgstr "" msgid "Get device information..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:197 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:202 msgid "Rendered %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:200 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:205 msgid "Failed %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:254 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:259 msgid "" "Failed to process comic: \n" "\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:273 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:278 msgid "Number of colors for grayscale image conversion. Default: %default. Values of less than 256 may result in blurred text on your device if you are creating your comics in EPUB format." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:277 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:282 msgid "Disable normalize (improve contrast) color range for pictures. Default: False" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:280 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:285 msgid "Maintain picture aspect ratio. Default is to fill the screen." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:282 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:287 msgid "Disable sharpening." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:284 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:289 msgid "Disable trimming of comic pages. For some comics, trimming might remove content as well as borders." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:287 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:292 msgid "Don't split landscape images into two portrait images" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:289 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:294 msgid "Keep aspect ratio and scale image using screen height as image width for viewing in landscape mode." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:292 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:297 msgid "Used for right-to-left publications like manga. Causes landscape pages to be split into portrait pages from right to left." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:296 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:301 msgid "Enable Despeckle. Reduces speckle noise. May greatly increase processing time." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:299 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:304 msgid "Don't sort the files found in the comic alphabetically by name. Instead use the order they were added to the comic." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:303 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:308 msgid "The format that images in the created ebook are converted to. You can experiment to see which format gives you optimal size and look on your device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:307 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:312 msgid "Apply no processing to the image" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:309 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:314 msgid "Do not convert the image to grayscale (black and white)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:311 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:316 msgid "Specify the image size as widthxheight pixels. Normally, an image size is automatically calculated from the output profile, this option overrides it." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:315 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:320 msgid "When converting a CBC do not add links to each page to the TOC. Note this only applies if the TOC has more than one section" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:454 -#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:466 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:459 +#: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:471 msgid "Page" msgstr "" @@ -2273,6 +2335,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1028 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:151 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_plugin.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search.py:346 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:331 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:574 msgid "Title" @@ -2283,6 +2347,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:66 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:438 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1029 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_plugin.py:195 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search.py:346 msgid "Author(s)" msgstr "" @@ -2689,6 +2755,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1356 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1491 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search.py:346 msgid "Cover" msgstr "" @@ -2848,7 +2915,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/cover.py:98 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:176 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:220 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:723 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:734 msgid "Book %s of %s" msgstr "" @@ -3364,7 +3431,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:30 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:308 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:534 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:545 msgid "Books" msgstr "" @@ -3706,7 +3773,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:457 #: /home/kovid/work/calibre/src/calibre/gui2/jobs.py:463 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/columns.py:102 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:274 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:275 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:223 msgid "Are you sure?" msgstr "" @@ -3738,8 +3805,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:310 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:106 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:111 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:286 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:340 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:341 msgid "Success" msgstr "" @@ -3782,7 +3849,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:404 #: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:167 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:829 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:831 msgid "Not allowed" msgstr "" @@ -3811,7 +3878,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:518 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:554 msgid "Cannot convert" msgstr "" @@ -4357,6 +4424,19 @@ msgstr "" msgid "Books with the same tags" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:18 +msgid "Get books" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:27 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:276 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:653 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280 +msgid "Search" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/actions/tweak_epub.py:15 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tweak_epub_ui.py:54 msgid "Tweak ePub" @@ -4691,6 +4771,7 @@ msgstr "" #: /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/store/search_ui.py:110 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:351 msgid "None" msgstr "" @@ -4805,6 +4886,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/template_functions_ui.py:95 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar_ui.py:98 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/store/basic_config_widget_ui.py:37 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:123 msgid "Form" msgstr "" @@ -5683,38 +5765,38 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:180 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:171 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:666 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:677 msgid "Choose cover for " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:187 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:178 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:674 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:685 msgid "Cannot read" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:188 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:179 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:675 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:686 msgid "You do not have permission to read the file: " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:196 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:203 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:187 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:683 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:694 msgid "Error reading file" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:197 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:188 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:684 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:695 msgid "

There was an error reading from file:
" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:204 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:196 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:694 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:705 msgid " is not a valid picture" msgstr "" @@ -5775,7 +5857,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:537 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:430 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:848 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:859 msgid "Tags categorize the book. This is particularly useful while searching.

They can be any words or phrases, separated by commas." msgstr "" @@ -5783,7 +5865,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:544 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:433 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:214 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:307 msgid "&Series:" msgstr "" @@ -5793,7 +5875,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:546 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:434 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:435 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:295 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:306 msgid "List of known series. You can add new series." msgstr "" @@ -5981,6 +6063,7 @@ msgid "Occurrences:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/regex_builder_ui.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_store_dialog_ui.py:64 msgid "0" msgstr "" @@ -6067,6 +6150,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box_ui.py:52 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/progress_ui.py:53 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_store_dialog_ui.py:61 msgid "Dialog" msgstr "" @@ -6391,7 +6475,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:215 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:248 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:252 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1031 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1042 msgid "Undefined" msgstr "" @@ -6535,7 +6619,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/device.py:611 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc.py:41 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:304 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:305 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:54 msgid "Error" msgstr "" @@ -6895,6 +6979,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:1201 +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_plugin.py:195 msgid "Format" msgstr "" @@ -7454,7 +7539,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:530 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:424 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:806 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:817 msgid "&Rating:" msgstr "" @@ -7462,7 +7547,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:532 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:425 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:426 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:807 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:818 msgid "Rating of this book. 0-5 stars" msgstr "" @@ -7483,7 +7568,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:539 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:431 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:432 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:148 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:152 msgid "Open Tag Editor" msgstr "" @@ -7536,7 +7621,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:558 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:440 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1015 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1026 msgid "&Date:" msgstr "" @@ -7609,14 +7694,14 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:581 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:465 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:456 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:609 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:460 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:613 msgid "&Basic metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:582 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:466 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:463 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:467 msgid "&Custom metadata" msgstr "" @@ -7776,38 +7861,38 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:128 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:274 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:281 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:278 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:285 msgid "Could not read cover" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:123 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:275 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:279 msgid "Could not read cover from %s format" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:129 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:282 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:286 msgid "The cover in the %s format is invalid" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:158 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:766 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:777 msgid "Cover size: %dx%d pixels" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:195 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:693 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:704 msgid "Not a valid picture" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:214 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:717 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:728 msgid "Specify title and author" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:215 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:718 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:729 msgid "You must specify a title and author before generating a cover" msgstr "" @@ -7850,44 +7935,44 @@ msgid "The cover is not a valid picture" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:307 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:532 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:543 msgid "Choose formats for " msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:338 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:564 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:575 msgid "No permission" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:339 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:565 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:576 msgid "You do not have permission to read the following files:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:366 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:367 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:595 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:596 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:606 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:607 msgid "No format selected" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:378 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:607 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:618 msgid "Could not read metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:379 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:608 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:619 msgid "Could not read metadata from %s format" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:453 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:232 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:233 msgid " The green color indicates that the current author sort matches the current author" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:456 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:236 msgid " The red color indicates that the current author sort does not match the current author. No action is required if this is what you want." msgstr "" @@ -7911,8 +7996,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:475 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:484 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:411 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:416 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:415 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:420 msgid "Save changes and edit the metadata of %s" msgstr "" @@ -7927,22 +8012,22 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:690 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:695 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:954 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:965 msgid "This ISBN number is valid" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:698 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:957 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:968 msgid "This ISBN number is invalid" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:783 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:883 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:894 msgid "Tags changed" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:784 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:884 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:895 msgid "You have changed the tags. In order to use the tags editor, you must either discard or apply these changes. Apply changes?" msgstr "" @@ -7971,12 +8056,12 @@ msgid "You must specify at least one of ISBN, Title, Authors or Publisher" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:961 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:358 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:362 msgid "Permission denied" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:962 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:359 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:363 msgid "Could not open %s. Is it being used by another program?" msgstr "" @@ -7996,12 +8081,12 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:413 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:122 msgid "Swap the author and title" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:415 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:106 msgid "" "Automatically create the author sort entry based on the current author entry.\n" "Using this button to create author sort will change author sort from red to green." @@ -8028,7 +8113,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:436 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:129 msgid "Remove unused series (Series that have no books)" msgstr "" @@ -8041,7 +8126,7 @@ msgid "dd MMM yyyy" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:442 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1066 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1077 msgid "Publishe&d:" msgstr "" @@ -8050,7 +8135,7 @@ msgid "&Fetch metadata from server" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:448 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:627 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:638 msgid "&Browse" msgstr "" @@ -8059,7 +8144,7 @@ msgid "Remove border (if any) from cover" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:450 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:629 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:640 msgid "T&rim" msgstr "" @@ -8068,12 +8153,12 @@ msgid "Reset cover to default" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:452 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:631 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:642 msgid "&Remove" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:453 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:637 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:648 msgid "Download co&ver" msgstr "" @@ -8082,7 +8167,7 @@ msgid "Generate a default cover based on the title and author" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:455 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:638 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:649 msgid "&Generate cover" msgstr "" @@ -8099,7 +8184,7 @@ msgid "Remove the selected formats for this book from the database." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:461 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:450 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:461 msgid "Set the cover for the book from the selected format" msgstr "" @@ -8108,7 +8193,7 @@ msgid "Update metadata from the metadata in the selected format" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:464 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:674 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:678 msgid "&Comments" msgstr "" @@ -8524,7 +8609,7 @@ msgid "&Author:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:215 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:847 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:858 msgid "Ta&gs:" msgstr "" @@ -8997,6 +9082,26 @@ msgstr "" msgid "Failed to download from %r with error: %s" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:41 +msgid "No file specified to download." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:66 +msgid "Not a support ebook format." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:87 +msgid "Downloading %s" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:99 +msgid "Downloading" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/ebook_download.py:103 +msgid "Failed to download ebook" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/email.py:91 msgid "Email %s to %s" msgstr "" @@ -9273,7 +9378,7 @@ msgid "Show books in the main memory of the device" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:67 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1017 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1016 msgid "Card A" msgstr "" @@ -9282,7 +9387,7 @@ msgid "Show books in storage card A" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/layout.py:69 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1019 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1018 msgid "Card B" msgstr "" @@ -9322,23 +9427,15 @@ msgstr "" msgid "Reset Quick Search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:207 -msgid "Change the way searching for books works" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:213 msgid "Copy current search text (instead of search name)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:219 msgid "Save current search under the name shown in the box" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:231 -msgid "Delete current saved search" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/layout.py:254 msgid "Donate" msgstr "" @@ -9435,7 +9532,7 @@ msgstr "" msgid "Restore default layout" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:830 +#: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:832 msgid "Dropping onto a device is not supported. First add the book to the calibre library." msgstr "" @@ -9492,6 +9589,7 @@ msgid "Previous Page" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_store_dialog_ui.py:62 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:193 msgid "Back" msgstr "" @@ -9654,49 +9752,49 @@ msgstr "" msgid "Author s&ort:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:352 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:363 msgid "&Number:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:433 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:444 msgid "" "Last modified: %s\n" "\n" "Double click to view" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:736 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:747 msgid "Invalid cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:737 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:748 msgid "Could not change cover as the image is invalid." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:764 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:775 msgid "This book has no cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:814 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:825 msgid "stars" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:907 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:918 msgid "I&ds:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:908 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:919 msgid "" "Edit the identifiers for this book. For example: \n" "\n" "%s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:964 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:975 msgid "&Publisher:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1034 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1045 msgid "Clear date" msgstr "" @@ -9837,40 +9935,48 @@ msgid "Downloaded metadata fields" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:233 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:237 msgid "Edit Metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:164 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:112 +msgid "Set author sort from author" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:113 +msgid "Set author from author sort" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:168 msgid "&Download metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:178 msgid "Change how calibre downloads metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:504 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:693 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:508 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:697 msgid "Change cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:553 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:557 msgid "Co&mments" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:592 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:596 msgid "&Metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:597 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:601 msgid "&Cover and formats" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:616 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:620 msgid "Configure metadata downloading" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:662 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:666 msgid "C&ustom metadata" msgstr "" @@ -9946,7 +10052,7 @@ msgstr "" msgid "Restore settings to default values. You have to click Apply to actually save the default settings." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/__init__.py:328 msgid "Configure " msgstr "" @@ -10948,71 +11054,71 @@ msgstr "" msgid "Search for plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:226 msgid "No matches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:227 msgid "Could not find any matching plugins" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:267 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:268 msgid "Add plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:275 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:276 msgid "Installing plugins is a security risk. Plugins can contain a virus/malware. Only install it if you got it from a trusted source. Are you sure you want to proceed?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:288 msgid "Plugin {0} successfully installed under {1} plugins. You may have to restart calibre for the plugin to take effect." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:295 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:296 msgid "No valid plugin path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:297 msgid "%s is not a valid plugin path" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:305 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:306 msgid "Select an actual plugin under %s to customize" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:311 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:312 msgid "Plugin cannot be disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:312 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:313 msgid "The plugin: %s cannot be disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:322 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:323 msgid "Plugin not customizable" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:323 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:324 msgid "Plugin: %s does not need customization" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:329 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:330 msgid "Must restart" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:330 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:331 msgid "You must restart calibre before you can configure the %s plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:335 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:336 msgid "Plugin {0} successfully removed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:343 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:344 msgid "Cannot remove builtin plugin" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:344 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:345 msgid " cannot be removed. It is a builtin plugin. Try disabling it instead." msgstr "" @@ -11242,7 +11348,7 @@ msgid "Here you can control how calibre will save your books when you click the msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/server.py:70 -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:382 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:418 msgid "Failed to start content server" msgstr "" @@ -11591,34 +11697,23 @@ msgstr "" msgid "Apply any changes you made to this tweak" 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:653 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280 -msgid "Search" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:321 -msgid "The selected search will be permanently deleted. Are you sure?" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:364 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:346 msgid "Search (For Advanced Search click the button to the left)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:388 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:369 msgid "Enable or disable search highlighting." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:447 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:424 msgid "Saved Searches" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:449 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:426 msgid "Choose saved search or enter name for new saved search" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:462 +#: /home/kovid/work/calibre/src/calibre/gui2/search_box.py:439 #: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:34 #: /home/kovid/work/calibre/src/calibre/gui2/search_restriction_mixin.py:42 msgid "*Current search" @@ -11696,6 +11791,73 @@ msgstr "" msgid "&Alternate shortcut:" msgstr "" +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/basic_config_widget_ui.py:38 +msgid "Added Tags:" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/basic_config_widget_ui.py:39 +msgid "Open store in external web browswer" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_store_dialog_ui.py:62 +msgid "Search:" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_store_dialog_ui.py:63 +msgid "Books:" +msgstr "" + +#: +#: /home/kovid/work/calibre/src/calibre/gui2/store/mobileread_store_dialog_ui.py:65 +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_store_dialog_ui.py:63 +msgid "Close" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search.py:346 +msgid "Price" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:104 +msgid "calibre Store Search" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:105 +msgid "Query:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:107 +msgid "Stores" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:108 +msgid "All" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/search_ui.py:109 +msgid "Invert" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_control.py:69 +msgid "File is not a supported ebook type. Save to disk?" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_store_dialog_ui.py:59 +msgid "Home" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_store_dialog_ui.py:60 +msgid "Reload" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/store/web_store_dialog_ui.py:61 +msgid "%p%" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:345 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:375 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:404 @@ -11760,11 +11922,13 @@ msgid "Manage %s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:454 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1844 msgid "Manage Saved Searches" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:462 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:466 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1842 msgid "Manage User Categories" msgstr "" @@ -11816,52 +11980,68 @@ msgstr "" msgid "The saved search name %s is already used." msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1834 +msgid "Manage Authors" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1836 +msgid "Manage Series" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1838 +msgid "Manage Publishers" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1840 +msgid "Manage Tags" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1852 msgid "Invalid search restriction" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1837 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1853 msgid "The current search restriction is invalid" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1853 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1869 msgid "New Category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1904 -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1907 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1920 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1923 msgid "Delete user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1905 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1921 msgid "%s is not a user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1908 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1924 msgid "%s contains items. Do you really want to delete it?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1929 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1945 msgid "Remove category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1930 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1946 msgid "User category %s does not exist" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1949 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1965 msgid "Add to user category" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1950 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:1966 msgid "A user category %s does not exist" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2073 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2089 msgid "Find item in tag browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2076 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2092 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" @@ -11871,60 +12051,60 @@ msgid "" "containing the text \"foo\"" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2085 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2101 msgid "ALT+f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2089 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2105 msgid "F&ind" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2090 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2106 msgid "Find the first/next matching item" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2095 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2111 msgid "Collapse all categories" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2119 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2135 msgid "No More Matches.

Click Find again to go to first match" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2132 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2148 msgid "Sort by name" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2132 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2148 msgid "Sort by popularity" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2133 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2149 msgid "Sort by average rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2136 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2152 msgid "Set the sort order for entries in the Tag Browser" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2159 msgid "Match all" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2143 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2159 msgid "Match any" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2148 +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2164 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:2152 -msgid "Manage &user categories" +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2171 +msgid "Manage authors, tags, etc" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2155 -msgid "Add your own categories to the Tag Browser" +#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:2172 +msgid "All of these category_managers are available by right-clicking on items in the tag browser above" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:65 @@ -11965,58 +12145,58 @@ msgstr "" msgid "The following books have already been converted to %s format. Do you wish to reconvert them?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:156 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:189 msgid "&Donate to support calibre" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:189 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:225 msgid "&Restore" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:194 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:230 msgid "&Eject connected device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:239 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:275 msgid "Calibre Quick Start Guide" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:305 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:341 msgid "Debug mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:306 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:342 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:506 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:542 msgid "Conversion Error" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:529 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:565 msgid "Recipe Disabled" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:545 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:581 msgid "Failed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:578 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:614 msgid "There are active jobs. 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:617 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:585 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:621 msgid "Active jobs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:653 +#: /home/kovid/work/calibre/src/calibre/gui2/ui.py:689 msgid "will keep running in the system tray. To close it, choose Quit in the context menu of the system tray." msgstr "" @@ -13613,19 +13793,19 @@ msgstr "" msgid "%sAverage rating is %3.1f" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1015 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1014 msgid "Main" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3075 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3074 msgid "

Migrating old database to ebook library in %s

" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3104 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3103 msgid "Copying %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:3121 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:3120 msgid "Compacting database" msgstr "" From 45adf469440382c8e68eeddde1a66064c5e865a0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 11:13:57 -0600 Subject: [PATCH 3/7] Improved get_title_tokens --- src/calibre/ebooks/metadata/sources/base.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py index f322fcdb56..f98209e580 100644 --- a/src/calibre/ebooks/metadata/sources/base.py +++ b/src/calibre/ebooks/metadata/sources/base.py @@ -294,8 +294,16 @@ class Source(Plugin): Excludes connectives and punctuation. ''' if title: - pat = re.compile(r'''[-,:;+!@#$%^&*(){}.`~"'\s\[\]/]''') - title = pat.sub(' ', title) + title_patterns = [(re.compile(pat, re.IGNORECASE), repl) for pat, repl in + [ + (r'(?i)[({\[](\d{4}|omnibus|anthology|hardcover|paperback|mass\s*market|edition|ed\.)[\])}]', ''), + (r'(\d+),(\d+)', r'\1\2'), + (r'(\s-)', ' '), + (r"'", ''), + (r'''[:,;+!@#$%^&*(){}.`~"\s\[\]/]''', ' ') + ]] + for pat, repl in title_patterns: + title = pat.sub(repl, title) tokens = title.split() for token in tokens: token = token.strip() From 305f5a8acb873999f4098cade648097454e46b58 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 11:16:34 -0600 Subject: [PATCH 4/7] ... --- src/calibre/ebooks/metadata/sources/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py index f98209e580..9e574614e9 100644 --- a/src/calibre/ebooks/metadata/sources/base.py +++ b/src/calibre/ebooks/metadata/sources/base.py @@ -296,10 +296,15 @@ class Source(Plugin): if title: title_patterns = [(re.compile(pat, re.IGNORECASE), repl) for pat, repl in [ + # Remove things like: (2010) (Omnibus) etc. (r'(?i)[({\[](\d{4}|omnibus|anthology|hardcover|paperback|mass\s*market|edition|ed\.)[\])}]', ''), + # Remove commas used a separators in numbers (r'(\d+),(\d+)', r'\1\2'), + # Remove hyphens only if they have whitespace before them (r'(\s-)', ' '), + # Remove single quotes (r"'", ''), + # Replace other special chars with a space (r'''[:,;+!@#$%^&*(){}.`~"\s\[\]/]''', ' ') ]] for pat, repl in title_patterns: From 0f3f855da798b29a240a6a490a2bc7a34a1ad578 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 11:21:02 -0600 Subject: [PATCH 5/7] ... --- src/calibre/ebooks/metadata/sources/base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py index 9e574614e9..c9639bf531 100644 --- a/src/calibre/ebooks/metadata/sources/base.py +++ b/src/calibre/ebooks/metadata/sources/base.py @@ -298,6 +298,9 @@ class Source(Plugin): [ # Remove things like: (2010) (Omnibus) etc. (r'(?i)[({\[](\d{4}|omnibus|anthology|hardcover|paperback|mass\s*market|edition|ed\.)[\])}]', ''), + # Remove any strings that contain the substring edition inside + # parentheses + (r'(?i)[({\[].*?(edition|ed.).*?[\]})]', ''), # Remove commas used a separators in numbers (r'(\d+),(\d+)', r'\1\2'), # Remove hyphens only if they have whitespace before them From 0655424f16303b74ce6b82fe3761bcac6d998a62 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 11:26:47 -0600 Subject: [PATCH 6/7] oops --- src/calibre/gui2/layout.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index e18b1c9eda..4a09c5b32e 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -318,7 +318,8 @@ class BaseToolBar(QToolBar): # {{{ style = self.get_text_style() self.setToolButtonStyle(style) if hasattr(self, 'd_widget'): - self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly) + if hasattr(self.d_widget, 'filler'): + self.d_widget.filler.setVisible(style != Qt.ToolButtonIconOnly) def get_text_style(self): style = Qt.ToolButtonTextUnderIcon From 7da0ce12aead1d5618c4a22b0632eb398008ed1a Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 17 Apr 2011 11:53:32 -0600 Subject: [PATCH 7/7] Fix #763805 (version 0.7.56 crashes in Ubuntu i386 and amd64) --- src/calibre/ebooks/metadata/sources/identify.py | 2 +- src/calibre/gui2/store/web_control.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/metadata/sources/identify.py b/src/calibre/ebooks/metadata/sources/identify.py index 87c1e9a644..82e9a14d12 100644 --- a/src/calibre/ebooks/metadata/sources/identify.py +++ b/src/calibre/ebooks/metadata/sources/identify.py @@ -408,7 +408,7 @@ if __name__ == '__main__': # tests {{{ {'identifiers':{'isbn': '9780307459671'}, 'title':'Invisible Gorilla', 'authors':['Christopher Chabris']}, [title_test('The Invisible Gorilla', - exact=True), authors_test(['Christopher F. Chabris', 'Daniel Simons'])] + exact=True), authors_test(['Christopher Chabris', 'Daniel Simons'])] ), diff --git a/src/calibre/gui2/store/web_control.py b/src/calibre/gui2/store/web_control.py index 492f17c719..874328f872 100644 --- a/src/calibre/gui2/store/web_control.py +++ b/src/calibre/gui2/store/web_control.py @@ -9,8 +9,8 @@ __docformat__ = 'restructuredtext en' import os from urlparse import urlparse -from PyQt4.Qt import (QWebView, QWebPage, QNetworkCookieJar, - QFileDialog, QNetworkProxy) +from PyQt4.Qt import QNetworkCookieJar, QFileDialog, QNetworkProxy +from PyQt4.QtWebKit import QWebView, QWebPage from calibre import USER_AGENT, get_proxies, get_download_filename from calibre.ebooks import BOOK_EXTENSIONS