diff --git a/Changelog.yaml b/Changelog.yaml index afe40af4b3..38b63df60e 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -5,7 +5,7 @@ # Also, each release can have new and improved recipes. # - version: ?.?.? -# date: 2012-??-?? +# date: 2013-??-?? # # new features: # - title: @@ -19,6 +19,119 @@ # new recipes: # - title: +- version: 0.9.14 + date: 2013-01-11 + + new features: + - title: "When adding multiple books and duplicates are found, allow the user to select which of the duplicate books will be added anyway." + tickets: [1095256] + + - title: "Device drivers for Kobo Arc on linux, Polaroid Android tablet" + tickets: [1098049] + + - title: "When sorting by series, use the language of the book to decide what leading articles to remove, just as is done for sorting by title" + + bug fixes: + - title: "PDF Output: Do not error out when the input document contains links with anchors not present in the document." + tickets: [1096428] + + - title: "Add support for upgraded db on newest Kobo firmware" + tickets: [1095617] + + - title: "PDF Output: Fix typo that broke use of custom paper sizes." + tickets: [1097563] + + - title: "PDF Output: Handle empty anchors present at the end of a page" + + - title: "PDF Output: Fix side margins of last page in a flow being incorrect when large side margins are used." + tickets: [1096290] + + - title: "Edit metadata dialog: Allow setting the series number for custom series type columns to zero" + + - title: "When bulk editing custom series-type columns and not provding a series number use 1 as the default, instead of None" + + - title: "Catalogs: Fix issue with catalog generation using Hungarian UI and author_sort beginning with multiple letter groups." + tickets: [1091581] + + - title: "PDF Output: Dont error out on files that have invalid font-family declarations." + tickets: [1096279] + + - title: "Do not load QRawFont at global level, to allow calibre installation on systems with missing dependencies" + tickets: [1096170] + + - title: "PDF Output: Fix cover not present in generated PDF files" + tickets: [1096098] + + improved recipes: + - Sueddeutsche Zeitung mobil + - Boerse Online + - TidBits + - New York Review of Books + - Fleshbot + - Il Messaggero + - Libero + + new recipes: + - title: Spectator Magazine, Oxford Mail and Outside Magazine + author: Krittika Goyal + + - title: Libartes + author: Darko Miletic + + - title: El Diplo + author: Tomas De Domenico + +- version: 0.9.13 + date: 2013-01-04 + + new features: + - title: "Complete rewrite of the PDF Output engine, to support links and fix various bugs" + type: major + description: "calibre now has a new PDF output engine that supports links in the text. It also fixes various bugs, detailed below. In order to implement support for links and fix these bugs, the engine had to be completely rewritten, so there may be some regressions." + + - title: "Show disabled device plugins in Preferences->Ignored Devices" + + - title: "Get Books: Fix Smashwords, Google books and B&N stores. Add Nook UK store" + + - title: "Allow series numbers lower than -100 for custom series columns." + tickets: [1094475] + + - title: "Add mass storage driver for rockhip based android smart phones" + tickets: [1087809] + + - title: "Add a clear ratings button to the edit metadata dialog" + + bug fixes: + - title: "PDF Output: Fix custom page sizes not working on OS X" + + - title: "PDF Output: Fix embedding of many fonts not supported (note that embedding of OpenType fonts with Postscript outlines is still not supported on windows, though it is supported on other operating systems)" + + - title: "PDF Output: Fix crashes converting some books to PDF on OS X" + tickets: [1087688] + + - title: "HTML Input: Handle entities inside href attributes when following the links in an HTML file." + tickets: [1094203] + + - title: "Content server: Fix custom icons not used for sub categories" + tickets: [1095016] + + - title: "Force use of non-unicode constants in compiled templates. Fixes a problem with regular expression character classes and probably other things." + + - title: "Kobo driver: Do not error out if there are invalid dates in the device database" + tickets: [1094597] + + - title: "Content server: Fix for non-unicode hostnames when using mDNS" + tickets: [1094063] + + improved recipes: + - Today's Zaman + - The Economist + - Foreign Affairs + - New York Times + - Alternet + - Harper's Magazine + - La Stampa + - version: 0.9.12 date: 2012-12-28 diff --git a/README b/README index 2ffab4e2f6..a1e3081988 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -calibre is an e-book library manager. It can view, convert and catalog e-books \ -in most of the major e-book formats. It can also talk to e-book reader \ -devices. It can go out to the internet and fetch metadata for your books. \ -It can download newspapers and convert them into e-books for convenient \ +calibre is an e-book library manager. It can view, convert and catalog e-books +in most of the major e-book formats. It can also talk to e-book reader +devices. It can go out to the internet and fetch metadata for your books. +It can download newspapers and convert them into e-books for convenient reading. It is cross platform, running on Linux, Windows and OS X. For screenshots: https://calibre-ebook.com/demo @@ -15,5 +15,5 @@ bzr branch lp:calibre To update your copy of the source code: bzr merge -Tarballs of the source code for each release are now available \ +Tarballs of the source code for each release are now available at http://code.google.com/p/calibre-ebook diff --git a/manual/faq.rst b/manual/faq.rst index e9bb6fc70f..215b71e860 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -164,7 +164,6 @@ Follow these steps to find the problem: * Ensure your operating system is seeing the device. That is, the device should show up in Windows Explorer (in Windows) or Finder (in OS X). * In |app|, go to Preferences->Ignored Devices and check that your device is not being ignored - * In |app|, go to Preferences->Plugins->Device Interface plugin and make sure the plugin for your device is enabled, the plugin icon next to it should be green when it is enabled. * If all the above steps fail, go to Preferences->Miscellaneous and click debug device detection with your device attached and post the output as a ticket on `the calibre bug tracker `_. My device is non-standard or unusual. What can I do to connect to it? @@ -438,10 +437,10 @@ that allows you to create collections on your Kindle from the |app| metadata. It .. note:: Amazon have removed the ability to manipulate collections completely in their newer models, like the Kindle Touch and Kindle Fire, making even the above plugin useless. If you really want the ability to manage collections on your Kindle via a USB connection, we encourage you to complain to Amazon about it, or get a reader where this is supported, like the SONY or Kobo Readers. -I am getting an error when I try to use |app| with my Kobo Touch? -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +I am getting an error when I try to use |app| with my Kobo Touch/Glo/etc.? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The Kobo Touch has very buggy firmware. Connecting to it has been known to fail at random. Certain combinations of motherboard, USB ports/cables/hubs can exacerbate this tendency to fail. If you are getting an error when connecting to your touch with |app| try the following, each of which has solved the problem for *some* |app| users. +The Kobo has very buggy firmware. Connecting to it has been known to fail at random. Certain combinations of motherboard, USB ports/cables/hubs can exacerbate this tendency to fail. If you are getting an error when connecting to your touch with |app| try the following, each of which has solved the problem for *some* |app| users. * Connect the Kobo directly to your computer, not via USB Hub * Try a different USB cable and a different USB port on your computer @@ -673,6 +672,19 @@ There are three possible things I know of, that can cause this: * The Logitech SetPoint Settings application causes random crashes in |app| when it is open. Close it before starting |app|. +If none of the above apply to you, then there is some other program on your +computer that is interfering with |app|. First reboot your computer is safe +mode, to have as few running programs as possible, and see if the crashes still +happen. If they do not, then you know it is some program causing the problem. +The most likely such culprit is a program that modifies other programs' +behavior, such as an antivirus, a device driver, something like RoboForm (an +automatic form filling app) or an assistive technology like Voice Control or a +Screen Reader. + +The only way to find the culprit is to eliminate the programs one by one and +see which one is causing the issue. Basically, stop a program, run calibre, +check for crashes. If they still happen, stop another program and repeat. + |app| is not starting on OS X? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/recipes/alternet.recipe b/recipes/alternet.recipe index e58376cc42..0bd608e0e7 100644 --- a/recipes/alternet.recipe +++ b/recipes/alternet.recipe @@ -10,14 +10,12 @@ class Alternet(BasicNewsRecipe): category = 'News, Magazine' description = 'News magazine and online community' feeds = [ - (u'Front Page', u'http://feeds.feedblitz.com/alternet'), - (u'Breaking News', u'http://feeds.feedblitz.com/alternet_breaking_news'), - (u'Top Ten Campaigns', u'http://feeds.feedblitz.com/alternet_top_10_campaigns'), - (u'Special Coverage Areas', u'http://feeds.feedblitz.com/alternet_coverage') + (u'Front Page', u'http://feeds.feedblitz.com/alternet') ] + remove_attributes = ['width', 'align','cellspacing'] remove_javascript = True - use_embedded_content = False + use_embedded_content = True no_stylesheets = True language = 'en' encoding = 'UTF-8' diff --git a/recipes/borse_online.recipe b/recipes/borse_online.recipe index c192ce2b8d..ddd9ac456b 100644 --- a/recipes/borse_online.recipe +++ b/recipes/borse_online.recipe @@ -1,33 +1,36 @@ from calibre.web.feeds.recipes import BasicNewsRecipe class AdvancedUserRecipe1303841067(BasicNewsRecipe): - title = u'Börse-online' - __author__ = 'schuster' - oldest_article = 1 + title = u'Börse-online' + __author__ = 'schuster, Armin Geller' + oldest_article = 1 max_articles_per_feed = 100 - no_stylesheets = True - use_embedded_content = False - language = 'de' - remove_javascript = True - cover_url = 'http://www.dpv.de/images/1995/source.gif' - masthead_url = 'http://www.zeitschriften-cover.de/cover/boerse-online-cover-januar-2010-x1387.jpg' - extra_css = ''' - h1{font-family:Arial,Helvetica,sans-serif; font-weight:bold;font-size:large;} - h4{font-family:Arial,Helvetica,sans-serif; font-weight:normal;font-size:small;} - img {min-width:300px; max-width:600px; min-height:300px; max-height:800px} - p{font-family:Arial,Helvetica,sans-serif;font-size:small;} - body{font-family:Helvetica,Arial,sans-serif;font-size:small;} - ''' - remove_tags_bevor = [dict(name='h3')] - remove_tags_after = [dict(name='div', attrs={'class':'artikelfuss'})] - remove_tags = [dict(attrs={'class':['moduleTopNav', 'moduleHeaderNav', 'text', 'blau', 'poll1150']}), - dict(id=['newsletterlayer', 'newsletterlayerClose', 'newsletterlayer_body', 'newsletterarray_error', 'newsletterlayer_emailadress', 'newsletterlayer_submit', 'kommentar']), - dict(name=['h2', 'Gesamtranking', 'h3',''])] + no_stylesheets = True + use_embedded_content = False + language = 'de' + remove_javascript = True + encoding = 'iso-8859-1' + timefmt = ' [%a, %d %b %Y]' + + + cover_url = 'http://www.wirtschaftsmedien-shop.de/s/media/coverimages/7576_2013107.jpg' + masthead_url = 'http://upload.wikimedia.org/wikipedia/de/5/56/B%C3%B6rse_Online_Logo.svg' + remove_tags_after = [dict(name='div', attrs={'class':['artikelfuss', 'rahmen600']})] + + remove_tags = [ + dict(name='div', attrs={'id':['breadcrumb', 'rightCol', 'clearall']}), + dict(name='div', attrs={'class':['footer', 'artikelfuss']}), + ] + + keep_only_tags = [ + dict(name='div', attrs={'id':['contentWrapper']}) + ] + + feeds = [(u'Börsennachrichten', u'http://www.boerse-online.de/rss/')] + def print_version(self, url): return url.replace('.html#nv=rss', '.html?mode=print') - feeds = [(u'Börsennachrichten', u'http://www.boerse-online.de/rss/')] - diff --git a/recipes/bwmagazine2.recipe b/recipes/bwmagazine2.recipe index 77143bbefc..2c714d91c7 100644 --- a/recipes/bwmagazine2.recipe +++ b/recipes/bwmagazine2.recipe @@ -11,16 +11,15 @@ class BusinessWeekMagazine(BasicNewsRecipe): category = 'news' encoding = 'UTF-8' keep_only_tags = [ - dict(name='div', attrs={'id':'article_body_container'}), - ] - remove_tags = [dict(name='ui'),dict(name='li')] + dict(name='div', attrs={'id':'article_body_container'}), + ] + remove_tags = [dict(name='ui'),dict(name='li'),dict(name='div', attrs={'id':['share-email']})] no_javascript = True no_stylesheets = True cover_url = 'http://images.businessweek.com/mz/covers/current_120x160.jpg' def parse_index(self): - #Go to the issue soup = self.index_to_soup('http://www.businessweek.com/magazine/news/articles/business_news.htm') @@ -47,7 +46,6 @@ class BusinessWeekMagazine(BasicNewsRecipe): if section_title not in feeds: feeds[section_title] = [] feeds[section_title] += articles - div1 = soup.find ('div', attrs={'class':'column center'}) section_title = '' for div in div1.findAll('h5'): diff --git a/recipes/chronicle_higher_ed.recipe b/recipes/chronicle_higher_ed.recipe index 15b284cd7a..66b17cafcf 100644 --- a/recipes/chronicle_higher_ed.recipe +++ b/recipes/chronicle_higher_ed.recipe @@ -12,10 +12,10 @@ class Chronicle(BasicNewsRecipe): category = 'news' encoding = 'UTF-8' keep_only_tags = [ - dict(name='div', attrs={'class':'article'}), + dict(name='div', attrs={'class':['article','blog-mod']}), ] - remove_tags = [dict(name='div',attrs={'class':['related module1','maintitle']}), - dict(name='div', attrs={'id':['section-nav','icon-row', 'enlarge-popup']}), + remove_tags = [dict(name='div',attrs={'class':['related module1','maintitle','entry-utility','object-meta']}), + dict(name='div', attrs={'id':['section-nav','icon-row', 'enlarge-popup','confirm-popup']}), dict(name='a', attrs={'class':'show-enlarge enlarge'})] no_javascript = True no_stylesheets = True diff --git a/recipes/economist.recipe b/recipes/economist.recipe index 25e46892f8..b5e2a1fd9b 100644 --- a/recipes/economist.recipe +++ b/recipes/economist.recipe @@ -70,18 +70,6 @@ class Economist(BasicNewsRecipe): return br ''' - def get_cover_url(self): - soup = self.index_to_soup('http://www.economist.com/printedition/covers') - div = soup.find('div', attrs={'class':lambda x: x and - 'print-cover-links' in x}) - a = div.find('a', href=True) - url = a.get('href') - if url.startswith('/'): - url = 'http://www.economist.com' + url - soup = self.index_to_soup(url) - div = soup.find('div', attrs={'class':'cover-content'}) - img = div.find('img', src=True) - return img.get('src') def parse_index(self): return self.economist_parse_index() @@ -92,7 +80,7 @@ class Economist(BasicNewsRecipe): if div is not None: img = div.find('img', src=True) if img is not None: - self.cover_url = img['src'] + self.cover_url = re.sub('thumbnail','full',img['src']) feeds = OrderedDict() for section in soup.findAll(attrs={'class':lambda x: x and 'section' in x}): diff --git a/recipes/economist_free.recipe b/recipes/economist_free.recipe index a64310c252..b5e2a1fd9b 100644 --- a/recipes/economist_free.recipe +++ b/recipes/economist_free.recipe @@ -9,7 +9,7 @@ from calibre.web.feeds.news import BasicNewsRecipe from calibre.ebooks.BeautifulSoup import Tag, NavigableString from collections import OrderedDict -import time, re +import re class Economist(BasicNewsRecipe): @@ -37,7 +37,6 @@ class Economist(BasicNewsRecipe): padding: 7px 0px 9px; } ''' - oldest_article = 7.0 remove_tags = [ dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent']), @@ -46,7 +45,6 @@ class Economist(BasicNewsRecipe): {'class': lambda x: x and 'share-links-header' in x}, ] keep_only_tags = [dict(id='ec-article-body')] - needs_subscription = False no_stylesheets = True preprocess_regexps = [(re.compile('.*', re.DOTALL), lambda x:'')] @@ -55,28 +53,26 @@ class Economist(BasicNewsRecipe): # downloaded with connection reset by peer (104) errors. delay = 1 - def get_cover_url(self): - soup = self.index_to_soup('http://www.economist.com/printedition/covers') - div = soup.find('div', attrs={'class':lambda x: x and - 'print-cover-links' in x}) - a = div.find('a', href=True) - url = a.get('href') - if url.startswith('/'): - url = 'http://www.economist.com' + url - soup = self.index_to_soup(url) - div = soup.find('div', attrs={'class':'cover-content'}) - img = div.find('img', src=True) - return img.get('src') + needs_subscription = False + ''' + def get_browser(self): + br = BasicNewsRecipe.get_browser() + if self.username and self.password: + br.open('http://www.economist.com/user/login') + br.select_form(nr=1) + br['name'] = self.username + br['pass'] = self.password + res = br.submit() + raw = res.read() + if '>Log out<' not in raw: + raise ValueError('Failed to login to economist.com. ' + 'Check your username and password.') + return br + ''' + def parse_index(self): - try: - return self.economist_parse_index() - except: - raise - self.log.warn( - 'Initial attempt to parse index failed, retrying in 30 seconds') - time.sleep(30) - return self.economist_parse_index() + return self.economist_parse_index() def economist_parse_index(self): soup = self.index_to_soup(self.INDEX) @@ -84,7 +80,7 @@ class Economist(BasicNewsRecipe): if div is not None: img = div.find('img', src=True) if img is not None: - self.cover_url = img['src'] + self.cover_url = re.sub('thumbnail','full',img['src']) feeds = OrderedDict() for section in soup.findAll(attrs={'class':lambda x: x and 'section' in x}): @@ -151,154 +147,3 @@ class Economist(BasicNewsRecipe): div.insert(2, img) table.replaceWith(div) return soup - -''' -from calibre.web.feeds.news import BasicNewsRecipe -from calibre.utils.threadpool import ThreadPool, makeRequests -from calibre.ebooks.BeautifulSoup import Tag, NavigableString -import time, string, re -from datetime import datetime -from lxml import html - -class Economist(BasicNewsRecipe): - - title = 'The Economist (RSS)' - language = 'en' - - __author__ = "Kovid Goyal" - description = ('Global news and current affairs from a European' - ' perspective. Best downloaded on Friday mornings (GMT).' - ' Much slower than the print edition based version.') - extra_css = '.headline {font-size: x-large;} \n h2 { font-size: small; } \n h1 { font-size: medium; }' - oldest_article = 7.0 - cover_url = 'http://media.economist.com/sites/default/files/imagecache/print-cover-thumbnail/print-covers/currentcoverus_large.jpg' - #cover_url = 'http://www.economist.com/images/covers/currentcoverus_large.jpg' - remove_tags = [ - dict(name=['script', 'noscript', 'title', 'iframe', 'cf_floatingcontent']), - dict(attrs={'class':['dblClkTrk', 'ec-article-info', - 'share_inline_header', 'related-items']}), - {'class': lambda x: x and 'share-links-header' in x}, - ] - keep_only_tags = [dict(id='ec-article-body')] - no_stylesheets = True - preprocess_regexps = [(re.compile('.*', re.DOTALL), - lambda x:'')] - - def parse_index(self): - from calibre.web.feeds.feedparser import parse - if self.test: - self.oldest_article = 14.0 - raw = self.index_to_soup( - 'http://feeds.feedburner.com/economist/full_print_edition', - raw=True) - entries = parse(raw).entries - pool = ThreadPool(10) - self.feed_dict = {} - requests = [] - for i, item in enumerate(entries): - title = item.get('title', _('Untitled article')) - published = item.date_parsed - if not published: - published = time.gmtime() - utctime = datetime(*published[:6]) - delta = datetime.utcnow() - utctime - if delta.days*24*3600 + delta.seconds > 24*3600*self.oldest_article: - self.log.debug('Skipping article %s as it is too old.'%title) - continue - link = item.get('link', None) - description = item.get('description', '') - author = item.get('author', '') - - requests.append([i, link, title, description, author, published]) - if self.test: - requests = requests[:4] - requests = makeRequests(self.process_eco_feed_article, requests, self.eco_article_found, - self.eco_article_failed) - for r in requests: pool.putRequest(r) - pool.wait() - - return self.eco_sort_sections([(t, a) for t, a in - self.feed_dict.items()]) - - def eco_sort_sections(self, feeds): - if not feeds: - raise ValueError('No new articles found') - order = { - 'The World This Week': 1, - 'Leaders': 2, - 'Letters': 3, - 'Briefing': 4, - 'Business': 5, - 'Finance And Economics': 6, - 'Science & Technology': 7, - 'Books & Arts': 8, - 'International': 9, - 'United States': 10, - 'Asia': 11, - 'Europe': 12, - 'The Americas': 13, - 'Middle East & Africa': 14, - 'Britain': 15, - 'Obituary': 16, - } - return sorted(feeds, cmp=lambda x,y:cmp(order.get(x[0], 100), - order.get(y[0], 100))) - - def process_eco_feed_article(self, args): - from calibre import browser - i, url, title, description, author, published = args - br = browser() - ret = br.open(url) - raw = ret.read() - url = br.geturl().split('?')[0]+'/print' - root = html.fromstring(raw) - matches = root.xpath('//*[@class = "ec-article-info"]') - feedtitle = 'Miscellaneous' - if matches: - feedtitle = string.capwords(html.tostring(matches[-1], method='text', - encoding=unicode).split('|')[-1].strip()) - return (i, feedtitle, url, title, description, author, published) - - def eco_article_found(self, req, result): - from calibre.web.feeds import Article - i, feedtitle, link, title, description, author, published = result - self.log('Found print version for article:', title, 'in', feedtitle, - 'at', link) - - a = Article(i, title, link, author, description, published, '') - - article = dict(title=a.title, description=a.text_summary, - date=time.strftime(self.timefmt, a.date), author=a.author, url=a.url) - if feedtitle not in self.feed_dict: - self.feed_dict[feedtitle] = [] - self.feed_dict[feedtitle].append(article) - - def eco_article_failed(self, req, tb): - self.log.error('Failed to download %s with error:'%req.args[0][2]) - self.log.debug(tb) - - def eco_find_image_tables(self, soup): - for x in soup.findAll('table', align=['right', 'center']): - if len(x.findAll('font')) in (1,2) and len(x.findAll('img')) == 1: - yield x - - def postprocess_html(self, soup, first): - body = soup.find('body') - for name, val in body.attrs: - del body[name] - for table in list(self.eco_find_image_tables(soup)): - caption = table.find('font') - img = table.find('img') - div = Tag(soup, 'div') - div['style'] = 'text-align:left;font-size:70%' - ns = NavigableString(self.tag_to_string(caption)) - div.insert(0, ns) - div.insert(1, Tag(soup, 'br')) - img.extract() - del img['width'] - del img['height'] - div.insert(2, img) - table.replaceWith(div) - return soup -''' - diff --git a/recipes/el_diplo.recipe b/recipes/el_diplo.recipe new file mode 100644 index 0000000000..619e99e5cd --- /dev/null +++ b/recipes/el_diplo.recipe @@ -0,0 +1,118 @@ +# Copyright 2013 Tomás Di Domenico +# +# This is a news fetching recipe for the Calibre ebook software, for +# fetching the Cono Sur edition of Le Monde Diplomatique (www.eldiplo.org). +# +# This recipe is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this recipe. If not, see . + +import re +from contextlib import closing +from calibre.web.feeds.recipes import BasicNewsRecipe +from calibre.ptempfile import PersistentTemporaryFile +from calibre.utils.magick import Image + +class ElDiplo_Recipe(BasicNewsRecipe): + title = u'El Diplo' + __author__ = 'Tomas Di Domenico' + description = 'Publicacion mensual de Le Monde Diplomatique, edicion Argentina' + langauge = 'es_AR' + needs_subscription = True + auto_cleanup = True + + def get_cover(self,url): + tmp_cover = PersistentTemporaryFile(suffix = ".jpg", prefix = "eldiplo_") + self.cover_url = tmp_cover.name + + with closing(self.browser.open(url)) as r: + imgdata = r.read() + + img = Image() + img.load(imgdata) + img.crop(img.size[0],img.size[1]/2,0,0) + + img.save(tmp_cover.name) + + def get_browser(self): + br = BasicNewsRecipe.get_browser() + if self.username is not None and self.password is not None: + br.open('http://www.eldiplo.org/index.php/login/-/do_login/index.html') + br.select_form(nr=3) + br['uName'] = self.username + br['uPassword'] = self.password + br.submit() + self.browser = br + return br + + def parse_index(self): + default_sect = 'General' + articles = {default_sect:[]} + ans = [default_sect] + sectionsmarker = 'DOSSIER_TITLE: ' + sectionsre = re.compile('^'+sectionsmarker) + + soup = self.index_to_soup('http://www.eldiplo.org/index.php') + + coverdivs = soup.findAll(True,attrs={'id':['lmd-foto']}) + a = coverdivs[0].find('a', href=True) + coverurl = a['href'].split("?imagen=")[1] + self.get_cover(coverurl) + + thedivs = soup.findAll(True,attrs={'class':['lmd-leermas']}) + for div in thedivs: + a = div.find('a', href=True) + if 'Sumario completo' in self.tag_to_string(a, use_alt=True): + summaryurl = re.sub(r'\?.*', '', a['href']) + summaryurl = 'http://www.eldiplo.org' + summaryurl + + for pagenum in xrange(1,10): + soup = self.index_to_soup('{0}/?cms1_paging_p_b32={1}'.format(summaryurl,pagenum)) + thedivs = soup.findAll(True,attrs={'class':['interna']}) + + if len(thedivs) == 0: + break + + for div in thedivs: + section = div.find(True,text=sectionsre).replace(sectionsmarker,'') + if section == '': + section = default_sect + + if section not in articles.keys(): + articles[section] = [] + ans.append(section) + + nota = div.find(True,attrs={'class':['lmd-pl-titulo-nota-dossier']}) + a = nota.find('a', href=True) + if not a: + continue + + url = re.sub(r'\?.*', '', a['href']) + url = 'http://www.eldiplo.org' + url + title = self.tag_to_string(a, use_alt=True).strip() + + summary = div.find(True, attrs={'class':'lmd-sumario-descript'}).find('p') + if summary: + description = self.tag_to_string(summary, use_alt=False) + + aut = div.find(True, attrs={'class':'lmd-autor-sumario'}) + if aut: + auth = self.tag_to_string(aut, use_alt=False).strip() + + if not articles.has_key(section): + articles[section] = [] + + articles[section].append(dict(title=title,author=auth,url=url,date=None,description=description,content='')) + + #ans = self.sort_index_by(ans, {'The Front Page':-1, 'Dining In, Dining Out':1, 'Obituaries':2}) + ans = [(section, articles[section]) for section in ans if articles.has_key(section)] + return ans diff --git a/recipes/fleshbot.recipe b/recipes/fleshbot.recipe index 0a56e42795..0059d8855d 100644 --- a/recipes/fleshbot.recipe +++ b/recipes/fleshbot.recipe @@ -18,7 +18,7 @@ class Fleshbot(BasicNewsRecipe): encoding = 'utf-8' use_embedded_content = True language = 'en' - masthead_url = 'http://cache.gawkerassets.com/assets/kotaku.com/img/logo.png' + masthead_url = 'http://fbassets.s3.amazonaws.com/images/uploads/2012/01/fleshbot-logo.png' extra_css = ''' body{font-family: "Lucida Grande",Helvetica,Arial,sans-serif} img{margin-bottom: 1em} @@ -31,7 +31,7 @@ class Fleshbot(BasicNewsRecipe): , 'language' : language } - feeds = [(u'Articles', u'http://feeds.gawker.com/fleshbot/vip?format=xml')] + feeds = [(u'Articles', u'http://www.fleshbot.com/feed')] remove_tags = [ {'class': 'feedflare'}, diff --git a/recipes/foreignaffairs.recipe b/recipes/foreignaffairs.recipe index 6b36170288..b383609860 100644 --- a/recipes/foreignaffairs.recipe +++ b/recipes/foreignaffairs.recipe @@ -11,21 +11,21 @@ class ForeignAffairsRecipe(BasicNewsRecipe): by Chen Wei weichen302@gmx.com, 2012-02-05''' __license__ = 'GPL v3' - __author__ = 'kwetal' + __author__ = 'Rick Shang, kwetal' language = 'en' version = 1.01 - title = u'Foreign Affairs (Subcription or (free) Registration)' + title = u'Foreign Affairs (Subcription)' publisher = u'Council on Foreign Relations' category = u'USA, Foreign Affairs' description = u'The leading forum for serious discussion of American foreign policy and international affairs.' no_stylesheets = True remove_javascript = True + needs_subscription = True INDEX = 'http://www.foreignaffairs.com' FRONTPAGE = 'http://www.foreignaffairs.com/magazine' - INCLUDE_PREMIUM = False remove_tags = [] @@ -68,43 +68,57 @@ class ForeignAffairsRecipe(BasicNewsRecipe): def parse_index(self): + answer = [] soup = self.index_to_soup(self.FRONTPAGE) - sec_start = soup.findAll('div', attrs={'class':'panel-separator'}) + #get dates + date = re.split('\s\|\s',self.tag_to_string(soup.head.title.string))[0] + self.timefmt = u' [%s]'%date + + sec_start = soup.findAll('div', attrs= {'class':'panel-pane'}) for sec in sec_start: - content = sec.nextSibling - if content: - section = self.tag_to_string(content.find('h2')) - articles = [] - - tags = [] - for div in content.findAll('div', attrs = {'class': re.compile(r'view-row\s+views-row-[0-9]+\s+views-row-[odd|even].*')}): - tags.append(div) - for li in content.findAll('li'): - tags.append(li) - - for div in tags: - title = url = description = author = None - - if self.INCLUDE_PREMIUM: - found_premium = False - else: - found_premium = div.findAll('span', attrs={'class': - 'premium-icon'}) - if not found_premium: - tag = div.find('div', attrs={'class': 'views-field-title'}) - - if tag: - a = tag.find('a') - if a: - title = self.tag_to_string(a) - url = self.INDEX + a['href'] - author = self.tag_to_string(div.find('div', attrs = {'class': 'views-field-field-article-display-authors-value'})) - tag_summary = div.find('span', attrs = {'class': 'views-field-field-article-summary-value'}) - description = self.tag_to_string(tag_summary) - articles.append({'title':title, 'date':None, 'url':url, - 'description':description, 'author':author}) - if articles: + articles = [] + section = self.tag_to_string(sec.find('h2')) + if 'Books' in section: + reviewsection=sec.find('div', attrs = {'class': 'item-list'}) + for subsection in reviewsection.findAll('div'): + subsectiontitle=self.tag_to_string(subsection.span.a) + subsectionurl=self.INDEX + subsection.span.a['href'] + soup1 = self.index_to_soup(subsectionurl) + for div in soup1.findAll('div', attrs = {'class': 'views-field-title'}): + if div.find('a') is not None: + originalauthor=self.tag_to_string(div.findNext('div', attrs = {'class':'views-field-field-article-book-nid'}).div.a) + title=subsectiontitle+': '+self.tag_to_string(div.span.a)+' by '+originalauthor + url=self.INDEX+div.span.a['href'] + atr=div.findNext('div', attrs = {'class': 'views-field-field-article-display-authors-value'}) + if atr is not None: + author=self.tag_to_string(atr.span.a) + else: + author='' + desc=div.findNext('span', attrs = {'class': 'views-field-field-article-summary-value'}) + if desc is not None: + description=self.tag_to_string(desc.div.p) + else: + description='' + articles.append({'title':title, 'date':None, 'url':url, 'description':description, 'author':author}) + subsectiontitle='' + else: + for div in sec.findAll('div', attrs = {'class': 'views-field-title'}): + if div.find('a') is not None: + title=self.tag_to_string(div.span.a) + url=self.INDEX+div.span.a['href'] + atr=div.findNext('div', attrs = {'class': 'views-field-field-article-display-authors-value'}) + if atr is not None: + author=self.tag_to_string(atr.span.a) + else: + author='' + desc=div.findNext('span', attrs = {'class': 'views-field-field-article-summary-value'}) + if desc is not None: + description=self.tag_to_string(desc.div.p) + else: + description='' + articles.append({'title':title, 'date':None, 'url':url, 'description':description, 'author':author}) + if articles: answer.append((section, articles)) return answer @@ -115,15 +129,17 @@ class ForeignAffairsRecipe(BasicNewsRecipe): return soup - needs_subscription = True + def get_browser(self): br = BasicNewsRecipe.get_browser() if self.username is not None and self.password is not None: - br.open('https://www.foreignaffairs.com/user?destination=home') + br.open('https://www.foreignaffairs.com/user?destination=user%3Fop%3Dlo') br.select_form(nr = 1) br['name'] = self.username br['pass'] = self.password br.submit() return br + def cleanup(self): + self.browser.open('http://www.foreignaffairs.com/logout?destination=user%3Fop=lo') diff --git a/recipes/icons/libartes.png b/recipes/icons/libartes.png new file mode 100644 index 0000000000..0954c40273 Binary files /dev/null and b/recipes/icons/libartes.png differ diff --git a/recipes/il_messaggero.recipe b/recipes/il_messaggero.recipe index 93c35f4695..f0983f438c 100644 --- a/recipes/il_messaggero.recipe +++ b/recipes/il_messaggero.recipe @@ -28,12 +28,15 @@ class IlMessaggero(BasicNewsRecipe): recursion = 10 remove_javascript = True + extra_css = ' .bianco31lucida{color: black} ' - - keep_only_tags = [dict(name='h1', attrs={'class':'titoloLettura2'}), - dict(name='h2', attrs={'class':'sottotitLettura'}), - dict(name='span', attrs={'class':'testoArticoloG'}) + keep_only_tags = [dict(name='h1', attrs={'class':['titoloLettura2','titoloart','bianco31lucida']}), + dict(name='h2', attrs={'class':['sottotitLettura','grigio16']}), + dict(name='span', attrs={'class':'testoArticoloG'}), + dict(name='div', attrs={'id':'testodim'}) ] + + def get_cover_url(self): cover = None st = time.localtime() @@ -55,17 +58,16 @@ class IlMessaggero(BasicNewsRecipe): feeds = [ (u'HomePage', u'http://www.ilmessaggero.it/rss/home.xml'), (u'Primo Piano', u'http://www.ilmessaggero.it/rss/initalia_primopiano.xml'), - (u'Cronaca Bianca', u'http://www.ilmessaggero.it/rss/initalia_cronacabianca.xml'), - (u'Cronaca Nera', u'http://www.ilmessaggero.it/rss/initalia_cronacanera.xml'), (u'Economia e Finanza', u'http://www.ilmessaggero.it/rss/economia.xml'), (u'Politica', u'http://www.ilmessaggero.it/rss/initalia_politica.xml'), - (u'Scienza e Tecnologia', u'http://www.ilmessaggero.it/rss/scienza.xml'), - (u'Cinema', u'http://www.ilmessaggero.it/rss.php?refresh_ce#'), - (u'Viaggi', u'http://www.ilmessaggero.it/rss.php?refresh_ce#'), + (u'Cultura', u'http://www.ilmessaggero.it/rss/cultura.xml'), + (u'Tecnologia', u'http://www.ilmessaggero.it/rss/tecnologia.xml'), + (u'Spettacoli', u'http://www.ilmessaggero.it/rss/spettacoli.xml'), + (u'Edizioni Locali', u'http://www.ilmessaggero.it/rss/edlocali.xml'), (u'Roma', u'http://www.ilmessaggero.it/rss/roma.xml'), - (u'Cultura e Tendenze', u'http://www.ilmessaggero.it/rss/roma_culturaspet.xml'), + (u'Benessere', u'http://www.ilmessaggero.it/rss/benessere.xml'), (u'Sport', u'http://www.ilmessaggero.it/rss/sport.xml'), - (u'Calcio', u'http://www.ilmessaggero.it/rss/sport_calcio.xml'), - (u'Motori', u'http://www.ilmessaggero.it/rss/sport_motori.xml') + (u'Moda', u'http://www.ilmessaggero.it/rss/moda.xml') ] + diff --git a/recipes/libartes.recipe b/recipes/libartes.recipe new file mode 100644 index 0000000000..6ddae87119 --- /dev/null +++ b/recipes/libartes.recipe @@ -0,0 +1,69 @@ +__license__ = 'GPL v3' +__copyright__ = '2013, Darko Miletic ' +''' +libartes.com +''' + +import re +from calibre import strftime +from calibre.web.feeds.news import BasicNewsRecipe + +class Libartes(BasicNewsRecipe): + title = 'Libartes' + __author__ = 'Darko Miletic' + description = 'Elektronski časopis Libartes delo je kulturnih entuzijasta, umetnika i teoretičara umetnosti i književnosti. Časopis Libartes izlazi tromesečno i bavi se različitim granama umetnosti - književnošću, muzikom, filmom, likovnim umetnostima, dizajnom i arhitekturom.' + publisher = 'Libartes' + category = 'literatura, knjizevnost, film, dizajn, arhitektura, muzika' + no_stylesheets = True + INDEX = 'http://libartes.com/' + use_embedded_content = False + encoding = 'utf-8' + language = 'sr' + publication_type = 'magazine' + masthead_url = 'http://libartes.com/index_files/logo.gif' + extra_css = """ + @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} + @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} + body{font-family: "Times New Roman",Times,serif1, serif} + img{display:block} + .naslov{font-size: xx-large; font-weight: bold} + .nag{font-size: large; font-weight: bold} + """ + + conversion_options = { + 'comment' : description + , 'tags' : category + , 'publisher' : publisher + , 'language' : language + } + + + preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')] + remove_tags_before = dict(attrs={'id':'nav'}) + remove_tags_after = dict(attrs={'id':'fb' }) + keep_only_tags = [dict(name='div', attrs={'id':'center_content'})] + remove_tags = [ + dict(name=['object','link','iframe','embed','meta']) + ,dict(attrs={'id':'nav'}) + ] + + def parse_index(self): + articles = [] + soup = self.index_to_soup(self.INDEX) + for item in soup.findAll(name='a', attrs={'class':'belad'}, href=True): + feed_link = item + if feed_link['href'].startswith(self.INDEX): + url = feed_link['href'] + else: + url = self.INDEX + feed_link['href'] + + title = self.tag_to_string(feed_link) + date = strftime(self.timefmt) + articles.append({ + 'title' :title + ,'date' :date + ,'url' :url + ,'description':'' + }) + return [('Casopis Libartes', articles)] + diff --git a/recipes/libero.recipe b/recipes/libero.recipe index f2208d01a3..01c2da36c7 100644 --- a/recipes/libero.recipe +++ b/recipes/libero.recipe @@ -14,7 +14,8 @@ class LiberoNews(BasicNewsRecipe): __author__ = 'Marini Gabriele' description = 'Italian daily newspaper' - cover_url = 'http://www.libero-news.it/images/logo.png' + #cover_url = 'http://www.liberoquotidiano.it/images/Libero%20Quotidiano.jpg' + cover_url = 'http://www.edicola.liberoquotidiano.it/vnlibero/fpcut.jsp?testata=milano' title = u'Libero ' publisher = 'EDITORIALE LIBERO s.r.l 2006' category = 'News, politics, culture, economy, general interest' @@ -32,10 +33,11 @@ class LiberoNews(BasicNewsRecipe): remove_javascript = True keep_only_tags = [ - dict(name='div', attrs={'class':'Articolo'}) + dict(name='div', attrs={'class':'Articolo'}), + dict(name='article') ] remove_tags = [ - dict(name='div', attrs={'class':['CommentaFoto','Priva2']}), + dict(name='div', attrs={'class':['CommentaFoto','Priva2','login_commenti','box_16']}), dict(name='div', attrs={'id':['commentigenerale']}) ] feeds = [ diff --git a/recipes/microwave_and_rf.recipe b/recipes/microwave_and_rf.recipe deleted file mode 100644 index 3cdf6e5acc..0000000000 --- a/recipes/microwave_and_rf.recipe +++ /dev/null @@ -1,224 +0,0 @@ -#!/usr/bin/env python -## -## Title: Microwave and RF -## -## License: GNU General Public License v3 - http://www.gnu.org/copyleft/gpl.html - -# Feb 2012: Initial release - -__license__ = 'GNU General Public License v3 - http://www.gnu.org/copyleft/gpl.html' -''' -mwrf.com -''' - -import re -from calibre.web.feeds.news import BasicNewsRecipe -from calibre.utils.magick import Image - -class Microwaves_and_RF(BasicNewsRecipe): - - Convert_Grayscale = False # Convert images to gray scale or not - - # Add sections that want to be excluded from the magazine - exclude_sections = [] - - # Add sections that want to be included from the magazine - include_sections = [] - - title = u'Microwaves and RF' - __author__ = u'kiavash' - description = u'Microwaves and RF Montly Magazine' - publisher = 'Penton Media, Inc.' - publication_type = 'magazine' - site = 'http://mwrf.com' - - language = 'en' - asciiize = True - timeout = 120 - simultaneous_downloads = 1 # very peaky site! - - # Main article is inside this tag - keep_only_tags = [dict(name='table', attrs={'id':'prtContent'})] - - no_stylesheets = True - remove_javascript = True - - # Flattens all the tables to make it compatible with Nook - conversion_options = {'linearize_tables' : True} - - remove_tags = [ - dict(name='span', attrs={'class':'body12'}), - ] - - remove_attributes = [ 'border', 'cellspacing', 'align', 'cellpadding', 'colspan', - 'valign', 'vspace', 'hspace', 'alt', 'width', 'height' ] - - # Specify extra CSS - overrides ALL other CSS (IE. Added last). - extra_css = 'body { font-family: verdana, helvetica, sans-serif; } \ - .introduction, .first { font-weight: bold; } \ - .cross-head { font-weight: bold; font-size: 125%; } \ - .cap, .caption { display: block; font-size: 80%; font-style: italic; } \ - .cap, .caption, .caption img, .caption span { display: block; margin: 5px auto; } \ - .byl, .byd, .byline img, .byline-name, .byline-title, .author-name, .author-position, \ - .correspondent-portrait img, .byline-lead-in, .name, .bbc-role { display: block; \ - font-size: 80%; font-style: italic; margin: 1px auto; } \ - .story-date, .published { font-size: 80%; } \ - table { width: 100%; } \ - td img { display: block; margin: 5px auto; } \ - ul { padding-top: 10px; } \ - ol { padding-top: 10px; } \ - li { padding-top: 5px; padding-bottom: 5px; } \ - h1 { font-size: 175%; font-weight: bold; } \ - h2 { font-size: 150%; font-weight: bold; } \ - h3 { font-size: 125%; font-weight: bold; } \ - h4, h5, h6 { font-size: 100%; font-weight: bold; }' - - # Remove the line breaks and float left/right and picture width/height. - preprocess_regexps = [(re.compile(r'', re.IGNORECASE), lambda m: ''), - (re.compile(r'', re.IGNORECASE), lambda m: ''), - (re.compile(r'float:.*?'), lambda m: ''), - (re.compile(r'width:.*?px'), lambda m: ''), - (re.compile(r'height:.*?px'), lambda m: '') - ] - - - def print_version(self, url): - url = re.sub(r'.html', '', url) - url = re.sub('/ArticleID/.*?/', '/Print.cfm?ArticleID=', url) - return url - - # Need to change the user agent to avoid potential download errors - def get_browser(self, *args, **kwargs): - from calibre import browser - kwargs['user_agent'] = 'Mozilla/5.0 (Windows NT 5.1; rv:10.0) Gecko/20100101 Firefox/10.0' - return browser(*args, **kwargs) - - - def parse_index(self): - - # Fetches the main page of Microwaves and RF - soup = self.index_to_soup(self.site) - - # First page has the ad, Let's find the redirect address. - url = soup.find('span', attrs={'class':'commonCopy'}).find('a').get('href') - if url.startswith('/'): - url = self.site + url - - soup = self.index_to_soup(url) - - # Searches the site for Issue ID link then returns the href address - # pointing to the latest issue - latest_issue = soup.find('a', attrs={'href':lambda x: x and 'IssueID' in x}).get('href') - - # Fetches the index page for of the latest issue - soup = self.index_to_soup(latest_issue) - - # Finds the main section of the page containing cover, issue date and - # TOC - ts = soup.find('div', attrs={'id':'columnContainer'}) - - # Finds the issue date - ds = ' '.join(self.tag_to_string(ts.find('span', attrs={'class':'CurrentIssueSectionHead'})).strip().split()[-2:]).capitalize() - self.log('Found Current Issue:', ds) - self.timefmt = ' [%s]'%ds - - # Finds the cover image - cover = ts.find('img', src = lambda x: x and 'Cover' in x) - if cover is not None: - self.cover_url = self.site + cover['src'] - self.log('Found Cover image:', self.cover_url) - - feeds = [] - article_info = [] - - # Finds all the articles (tiles and links) - articles = ts.findAll('a', attrs={'class':'commonArticleTitle'}) - - # Finds all the descriptions - descriptions = ts.findAll('span', attrs={'class':'commonCopy'}) - - # Find all the sections - sections = ts.findAll('span', attrs={'class':'kicker'}) - - title_number = 0 - - # Goes thru all the articles one by one and sort them out - for section in sections: - title_number = title_number + 1 - - # Removes the unwanted sections - if self.tag_to_string(section) in self.exclude_sections: - continue - - # Only includes the wanted sections - if self.include_sections: - if self.tag_to_string(section) not in self.include_sections: - continue - - - title = self.tag_to_string(articles[title_number]) - url = articles[title_number].get('href') - if url.startswith('/'): - url = self.site + url - - self.log('\tFound article:', title, 'at', url) - desc = self.tag_to_string(descriptions[title_number]) - self.log('\t\t', desc) - - article_info.append({'title':title, 'url':url, 'description':desc, - 'date':self.timefmt}) - - if article_info: - feeds.append((self.title, article_info)) - - #self.log(feeds) - return feeds - - def postprocess_html(self, soup, first): - if self.Convert_Grayscale: - #process all the images - for tag in soup.findAll(lambda tag: tag.name.lower()=='img' and tag.has_key('src')): - iurl = tag['src'] - img = Image() - img.open(iurl) - if img < 0: - raise RuntimeError('Out of memory') - img.type = "GrayscaleType" - img.save(iurl) - return soup - - def preprocess_html(self, soup): - - # Includes all the figures inside the final ebook - # Finds all the jpg links - for figure in soup.findAll('a', attrs = {'href' : lambda x: x and 'jpg' in x}): - - # makes sure that the link points to the absolute web address - if figure['href'].startswith('/'): - figure['href'] = self.site + figure['href'] - - figure.name = 'img' # converts the links to img - figure['src'] = figure['href'] # with the same address as href - figure['style'] = 'display:block' # adds /n before and after the image - del figure['href'] - del figure['target'] - - # Makes the title standing out - for title in soup.findAll('a', attrs = {'class': 'commonSectionTitle'}): - title.name = 'h1' - del title['href'] - del title['target'] - - # Makes the section name more visible - for section_name in soup.findAll('a', attrs = {'class': 'kicker2'}): - section_name.name = 'h5' - del section_name['href'] - del section_name['target'] - - # Removes all unrelated links - for link in soup.findAll('a', attrs = {'href': True}): - link.name = 'font' - del link['href'] - del link['target'] - - return soup diff --git a/recipes/new_york_review_of_books.recipe b/recipes/new_york_review_of_books.recipe index bd18b95c43..bff7421b43 100644 --- a/recipes/new_york_review_of_books.recipe +++ b/recipes/new_york_review_of_books.recipe @@ -66,21 +66,22 @@ class NewYorkReviewOfBooks(BasicNewsRecipe): self.log('Issue date:', date) # Find TOC - toc = soup.find('ul', attrs={'class':'issue-article-list'}) + tocs = soup.findAll('ul', attrs={'class':'issue-article-list'}) articles = [] - for li in toc.findAll('li'): - h3 = li.find('h3') - title = self.tag_to_string(h3) - author = self.tag_to_string(li.find('h4')) - title = title + u' (%s)'%author - url = 'http://www.nybooks.com'+h3.find('a', href=True)['href'] - desc = '' - for p in li.findAll('p'): - desc += self.tag_to_string(p) - self.log('Found article:', title) - self.log('\t', url) - self.log('\t', desc) - articles.append({'title':title, 'url':url, 'date':'', + for toc in tocs: + for li in toc.findAll('li'): + h3 = li.find('h3') + title = self.tag_to_string(h3) + author = self.tag_to_string(li.find('h4')) + title = title + u' (%s)'%author + url = 'http://www.nybooks.com'+h3.find('a', href=True)['href'] + desc = '' + for p in li.findAll('p'): + desc += self.tag_to_string(p) + self.log('Found article:', title) + self.log('\t', url) + self.log('\t', desc) + articles.append({'title':title, 'url':url, 'date':'', 'description':desc}) return [('Current Issue', articles)] diff --git a/recipes/nytimes.recipe b/recipes/nytimes.recipe index ba97a2c0be..f5b994275e 100644 --- a/recipes/nytimes.recipe +++ b/recipes/nytimes.recipe @@ -15,6 +15,7 @@ from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag, BeautifulStoneSoup class NYTimes(BasicNewsRecipe): recursions=1 # set this to zero to omit Related articles lists + match_regexps=[r'/[12][0-9][0-9][0-9]/[0-9]+/'] # speeds up processing by preventing index page links from being followed # set getTechBlogs to True to include the technology blogs # set tech_oldest_article to control article age @@ -24,6 +25,14 @@ class NYTimes(BasicNewsRecipe): tech_oldest_article = 14 tech_max_articles_per_feed = 25 + # set getPopularArticles to False if you don't want the Most E-mailed and Most Viewed articles + # otherwise you will get up to 20 of the most popular e-mailed and viewed articles (in each category) + getPopularArticles = True + popularPeriod = '1' # set this to the number of days to include in the measurement + # e.g. 7 will get the most popular measured over the last 7 days + # and 30 will get the most popular measured over 30 days. + # you still only get up to 20 articles in each category + # set headlinesOnly to True for the headlines-only version. If True, webEdition is ignored. headlinesOnly = True @@ -376,6 +385,7 @@ class NYTimes(BasicNewsRecipe): masthead_url = 'http://graphics8.nytimes.com/images/misc/nytlogo379x64.gif' + def short_title(self): return self.title @@ -384,6 +394,7 @@ class NYTimes(BasicNewsRecipe): from contextlib import closing import copy from calibre.ebooks.chardet import xml_to_unicode + print("ARTICLE_TO_SOUP "+url_or_raw) if re.match(r'\w+://', url_or_raw): br = self.clone_browser(self.browser) open_func = getattr(br, 'open_novisit', br.open) @@ -475,6 +486,67 @@ class NYTimes(BasicNewsRecipe): description=description, author=author, content='')) + def get_popular_articles(self,ans): + if self.getPopularArticles: + popular_articles = {} + key_list = [] + + def handleh3(h3tag): + try: + url = h3tag.a['href'] + except: + return ('','','','') + url = re.sub(r'\?.*', '', url) + if self.exclude_url(url): + return ('','','','') + url += '?pagewanted=all' + title = self.tag_to_string(h3tag.a,False) + h6tag = h3tag.findNextSibling('h6') + if h6tag is not None: + author = self.tag_to_string(h6tag,False) + else: + author = '' + ptag = h3tag.findNextSibling('p') + if ptag is not None: + desc = self.tag_to_string(ptag,False) + else: + desc = '' + return(title,url,author,desc) + + + have_emailed = False + emailed_soup = self.index_to_soup('http://www.nytimes.com/most-popular-emailed?period='+self.popularPeriod) + for h3tag in emailed_soup.findAll('h3'): + (title,url,author,desc) = handleh3(h3tag) + if url=='': + continue + if not have_emailed: + key_list.append('Most E-Mailed') + popular_articles['Most E-Mailed'] = [] + have_emailed = True + popular_articles['Most E-Mailed'].append( + dict(title=title, url=url, date=strftime('%a, %d %b'), + description=desc, author=author, + content='')) + have_viewed = False + viewed_soup = self.index_to_soup('http://www.nytimes.com/most-popular-viewed?period='+self.popularPeriod) + for h3tag in viewed_soup.findAll('h3'): + (title,url,author,desc) = handleh3(h3tag) + if url=='': + continue + if not have_viewed: + key_list.append('Most Viewed') + popular_articles['Most Viewed'] = [] + have_viewed = True + popular_articles['Most Viewed'].append( + dict(title=title, url=url, date=strftime('%a, %d %b'), + description=desc, author=author, + content='')) + viewed_ans = [(k, popular_articles[k]) for k in key_list if popular_articles.has_key(k)] + for x in viewed_ans: + ans.append(x) + return ans + def get_tech_feeds(self,ans): if self.getTechBlogs: tech_articles = {} @@ -536,7 +608,7 @@ class NYTimes(BasicNewsRecipe): self.handle_article(lidiv) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_todays_index(self): @@ -569,7 +641,7 @@ class NYTimes(BasicNewsRecipe): self.handle_article(lidiv) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_headline_index(self): @@ -643,7 +715,7 @@ class NYTimes(BasicNewsRecipe): self.articles[section_name].append(dict(title=title, url=url, date=pubdate, description=description, author=author, content='')) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_index(self): if self.headlinesOnly: @@ -731,7 +803,7 @@ class NYTimes(BasicNewsRecipe): def preprocess_html(self, soup): - #print("PREPROCESS TITLE="+self.tag_to_string(soup.title)) + #print(strftime("%H:%M:%S")+" -- PREPROCESS TITLE="+self.tag_to_string(soup.title)) skip_tag = soup.find(True, {'name':'skip'}) if skip_tag is not None: #url = 'http://www.nytimes.com' + re.sub(r'\?.*', '', skip_tag.parent['href']) @@ -907,6 +979,7 @@ class NYTimes(BasicNewsRecipe): for aside in soup.findAll('div','aside'): aside.extract() soup = self.strip_anchors(soup,True) + #print("RECURSIVE: "+self.tag_to_string(soup.title)) if soup.find('div',attrs={'id':'blogcontent'}) is None: if first_fetch: @@ -1071,7 +1144,7 @@ class NYTimes(BasicNewsRecipe): divTag.replaceWith(tag) except: self.log("ERROR: Problem in Add class=authorId to
so we can format with CSS") - + #print(strftime("%H:%M:%S")+" -- POSTPROCESS TITLE="+self.tag_to_string(soup.title)) return soup def populate_article_metadata(self, article, soup, first): diff --git a/recipes/nytimes_sub.recipe b/recipes/nytimes_sub.recipe index d550a5158f..35f7b46517 100644 --- a/recipes/nytimes_sub.recipe +++ b/recipes/nytimes_sub.recipe @@ -15,6 +15,7 @@ from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag, BeautifulStoneSoup class NYTimes(BasicNewsRecipe): recursions=1 # set this to zero to omit Related articles lists + match_regexps=[r'/[12][0-9][0-9][0-9]/[0-9]+/'] # speeds up processing by preventing index page links from being followed # set getTechBlogs to True to include the technology blogs # set tech_oldest_article to control article age @@ -24,6 +25,14 @@ class NYTimes(BasicNewsRecipe): tech_oldest_article = 14 tech_max_articles_per_feed = 25 + # set getPopularArticles to False if you don't want the Most E-mailed and Most Viewed articles + # otherwise you will get up to 20 of the most popular e-mailed and viewed articles (in each category) + getPopularArticles = True + popularPeriod = '1' # set this to the number of days to include in the measurement + # e.g. 7 will get the most popular measured over the last 7 days + # and 30 will get the most popular measured over 30 days. + # you still only get up to 20 articles in each category + # set headlinesOnly to True for the headlines-only version. If True, webEdition is ignored. headlinesOnly = False @@ -115,19 +124,19 @@ class NYTimes(BasicNewsRecipe): if headlinesOnly: title='New York Times Headlines' description = 'Headlines from the New York Times' - needs_subscription = False + needs_subscription = True elif webEdition: title='New York Times (Web)' description = 'New York Times on the Web' - needs_subscription = False + needs_subscription = True elif replaceKindleVersion: title='The New York Times' description = 'Today\'s New York Times' - needs_subscription = False + needs_subscription = True else: title='New York Times' description = 'Today\'s New York Times' - needs_subscription = False + needs_subscription = True def decode_url_date(self,url): urlitems = url.split('/') @@ -350,6 +359,14 @@ class NYTimes(BasicNewsRecipe): def get_browser(self): br = BasicNewsRecipe.get_browser() + if self.username is not None and self.password is not None: + br.open('http://www.nytimes.com/auth/login') + br.form = br.forms().next() + br['userid'] = self.username + br['password'] = self.password + raw = br.submit().read() + if 'Please try again' in raw: + raise Exception('Your username and password are incorrect') return br cover_tag = 'NY_NYT' @@ -376,6 +393,7 @@ class NYTimes(BasicNewsRecipe): masthead_url = 'http://graphics8.nytimes.com/images/misc/nytlogo379x64.gif' + def short_title(self): return self.title @@ -384,6 +402,7 @@ class NYTimes(BasicNewsRecipe): from contextlib import closing import copy from calibre.ebooks.chardet import xml_to_unicode + print("ARTICLE_TO_SOUP "+url_or_raw) if re.match(r'\w+://', url_or_raw): br = self.clone_browser(self.browser) open_func = getattr(br, 'open_novisit', br.open) @@ -475,6 +494,67 @@ class NYTimes(BasicNewsRecipe): description=description, author=author, content='')) + def get_popular_articles(self,ans): + if self.getPopularArticles: + popular_articles = {} + key_list = [] + + def handleh3(h3tag): + try: + url = h3tag.a['href'] + except: + return ('','','','') + url = re.sub(r'\?.*', '', url) + if self.exclude_url(url): + return ('','','','') + url += '?pagewanted=all' + title = self.tag_to_string(h3tag.a,False) + h6tag = h3tag.findNextSibling('h6') + if h6tag is not None: + author = self.tag_to_string(h6tag,False) + else: + author = '' + ptag = h3tag.findNextSibling('p') + if ptag is not None: + desc = self.tag_to_string(ptag,False) + else: + desc = '' + return(title,url,author,desc) + + + have_emailed = False + emailed_soup = self.index_to_soup('http://www.nytimes.com/most-popular-emailed?period='+self.popularPeriod) + for h3tag in emailed_soup.findAll('h3'): + (title,url,author,desc) = handleh3(h3tag) + if url=='': + continue + if not have_emailed: + key_list.append('Most E-Mailed') + popular_articles['Most E-Mailed'] = [] + have_emailed = True + popular_articles['Most E-Mailed'].append( + dict(title=title, url=url, date=strftime('%a, %d %b'), + description=desc, author=author, + content='')) + have_viewed = False + viewed_soup = self.index_to_soup('http://www.nytimes.com/most-popular-viewed?period='+self.popularPeriod) + for h3tag in viewed_soup.findAll('h3'): + (title,url,author,desc) = handleh3(h3tag) + if url=='': + continue + if not have_viewed: + key_list.append('Most Viewed') + popular_articles['Most Viewed'] = [] + have_viewed = True + popular_articles['Most Viewed'].append( + dict(title=title, url=url, date=strftime('%a, %d %b'), + description=desc, author=author, + content='')) + viewed_ans = [(k, popular_articles[k]) for k in key_list if popular_articles.has_key(k)] + for x in viewed_ans: + ans.append(x) + return ans + def get_tech_feeds(self,ans): if self.getTechBlogs: tech_articles = {} @@ -536,7 +616,7 @@ class NYTimes(BasicNewsRecipe): self.handle_article(lidiv) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_todays_index(self): @@ -569,7 +649,7 @@ class NYTimes(BasicNewsRecipe): self.handle_article(lidiv) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_headline_index(self): @@ -643,7 +723,7 @@ class NYTimes(BasicNewsRecipe): self.articles[section_name].append(dict(title=title, url=url, date=pubdate, description=description, author=author, content='')) self.ans = [(k, self.articles[k]) for k in self.ans if self.articles.has_key(k)] - return self.filter_ans(self.get_tech_feeds(self.ans)) + return self.filter_ans(self.get_tech_feeds(self.get_popular_articles(self.ans))) def parse_index(self): if self.headlinesOnly: @@ -731,7 +811,7 @@ class NYTimes(BasicNewsRecipe): def preprocess_html(self, soup): - #print("PREPROCESS TITLE="+self.tag_to_string(soup.title)) + #print(strftime("%H:%M:%S")+" -- PREPROCESS TITLE="+self.tag_to_string(soup.title)) skip_tag = soup.find(True, {'name':'skip'}) if skip_tag is not None: #url = 'http://www.nytimes.com' + re.sub(r'\?.*', '', skip_tag.parent['href']) @@ -907,6 +987,7 @@ class NYTimes(BasicNewsRecipe): for aside in soup.findAll('div','aside'): aside.extract() soup = self.strip_anchors(soup,True) + #print("RECURSIVE: "+self.tag_to_string(soup.title)) if soup.find('div',attrs={'id':'blogcontent'}) is None: if first_fetch: @@ -1071,7 +1152,7 @@ class NYTimes(BasicNewsRecipe): divTag.replaceWith(tag) except: self.log("ERROR: Problem in Add class=authorId to
so we can format with CSS") - + #print(strftime("%H:%M:%S")+" -- POSTPROCESS TITLE="+self.tag_to_string(soup.title)) return soup def populate_article_metadata(self, article, soup, first): diff --git a/recipes/outside_magazine.recipe b/recipes/outside_magazine.recipe new file mode 100644 index 0000000000..15eaf3221e --- /dev/null +++ b/recipes/outside_magazine.recipe @@ -0,0 +1,65 @@ +from calibre.web.feeds.recipes import BasicNewsRecipe + +class NYTimes(BasicNewsRecipe): + + title = 'Outside Magazine' + __author__ = 'Krittika Goyal' + description = 'Outside Magazine - Free 1 Month Old Issue' + timefmt = ' [%d %b, %Y]' + needs_subscription = False + language = 'en' + + no_stylesheets = True + #auto_cleanup = True + #auto_cleanup_keep = '//div[@class="thumbnail"]' + + keep_only_tags = dict(name='div', attrs={'class':'masonry-box width-four'}) + remove_tags = [ + dict(name='div', attrs={'id':['share-bar', 'outbrain_widget_0', 'outbrain_widget_1', 'livefyre']}), + #dict(name='div', attrs={'id':['qrformdiv', 'inSection', 'alpha-inner']}), + #dict(name='form', attrs={'onsubmit':''}), + dict(name='section', attrs={'id':['article-quote', 'article-navigation']}), + ] + #TO GET ARTICLE TOC + def out_get_index(self): + super_url = 'http://www.outsideonline.com/magazine/' + super_soup = self.index_to_soup(super_url) + div = super_soup.find(attrs={'class':'masonry-box width-four'}) + issue = div.findAll(name='article')[1] + super_a = issue.find('a', href=True) + return super_a.get('href') + + + # To parse artice toc + def parse_index(self): + parse_soup = self.index_to_soup(self.out_get_index()) + + feeds = [] + feed_title = 'Articles' + + articles = [] + self.log('Found section:', feed_title) + div = parse_soup.find(attrs={'class':'print clearfix'}) + for art in div.findAll(name='p'): + art_info = art.find(name = 'a') + if art_info is None: + continue + art_title = self.tag_to_string(art_info) + url = art_info.get('href') + '?page=all' + self.log.info('\tFound article:', art_title, 'at', url) + article = {'title':art_title, 'url':url, 'date':''} + #au = art.find(attrs={'class':'articleAuthors'}) + #if au is not None: + #article['author'] = self.tag_to_string(au) + #desc = art.find(attrs={'class':'hover_text'}) + #if desc is not None: + #desc = self.tag_to_string(desc) + #if 'author' in article: + #desc = ' by ' + article['author'] + ' ' +desc + #article['description'] = desc + articles.append(article) + if articles: + feeds.append((feed_title, articles)) + + return feeds + diff --git a/recipes/oxford_mail.recipe b/recipes/oxford_mail.recipe new file mode 100644 index 0000000000..3096b867f4 --- /dev/null +++ b/recipes/oxford_mail.recipe @@ -0,0 +1,22 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class HindustanTimes(BasicNewsRecipe): + title = u'Oxford Mail' + language = 'en_GB' + __author__ = 'Krittika Goyal' + oldest_article = 1 #days + max_articles_per_feed = 25 + #encoding = 'cp1252' + use_embedded_content = False + + no_stylesheets = True + auto_cleanup = True + + + feeds = [ +('News', + 'http://www.oxfordmail.co.uk/news/rss/'), +('Sports', + 'http://www.oxfordmail.co.uk/sport/rss/'), +] + diff --git a/recipes/phillosophy_now.recipe b/recipes/phillosophy_now.recipe index 7c12832c70..748a81ade1 100644 --- a/recipes/phillosophy_now.recipe +++ b/recipes/phillosophy_now.recipe @@ -6,7 +6,6 @@ class PhilosophyNow(BasicNewsRecipe): title = 'Philosophy Now' __author__ = 'Rick Shang' - description = '''Philosophy Now is a lively magazine for everyone interested in ideas. It isn't afraid to tackle all the major questions of life, the universe and everything. Published every two months, it tries to @@ -27,7 +26,7 @@ class PhilosophyNow(BasicNewsRecipe): def get_browser(self): br = BasicNewsRecipe.get_browser() br.open('https://philosophynow.org/auth/login') - br.select_form(nr = 1) + br.select_form(name="loginForm") br['username'] = self.username br['password'] = self.password br.submit() @@ -50,19 +49,20 @@ class PhilosophyNow(BasicNewsRecipe): #Go to the main body current_issue_url = 'http://philosophynow.org/issues/' + issuenum soup = self.index_to_soup(current_issue_url) - div = soup.find ('div', attrs={'class':'articlesColumn'}) + div = soup.find ('div', attrs={'class':'contentsColumn'}) feeds = OrderedDict() - for post in div.findAll('h3'): + + for post in div.findAll('h1'): articles = [] a=post.find('a',href=True) if a is not None: url="http://philosophynow.org" + a['href'] title=self.tag_to_string(a).strip() - s=post.findPrevious('h4') + s=post.findPrevious('h3') section_title = self.tag_to_string(s).strip() - d=post.findNext('p') + d=post.findNext('h2') desc = self.tag_to_string(d).strip() articles.append({'title':title, 'url':url, 'description':desc, 'date':''}) @@ -73,3 +73,5 @@ class PhilosophyNow(BasicNewsRecipe): ans = [(key, val) for key, val in feeds.iteritems()] return ans + def cleanup(self): + self.browser.open('http://philosophynow.org/auth/logout') diff --git a/recipes/schattenblick.recipe b/recipes/schattenblick.recipe new file mode 100644 index 0000000000..d02ec1d272 --- /dev/null +++ b/recipes/schattenblick.recipe @@ -0,0 +1,13 @@ +from calibre.web.feeds.news import BasicNewsRecipe + +class AdvancedUserRecipe1345802300(BasicNewsRecipe): + title = u'Online-Zeitung Schattenblick' + language = 'de' + __author__ = 'ThB' + publisher = u'MA-Verlag' + category = u'Nachrichten' + oldest_article = 7 + max_articles_per_feed = 100 + cover_url = 'http://www.schattenblick.de/mobi/rss/cover.jpg' + feeds = [(u'Schattenblick Tagesausgabe', u'http://www.schattenblick.de/mobi/rss/rss.xml')] + diff --git a/recipes/smith.recipe b/recipes/smith.recipe index 3d6a95c494..cd0c94ab35 100644 --- a/recipes/smith.recipe +++ b/recipes/smith.recipe @@ -48,10 +48,14 @@ class Smithsonian(BasicNewsRecipe): link=post.find('a',href=True) url=link['href']+'?c=y&story=fullstory' if subsection is not None: - subsection_title = self.tag_to_string(subsection) + subsection_title = self.tag_to_string(subsection).strip() prefix = (subsection_title+': ') description=self.tag_to_string(post('p', limit=2)[1]).strip() else: + if post.find('img') is not None: + subsection_title = self.tag_to_string(post.findPrevious('div', attrs={'class':'departments plainModule'}).find('p', attrs={'class':'article-cat'})).strip() + prefix = (subsection_title+': ') + description=self.tag_to_string(post.find('p')).strip() desc=re.sub('\sBy\s.*', '', description, re.DOTALL) author=re.sub('.*By\s', '', description, re.DOTALL) @@ -64,4 +68,3 @@ class Smithsonian(BasicNewsRecipe): feeds[section_title] += articles ans = [(key, val) for key, val in feeds.iteritems()] return ans - diff --git a/recipes/spectator_magazine.recipe b/recipes/spectator_magazine.recipe new file mode 100644 index 0000000000..eb61a8babd --- /dev/null +++ b/recipes/spectator_magazine.recipe @@ -0,0 +1,60 @@ +from calibre.web.feeds.recipes import BasicNewsRecipe + +class NYTimes(BasicNewsRecipe): + + title = 'Spectator Magazine' + __author__ = 'Krittika Goyal' + description = 'Magazine' + timefmt = ' [%d %b, %Y]' + needs_subscription = False + language = 'en' + + no_stylesheets = True + #auto_cleanup = True + #auto_cleanup_keep = '//div[@class="thumbnail"]' + + keep_only_tags = dict(name='div', attrs={'id':'content'}) + remove_tags = [ + dict(name='div', attrs={'id':['disqus_thread']}), + ##dict(name='div', attrs={'id':['qrformdiv', 'inSection', 'alpha-inner']}), + ##dict(name='form', attrs={'onsubmit':''}), + #dict(name='section', attrs={'id':['article-quote', 'article-navigation']}), + ] + + #TO GET ARTICLE TOC + def spec_get_index(self): + return self.index_to_soup('http://www.spectator.co.uk/') + + # To parse artice toc + def parse_index(self): + parse_soup = self.index_to_soup('http://www.spectator.co.uk/') + + feeds = [] + feed_title = 'Spectator Magazine Articles' + + articles = [] + self.log('Found section:', feed_title) + div = parse_soup.find(attrs={'class':'one-col-tax-widget magazine-list columns-1 post-8 taxonomy-category full-width widget section-widget icit-taxonomical-listings'}) + for art in div.findAll(name='h2'): + art_info = art.find(name = 'a') + if art_info is None: + continue + art_title = self.tag_to_string(art_info) + url = art_info.get('href') + self.log.info('\tFound article:', art_title, 'at', url) + article = {'title':art_title, 'url':url, 'date':''} + #au = art.find(attrs={'class':'articleAuthors'}) + #if au is not None: + #article['author'] = self.tag_to_string(au) + #desc = art.find(attrs={'class':'hover_text'}) + #if desc is not None: + #desc = self.tag_to_string(desc) + #if 'author' in article: + #desc = ' by ' + article['author'] + ' ' +desc + #article['description'] = desc + articles.append(article) + if articles: + feeds.append((feed_title, articles)) + + return feeds + diff --git a/recipes/sueddeutsche_mobil.recipe b/recipes/sueddeutsche_mobil.recipe index d1b08cbcba..7b1a9c4d8d 100644 --- a/recipes/sueddeutsche_mobil.recipe +++ b/recipes/sueddeutsche_mobil.recipe @@ -1,13 +1,16 @@ -# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai __license__ = 'GPL v3' -__copyright__ = '2012, Andreas Zeiser ' +__copyright__ = '2012, 2013 Andreas Zeiser ' ''' szmobil.sueddeutsche.de/ ''' +# History +# 2013.01.09 Fixed bugs in article titles containing "strong" and +# other small changes +# 2012.08.04 Initial release from calibre import strftime from calibre.web.feeds.recipes import BasicNewsRecipe -import re +import re class SZmobil(BasicNewsRecipe): title = u'Süddeutsche Zeitung mobil' @@ -26,6 +29,8 @@ class SZmobil(BasicNewsRecipe): delay = 1 cover_source = 'http://www.sueddeutsche.de/verlag' + # if you want to get rid of the date on the title page use + # timefmt = '' timefmt = ' [%a, %d %b, %Y]' root_url ='http://szmobil.sueddeutsche.de/' @@ -50,7 +55,7 @@ class SZmobil(BasicNewsRecipe): return browser - def parse_index(self): + def parse_index(self): # find all sections src = self.index_to_soup('http://szmobil.sueddeutsche.de') feeds = [] @@ -76,10 +81,10 @@ class SZmobil(BasicNewsRecipe): # first check if link is a special article in section "Meinungsseite" if itt.find('strong')!= None: article_name = itt.strong.string - article_shorttitle = itt.contents[1] + if len(itt.contents)>1: + shorttitles[article_id] = itt.contents[1] articles.append( (article_name, article_url, article_id) ) - shorttitles[article_id] = article_shorttitle continue @@ -89,7 +94,7 @@ class SZmobil(BasicNewsRecipe): else: article_name = itt.string - if (article_name[0:10] == " mehr"): + if (article_name.find(" mehr") == 0): # just another link ("mehr") to an article continue @@ -102,7 +107,9 @@ class SZmobil(BasicNewsRecipe): for article_name, article_url, article_id in articles: url = self.root_url + article_url title = article_name - pubdate = strftime('%a, %d %b') + # if you want to get rid of date for each article use + # pubdate = strftime('') + pubdate = strftime('[%a, %d %b]') description = '' if shorttitles.has_key(article_id): description = shorttitles[article_id] @@ -115,3 +122,4 @@ class SZmobil(BasicNewsRecipe): return all_articles + diff --git a/recipes/tidbits.recipe b/recipes/tidbits.recipe index 702c65e9e4..a053dfb91f 100644 --- a/recipes/tidbits.recipe +++ b/recipes/tidbits.recipe @@ -16,8 +16,9 @@ class TidBITS(BasicNewsRecipe): oldest_article = 2 max_articles_per_feed = 100 no_stylesheets = True + #auto_cleanup = True encoding = 'utf-8' - use_embedded_content = True + use_embedded_content = False language = 'en' remove_empty_feeds = True masthead_url = 'http://db.tidbits.com/images/tblogo9.gif' @@ -30,9 +31,11 @@ class TidBITS(BasicNewsRecipe): , 'language' : language } - remove_attributes = ['width','height'] - remove_tags = [dict(name='small')] - remove_tags_after = dict(name='small') + #remove_attributes = ['width','height'] + #remove_tags = [dict(name='small')] + #remove_tags_after = dict(name='small') + keep_only_tags = [dict(name='div', attrs={'id':'center_ajax_sub'})] + remove_tags = [dict(name='div', attrs={'id':'social-media'})] feeds = [ (u'Business Apps' , u'http://db.tidbits.com/feeds/business.rss' ) diff --git a/recipes/todays_zaman.recipe b/recipes/todays_zaman.recipe index 5f3b85131a..13d82e31fb 100644 --- a/recipes/todays_zaman.recipe +++ b/recipes/todays_zaman.recipe @@ -26,28 +26,33 @@ class TodaysZaman_en(BasicNewsRecipe): # remove_attributes = ['width','height'] feeds = [ - ( u'Home', u'http://www.todayszaman.com/rss?sectionId=0'), - ( u'News', u'http://www.todayszaman.com/rss?sectionId=100'), - ( u'Business', u'http://www.todayszaman.com/rss?sectionId=105'), - ( u'Interviews', u'http://www.todayszaman.com/rss?sectionId=8'), - ( u'Columnists', u'http://www.todayszaman.com/rss?sectionId=6'), - ( u'Op-Ed', u'http://www.todayszaman.com/rss?sectionId=109'), - ( u'Arts & Culture', u'http://www.todayszaman.com/rss?sectionId=110'), - ( u'Expat Zone', u'http://www.todayszaman.com/rss?sectionId=132'), - ( u'Sports', u'http://www.todayszaman.com/rss?sectionId=5'), - ( u'Features', u'http://www.todayszaman.com/rss?sectionId=116'), - ( u'Travel', u'http://www.todayszaman.com/rss?sectionId=117'), - ( u'Leisure', u'http://www.todayszaman.com/rss?sectionId=118'), - ( u'Weird But True', u'http://www.todayszaman.com/rss?sectionId=134'), - ( u'Life', u'http://www.todayszaman.com/rss?sectionId=133'), - ( u'Health', u'http://www.todayszaman.com/rss?sectionId=126'), - ( u'Press Review', u'http://www.todayszaman.com/rss?sectionId=130'), - ( u'Todays think tanks', u'http://www.todayszaman.com/rss?sectionId=159'), - - ] + ( u'Home', u'http://www.todayszaman.com/0.rss'), + ( u'Sports', u'http://www.todayszaman.com/5.rss'), + ( u'Columnists', u'http://www.todayszaman.com/6.rss'), + ( u'Interviews', u'http://www.todayszaman.com/9.rss'), + ( u'News', u'http://www.todayszaman.com/100.rss'), + ( u'National', u'http://www.todayszaman.com/101.rss'), + ( u'Diplomacy', u'http://www.todayszaman.com/102.rss'), + ( u'World', u'http://www.todayszaman.com/104.rss'), + ( u'Business', u'http://www.todayszaman.com/105.rss'), + ( u'Op-Ed', u'http://www.todayszaman.com/109.rss'), + ( u'Arts & Culture', u'http://www.todayszaman.com/110.rss'), + ( u'Features', u'http://www.todayszaman.com/116.rss'), + ( u'Travel', u'http://www.todayszaman.com/117.rss'), + ( u'Food', u'http://www.todayszaman.com/124.rss'), + ( u'Press Review', u'http://www.todayszaman.com/130.rss'), + ( u'Expat Zone', u'http://www.todayszaman.com/132.rss'), + ( u'Life', u'http://www.todayszaman.com/133.rss'), + ( u'Think Tanks', u'http://www.todayszaman.com/159.rss'), + ( u'Almanac', u'http://www.todayszaman.com/161.rss'), + ( u'Health', u'http://www.todayszaman.com/162.rss'), + ( u'Fashion & Beauty', u'http://www.todayszaman.com/163.rss'), + ( u'Science & Technology', u'http://www.todayszaman.com/349.rss'), + ] #def preprocess_html(self, soup): # return self.adeify_images(soup) #def print_version(self, url): #there is a probem caused by table format #return url.replace('http://www.todayszaman.com/newsDetail_getNewsById.action?load=detay&', 'http://www.todayszaman.com/newsDetail_openPrintPage.action?') + diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip index 6aa473571b..8186cccaa6 100644 Binary files a/resources/compiled_coffeescript.zip and b/resources/compiled_coffeescript.zip differ diff --git a/resources/quick_start.epub b/resources/quick_start.epub index a3f74213a6..23728547cd 100644 Binary files a/resources/quick_start.epub and b/resources/quick_start.epub differ diff --git a/setup/iso_639/ca.po b/setup/iso_639/ca.po index fa4aebed41..8ca2f37de2 100644 --- a/setup/iso_639/ca.po +++ b/setup/iso_639/ca.po @@ -12,13 +12,13 @@ msgstr "" "Report-Msgid-Bugs-To: Debian iso-codes team \n" "POT-Creation-Date: 2011-11-25 14:01+0000\n" -"PO-Revision-Date: 2012-12-22 17:18+0000\n" +"PO-Revision-Date: 2012-12-31 12:50+0000\n" "Last-Translator: Ferran Rius \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-23 04:38+0000\n" +"X-Launchpad-Export-Date: 2013-01-01 04:45+0000\n" "X-Generator: Launchpad (build 16378)\n" "Language: ca\n" @@ -1744,7 +1744,7 @@ msgstr "Asu (Nigèria)" #. name for aun msgid "One; Molmo" -msgstr "One; Molmo" +msgstr "Oneià; Molmo" #. name for auo msgid "Auyokawa" @@ -1964,7 +1964,7 @@ msgstr "Leyigha" #. name for ayk msgid "Akuku" -msgstr "Akuku" +msgstr "Okpe-Idesa-Akuku; Akuku" #. name for ayl msgid "Arabic; Libyan" @@ -9984,7 +9984,7 @@ msgstr "Indri" #. name for ids msgid "Idesa" -msgstr "Idesa" +msgstr "Okpe-Idesa-Akuku; Idesa" #. name for idt msgid "Idaté" @@ -19524,7 +19524,7 @@ msgstr "" #. name for obi msgid "Obispeño" -msgstr "" +msgstr "Obispeño" #. name for obk msgid "Bontok; Southern" @@ -19532,7 +19532,7 @@ msgstr "Bontoc; meridional" #. name for obl msgid "Oblo" -msgstr "" +msgstr "Oblo" #. name for obm msgid "Moabite" @@ -19552,11 +19552,11 @@ msgstr "Bretó; antic" #. name for obu msgid "Obulom" -msgstr "" +msgstr "Obulom" #. name for oca msgid "Ocaina" -msgstr "" +msgstr "Ocaina" #. name for och msgid "Chinese; Old" @@ -19576,11 +19576,11 @@ msgstr "Matlazinca; Atzingo" #. name for oda msgid "Odut" -msgstr "" +msgstr "Odut" #. name for odk msgid "Od" -msgstr "" +msgstr "Od" #. name for odt msgid "Dutch; Old" @@ -19588,11 +19588,11 @@ msgstr "Holandès; antic" #. name for odu msgid "Odual" -msgstr "" +msgstr "Odual" #. name for ofo msgid "Ofo" -msgstr "" +msgstr "Ofo" #. name for ofs msgid "Frisian; Old" @@ -19604,11 +19604,11 @@ msgstr "" #. name for ogb msgid "Ogbia" -msgstr "" +msgstr "Ogbia" #. name for ogc msgid "Ogbah" -msgstr "" +msgstr "Ogbah" #. name for oge msgid "Georgian; Old" @@ -19616,7 +19616,7 @@ msgstr "" #. name for ogg msgid "Ogbogolo" -msgstr "" +msgstr "Ogbogolo" #. name for ogo msgid "Khana" @@ -19624,7 +19624,7 @@ msgstr "" #. name for ogu msgid "Ogbronuagum" -msgstr "" +msgstr "Ogbronuagum" #. name for oht msgid "Hittite; Old" @@ -19636,27 +19636,27 @@ msgstr "Hongarès; antic" #. name for oia msgid "Oirata" -msgstr "" +msgstr "Oirata" #. name for oin msgid "One; Inebu" -msgstr "" +msgstr "Oneià; Inebu" #. name for ojb msgid "Ojibwa; Northwestern" -msgstr "" +msgstr "Ojibwa; Nordoccidental" #. name for ojc msgid "Ojibwa; Central" -msgstr "" +msgstr "Ojibwa; Central" #. name for ojg msgid "Ojibwa; Eastern" -msgstr "" +msgstr "Ojibwa; Oriental" #. name for oji msgid "Ojibwa" -msgstr "" +msgstr "Ojibwa; Occidental" #. name for ojp msgid "Japanese; Old" @@ -19664,11 +19664,11 @@ msgstr "Japonès; antic" #. name for ojs msgid "Ojibwa; Severn" -msgstr "" +msgstr "Ojibwa; Severn" #. name for ojv msgid "Ontong Java" -msgstr "" +msgstr "Ontong Java" #. name for ojw msgid "Ojibwa; Western" @@ -19676,19 +19676,19 @@ msgstr "" #. name for oka msgid "Okanagan" -msgstr "" +msgstr "Colville-Okanagà" #. name for okb msgid "Okobo" -msgstr "" +msgstr "Okobo" #. name for okd msgid "Okodia" -msgstr "" +msgstr "Okodia" #. name for oke msgid "Okpe (Southwestern Edo)" -msgstr "" +msgstr "Okpe" #. name for okh msgid "Koresh-e Rostam" @@ -19696,15 +19696,15 @@ msgstr "" #. name for oki msgid "Okiek" -msgstr "" +msgstr "Okiek" #. name for okj msgid "Oko-Juwoi" -msgstr "" +msgstr "Oko-Juwoi" #. name for okk msgid "One; Kwamtim" -msgstr "" +msgstr "Oneià; Kwamtim" #. name for okl msgid "Kentish Sign Language; Old" @@ -19716,7 +19716,7 @@ msgstr "" #. name for okn msgid "Oki-No-Erabu" -msgstr "" +msgstr "Oki-No-Erabu" #. name for oko msgid "Korean; Old (3rd-9th cent.)" @@ -19728,19 +19728,19 @@ msgstr "" #. name for oks msgid "Oko-Eni-Osayen" -msgstr "" +msgstr "Oko-Eni-Osayen" #. name for oku msgid "Oku" -msgstr "" +msgstr "Oku" #. name for okv msgid "Orokaiva" -msgstr "" +msgstr "Orokaiwa" #. name for okx msgid "Okpe (Northwestern Edo)" -msgstr "" +msgstr "Okpe-Idesa-Akuku; Okpe" #. name for ola msgid "Walungge" @@ -19752,11 +19752,11 @@ msgstr "" #. name for ole msgid "Olekha" -msgstr "" +msgstr "Olekha" #. name for olm msgid "Oloma" -msgstr "" +msgstr "Oloma" #. name for olo msgid "Livvi" @@ -19768,7 +19768,7 @@ msgstr "" #. name for oma msgid "Omaha-Ponca" -msgstr "" +msgstr "Omaha-Ponca" #. name for omb msgid "Ambae; East" @@ -19780,23 +19780,23 @@ msgstr "" #. name for ome msgid "Omejes" -msgstr "" +msgstr "Omejes" #. name for omg msgid "Omagua" -msgstr "" +msgstr "Omagua" #. name for omi msgid "Omi" -msgstr "" +msgstr "Omi" #. name for omk msgid "Omok" -msgstr "" +msgstr "Omok" #. name for oml msgid "Ombo" -msgstr "" +msgstr "Ombo" #. name for omn msgid "Minoan" @@ -19816,11 +19816,11 @@ msgstr "" #. name for omt msgid "Omotik" -msgstr "" +msgstr "Omotik" #. name for omu msgid "Omurano" -msgstr "" +msgstr "Omurano" #. name for omw msgid "Tairora; South" @@ -19832,7 +19832,7 @@ msgstr "" #. name for ona msgid "Ona" -msgstr "" +msgstr "Ona" #. name for onb msgid "Lingao" @@ -19840,31 +19840,31 @@ msgstr "" #. name for one msgid "Oneida" -msgstr "" +msgstr "Oneida" #. name for ong msgid "Olo" -msgstr "" +msgstr "Olo" #. name for oni msgid "Onin" -msgstr "" +msgstr "Onin" #. name for onj msgid "Onjob" -msgstr "" +msgstr "Onjob" #. name for onk msgid "One; Kabore" -msgstr "" +msgstr "Oneià; Kabore" #. name for onn msgid "Onobasulu" -msgstr "" +msgstr "Onobasulu" #. name for ono msgid "Onondaga" -msgstr "" +msgstr "Onondaga" #. name for onp msgid "Sartang" @@ -19872,15 +19872,15 @@ msgstr "" #. name for onr msgid "One; Northern" -msgstr "" +msgstr "Oneià; Septentrional" #. name for ons msgid "Ono" -msgstr "" +msgstr "Ono" #. name for ont msgid "Ontenu" -msgstr "" +msgstr "Ontenu" #. name for onu msgid "Unua" @@ -19900,23 +19900,23 @@ msgstr "" #. name for oog msgid "Ong" -msgstr "" +msgstr "Ong" #. name for oon msgid "Önge" -msgstr "" +msgstr "Onge" #. name for oor msgid "Oorlams" -msgstr "" +msgstr "Oorlams" #. name for oos msgid "Ossetic; Old" -msgstr "" +msgstr "Osset" #. name for opa msgid "Okpamheri" -msgstr "" +msgstr "Okpamheri" #. name for opk msgid "Kopkaka" @@ -19924,39 +19924,39 @@ msgstr "" #. name for opm msgid "Oksapmin" -msgstr "" +msgstr "Oksapmin" #. name for opo msgid "Opao" -msgstr "" +msgstr "Opao" #. name for opt msgid "Opata" -msgstr "" +msgstr "Opata" #. name for opy msgid "Ofayé" -msgstr "" +msgstr "Opaie" #. name for ora msgid "Oroha" -msgstr "" +msgstr "Oroha" #. name for orc msgid "Orma" -msgstr "" +msgstr "Orma" #. name for ore msgid "Orejón" -msgstr "" +msgstr "Orejon" #. name for org msgid "Oring" -msgstr "" +msgstr "Oring" #. name for orh msgid "Oroqen" -msgstr "" +msgstr "Orotxen" #. name for ori msgid "Oriya" @@ -19968,19 +19968,19 @@ msgstr "Oromo" #. name for orn msgid "Orang Kanaq" -msgstr "" +msgstr "Orang; Kanaq" #. name for oro msgid "Orokolo" -msgstr "" +msgstr "Orocolo" #. name for orr msgid "Oruma" -msgstr "" +msgstr "Oruma" #. name for ors msgid "Orang Seletar" -msgstr "" +msgstr "Orang; Seletar" #. name for ort msgid "Oriya; Adivasi" @@ -19988,7 +19988,7 @@ msgstr "Oriya; Adivasi" #. name for oru msgid "Ormuri" -msgstr "" +msgstr "Ormuri" #. name for orv msgid "Russian; Old" @@ -19996,31 +19996,31 @@ msgstr "Rus; antic" #. name for orw msgid "Oro Win" -msgstr "" +msgstr "Oro Win" #. name for orx msgid "Oro" -msgstr "" +msgstr "Oro" #. name for orz msgid "Ormu" -msgstr "" +msgstr "Ormu" #. name for osa msgid "Osage" -msgstr "" +msgstr "Osage" #. name for osc msgid "Oscan" -msgstr "" +msgstr "Osc" #. name for osi msgid "Osing" -msgstr "" +msgstr "Osing" #. name for oso msgid "Ososo" -msgstr "" +msgstr "Ososo" #. name for osp msgid "Spanish; Old" @@ -20028,15 +20028,15 @@ msgstr "Espanyol; antic" #. name for oss msgid "Ossetian" -msgstr "" +msgstr "Osset" #. name for ost msgid "Osatu" -msgstr "" +msgstr "Osatu" #. name for osu msgid "One; Southern" -msgstr "" +msgstr "One; Meridional" #. name for osx msgid "Saxon; Old" @@ -20052,15 +20052,15 @@ msgstr "" #. name for otd msgid "Ot Danum" -msgstr "" +msgstr "Dohoi" #. name for ote msgid "Otomi; Mezquital" -msgstr "" +msgstr "Otomí; Mezquital" #. name for oti msgid "Oti" -msgstr "" +msgstr "Oti" #. name for otk msgid "Turkish; Old" @@ -20068,43 +20068,43 @@ msgstr "Turc; antic" #. name for otl msgid "Otomi; Tilapa" -msgstr "" +msgstr "Otomí; Tilapa" #. name for otm msgid "Otomi; Eastern Highland" -msgstr "" +msgstr "Otomí; Oriental" #. name for otn msgid "Otomi; Tenango" -msgstr "" +msgstr "Otomí; Tenango" #. name for otq msgid "Otomi; Querétaro" -msgstr "" +msgstr "Otomí; Queretaro" #. name for otr msgid "Otoro" -msgstr "" +msgstr "Otoro" #. name for ots msgid "Otomi; Estado de México" -msgstr "" +msgstr "Otomí; Estat de Mèxic" #. name for ott msgid "Otomi; Temoaya" -msgstr "" +msgstr "Otomí; Temoaya" #. name for otu msgid "Otuke" -msgstr "" +msgstr "Otuke" #. name for otw msgid "Ottawa" -msgstr "" +msgstr "Ottawa" #. name for otx msgid "Otomi; Texcatepec" -msgstr "" +msgstr "Otomí; Texcatepec" #. name for oty msgid "Tamil; Old" @@ -20112,7 +20112,7 @@ msgstr "" #. name for otz msgid "Otomi; Ixtenco" -msgstr "" +msgstr "Otomí; Ixtenc" #. name for oua msgid "Tagargrent" @@ -20124,7 +20124,7 @@ msgstr "" #. name for oue msgid "Oune" -msgstr "" +msgstr "Oune" #. name for oui msgid "Uighur; Old" @@ -20132,15 +20132,15 @@ msgstr "" #. name for oum msgid "Ouma" -msgstr "" +msgstr "Ouma" #. name for oun msgid "!O!ung" -msgstr "" +msgstr "Oung" #. name for owi msgid "Owiniga" -msgstr "" +msgstr "Owiniga" #. name for owl msgid "Welsh; Old" @@ -20148,11 +20148,11 @@ msgstr "Gal·lès; antic" #. name for oyb msgid "Oy" -msgstr "" +msgstr "Oy" #. name for oyd msgid "Oyda" -msgstr "" +msgstr "Oyda" #. name for oym msgid "Wayampi" @@ -20160,7 +20160,7 @@ msgstr "" #. name for oyy msgid "Oya'oya" -msgstr "" +msgstr "Oya'oya" #. name for ozm msgid "Koonzime" @@ -20168,27 +20168,27 @@ msgstr "" #. name for pab msgid "Parecís" -msgstr "" +msgstr "Pareci" #. name for pac msgid "Pacoh" -msgstr "" +msgstr "Pacoh" #. name for pad msgid "Paumarí" -msgstr "" +msgstr "Paumarí" #. name for pae msgid "Pagibete" -msgstr "" +msgstr "Pagibete" #. name for paf msgid "Paranawát" -msgstr "" +msgstr "Paranawat" #. name for pag msgid "Pangasinan" -msgstr "" +msgstr "Pangasi" #. name for pah msgid "Tenharim" @@ -20196,19 +20196,19 @@ msgstr "" #. name for pai msgid "Pe" -msgstr "" +msgstr "Pe" #. name for pak msgid "Parakanã" -msgstr "" +msgstr "Akwawa; Parakanà" #. name for pal msgid "Pahlavi" -msgstr "" +msgstr "Pahlavi" #. name for pam msgid "Pampanga" -msgstr "" +msgstr "Pampangà" #. name for pan msgid "Panjabi" @@ -20220,63 +20220,63 @@ msgstr "" #. name for pap msgid "Papiamento" -msgstr "" +msgstr "Papiament" #. name for paq msgid "Parya" -msgstr "" +msgstr "Parya" #. name for par msgid "Panamint" -msgstr "" +msgstr "Panamint" #. name for pas msgid "Papasena" -msgstr "" +msgstr "Papasena" #. name for pat msgid "Papitalai" -msgstr "" +msgstr "Papitalai" #. name for pau msgid "Palauan" -msgstr "" +msgstr "Palavà" #. name for pav msgid "Pakaásnovos" -msgstr "" +msgstr "Pakaa Nova" #. name for paw msgid "Pawnee" -msgstr "" +msgstr "Pawnee" #. name for pax msgid "Pankararé" -msgstr "" +msgstr "Pankararé" #. name for pay msgid "Pech" -msgstr "" +msgstr "Pech" #. name for paz msgid "Pankararú" -msgstr "" +msgstr "Pankarurú" #. name for pbb msgid "Páez" -msgstr "" +msgstr "Páez" #. name for pbc msgid "Patamona" -msgstr "" +msgstr "Patamona" #. name for pbe msgid "Popoloca; Mezontla" -msgstr "" +msgstr "Popoloca; Mezontla" #. name for pbf msgid "Popoloca; Coyotepec" -msgstr "" +msgstr "Popoloca; Coyotepec" #. name for pbg msgid "Paraujano" @@ -20288,7 +20288,7 @@ msgstr "" #. name for pbi msgid "Parkwa" -msgstr "" +msgstr "Parkwa" #. name for pbl msgid "Mak (Nigeria)" @@ -20300,7 +20300,7 @@ msgstr "" #. name for pbo msgid "Papel" -msgstr "" +msgstr "Papel" #. name for pbp msgid "Badyara" @@ -20336,7 +20336,7 @@ msgstr "" #. name for pca msgid "Popoloca; Santa Inés Ahuatempan" -msgstr "" +msgstr "Popoloca; Ahuatempan" #. name for pcb msgid "Pear" @@ -20832,7 +20832,7 @@ msgstr "Senufo; Palaka" #. name for pls msgid "Popoloca; San Marcos Tlalcoyalco" -msgstr "" +msgstr "Popoloca; Tlalcoyalc" #. name for plt msgid "Malagasy; Plateau" @@ -21040,7 +21040,7 @@ msgstr "" #. name for poe msgid "Popoloca; San Juan Atzingo" -msgstr "" +msgstr "Popoloca; Atzingo" #. name for pof msgid "Poke" @@ -21104,7 +21104,7 @@ msgstr "" #. name for pow msgid "Popoloca; San Felipe Otlaltepec" -msgstr "" +msgstr "Popoloca; Otlaltepec" #. name for pox msgid "Polabian" @@ -21160,7 +21160,7 @@ msgstr "" #. name for pps msgid "Popoloca; San Luís Temalacayuca" -msgstr "" +msgstr "Popoloca; Temalacayuca" #. name for ppt msgid "Pare" diff --git a/setup/iso_639/es.po b/setup/iso_639/es.po index 7b1126a18b..93582e18ab 100644 --- a/setup/iso_639/es.po +++ b/setup/iso_639/es.po @@ -9,13 +9,13 @@ msgstr "" "Project-Id-Version: calibre\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-11-25 14:01+0000\n" -"PO-Revision-Date: 2012-12-24 08:05+0000\n" -"Last-Translator: Adolfo Jayme Barrientos \n" +"PO-Revision-Date: 2012-12-28 09:13+0000\n" +"Last-Translator: Jellby \n" "Language-Team: Español; Castellano <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-25 04:46+0000\n" +"X-Launchpad-Export-Date: 2012-12-29 05:00+0000\n" "X-Generator: Launchpad (build 16378)\n" #. name for aaa @@ -9584,7 +9584,7 @@ msgstr "Holikachuk" #. name for hoj msgid "Hadothi" -msgstr "Hadothi" +msgstr "Hadoti" #. name for hol msgid "Holu" @@ -11796,7 +11796,7 @@ msgstr "" #. name for khq msgid "Songhay; Koyra Chiini" -msgstr "" +msgstr "Songhay koyra chiini" #. name for khr msgid "Kharia" diff --git a/setup/translations.py b/setup/translations.py index 3942953179..e0a512d21c 100644 --- a/setup/translations.py +++ b/setup/translations.py @@ -227,9 +227,22 @@ class GetTranslations(Translations): # {{{ ans.append(line.split()[-1]) return ans + def resolve_conflicts(self): + conflict = False + for line in subprocess.check_output(['bzr', 'status']).splitlines(): + if line == 'conflicts:': + conflict = True + break + if not conflict: + raise Exception('bzr merge failed and no conflicts found') + subprocess.check_call(['bzr', 'resolve', '--take-other']) + def run(self, opts): if not self.modified_translations: - subprocess.check_call(['bzr', 'merge', self.BRANCH]) + try: + subprocess.check_call(['bzr', 'merge', self.BRANCH]) + except subprocess.CalledProcessError: + self.resolve_conflicts() self.check_for_errors() if self.modified_translations: diff --git a/src/calibre/constants.py b/src/calibre/constants.py index ba56e1fc9e..aa96dc0553 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -4,7 +4,7 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net' __docformat__ = 'restructuredtext en' __appname__ = u'calibre' -numeric_version = (0, 9, 12) +numeric_version = (0, 9, 14) __version__ = u'.'.join(map(unicode, numeric_version)) __author__ = u"Kovid Goyal " diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py index 00ec6294fb..7eba099bd2 100644 --- a/src/calibre/customize/profiles.py +++ b/src/calibre/customize/profiles.py @@ -770,13 +770,25 @@ class PocketBook900Output(OutputProfile): dpi = 150.0 comic_screen_size = screen_size +class PocketBookPro912Output(OutputProfile): + + author = 'Daniele Pizzolli' + name = 'PocketBook Pro 912' + short_name = 'pocketbook_pro_912' + description = _('This profile is intended for the PocketBook Pro 912 series of devices.') + + # According to http://download.pocketbook-int.com/user-guides/E_Ink/912/User_Guide_PocketBook_912(EN).pdf + screen_size = (825, 1200) + dpi = 155.0 + comic_screen_size = screen_size + output_profiles = [OutputProfile, SonyReaderOutput, SonyReader300Output, SonyReader900Output, MSReaderOutput, MobipocketOutput, HanlinV3Output, HanlinV5Output, CybookG3Output, CybookOpusOutput, KindleOutput, iPadOutput, iPad3Output, KoboReaderOutput, TabletOutput, SamsungGalaxy, SonyReaderLandscapeOutput, KindleDXOutput, IlliadOutput, IRexDR1000Output, IRexDR800Output, JetBook5Output, NookOutput, - BambookOutput, NookColorOutput, PocketBook900Output, GenericEink, - GenericEinkLarge, KindleFireOutput, KindlePaperWhiteOutput] + BambookOutput, NookColorOutput, PocketBook900Output, PocketBookPro912Output, + GenericEink, GenericEinkLarge, KindleFireOutput, KindlePaperWhiteOutput] output_profiles.sort(cmp=lambda x,y:cmp(x.name.lower(), y.name.lower())) diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py index cc42cf33b2..acee4938f5 100644 --- a/src/calibre/devices/android/driver.py +++ b/src/calibre/devices/android/driver.py @@ -191,7 +191,7 @@ class ANDROID(USBMS): 0x10a9 : { 0x6050 : [0x227] }, # Prestigio - 0x2207 : { 0 : [0x222] }, + 0x2207 : { 0 : [0x222], 0x10 : [0x222] }, } EBOOK_DIR_MAIN = ['eBooks/import', 'wordplayer/calibretransfer', 'Books', @@ -214,7 +214,7 @@ class ANDROID(USBMS): 'POCKET', 'ONDA_MID', 'ZENITHIN', 'INGENIC', 'PMID701C', 'PD', 'PMP5097C', 'MASS', 'NOVO7', 'ZEKI', 'COBY', 'SXZ', 'USB_2.0', 'COBY_MID', 'VS', 'AINOL', 'TOPWISE', 'PAD703', 'NEXT8D12', - 'MEDIATEK'] + 'MEDIATEK', 'KEENHI'] WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE', '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897', 'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', @@ -234,7 +234,8 @@ class ANDROID(USBMS): 'THINKPAD_TABLET', 'SGH-T989', 'YP-G70', 'STORAGE_DEVICE', 'ADVANCED', 'SGH-I727', 'USB_FLASH_DRIVER', 'ANDROID', 'S5830I_CARD', 'MID7042', 'LINK-CREATE', '7035', 'VIEWPAD_7E', - 'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS'] + 'NOVO7', 'MB526', '_USB#WYK7MSF8KE', 'TABLET_PC', 'F', 'MT65XX_MS', + 'ICS'] WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897', 'FILE-STOR_GADGET', 'SGH-T959_CARD', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD', 'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD', diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py index 04501d193a..045eb2b4b7 100644 --- a/src/calibre/devices/eb600/driver.py +++ b/src/calibre/devices/eb600/driver.py @@ -234,7 +234,7 @@ class POCKETBOOK301(USBMS): class POCKETBOOK602(USBMS): name = 'PocketBook Pro 602/902 Device Interface' - description = _('Communicate with the PocketBook 602/603/902/903 reader.') + description = _('Communicate with the PocketBook 602/603/902/903/Pro 912 reader.') author = 'Kovid Goyal' supported_platforms = ['windows', 'osx', 'linux'] FORMATS = ['epub', 'fb2', 'prc', 'mobi', 'pdf', 'djvu', 'rtf', 'chm', @@ -249,7 +249,7 @@ class POCKETBOOK602(USBMS): VENDOR_NAME = '' WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = ['PB602', 'PB603', 'PB902', - 'PB903', 'PB'] + 'PB903', 'Pocket912', 'PB'] class POCKETBOOK622(POCKETBOOK602): diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py index 2932c657b0..1baeb2842d 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -37,7 +37,7 @@ class KOBO(USBMS): dbversion = 0 fwversion = 0 - supported_dbversion = 65 + supported_dbversion = 75 has_kepubs = False supported_platforms = ['windows', 'osx', 'linux'] diff --git a/src/calibre/devices/mtp/unix/devices.c b/src/calibre/devices/mtp/unix/devices.c index 098d0aedcb..b6d50bac5b 100644 --- a/src/calibre/devices/mtp/unix/devices.c +++ b/src/calibre/devices/mtp/unix/devices.c @@ -20,6 +20,9 @@ const calibre_device_entry_t calibre_mtp_device_table[] = { , { "Google", 0x18d1, "Nexus 10", 0x4ee2, DEVICE_FLAGS_ANDROID_BUGS} , { "Google", 0x18d1, "Nexus 10", 0x4ee1, DEVICE_FLAGS_ANDROID_BUGS} + // Kobo Arc + , { "Kobo", 0x2237, "Arc", 0xd108, DEVICE_FLAGS_ANDROID_BUGS} + , { NULL, 0xffff, NULL, 0xffff, DEVICE_FLAG_NONE } }; diff --git a/src/calibre/devices/mtp/unix/driver.py b/src/calibre/devices/mtp/unix/driver.py index 2a22b175e9..0e4461df7d 100644 --- a/src/calibre/devices/mtp/unix/driver.py +++ b/src/calibre/devices/mtp/unix/driver.py @@ -13,7 +13,7 @@ from collections import namedtuple from functools import partial from calibre import prints, as_unicode -from calibre.constants import plugins +from calibre.constants import plugins, islinux from calibre.ptempfile import SpooledTemporaryFile from calibre.devices.errors import OpenFailed, DeviceError, BlacklistedDevice from calibre.devices.mtp.base import MTPDeviceBase, synchronous, debug @@ -44,6 +44,17 @@ class MTP_DEVICE(MTPDeviceBase): self.blacklisted_devices = set() self.ejected_devices = set() self.currently_connected_dev = None + self._is_device_mtp = None + if islinux: + from calibre.devices.mtp.unix.sysfs import MTPDetect + self._is_device_mtp = MTPDetect() + + def is_device_mtp(self, d, debug=None): + ''' Returns True iff the _is_device_mtp check returns True and libmtp + is able to probe the device successfully. ''' + if self._is_device_mtp is None: return False + return (self._is_device_mtp(d, debug=debug) and + self.libmtp.is_mtp_device(d.busnum, d.devnum)) def set_debug_level(self, lvl): self.libmtp.set_debug_level(lvl) @@ -77,7 +88,9 @@ class MTP_DEVICE(MTPDeviceBase): for d in devs: ans = cache.get(d, None) if ans is None: - ans = (d.vendor_id, d.product_id) in self.known_devices + ans = ( + (d.vendor_id, d.product_id) in self.known_devices or + self.is_device_mtp(d)) cache[d] = ans if ans: return d @@ -95,12 +108,13 @@ class MTP_DEVICE(MTPDeviceBase): err = 'startup() not called on this device driver' p(err) return False - devs = [d for d in devices_on_system if (d.vendor_id, d.product_id) - in self.known_devices and d.vendor_id != APPLE] + devs = [d for d in devices_on_system if + ( (d.vendor_id, d.product_id) in self.known_devices or + self.is_device_mtp(d, debug=p)) and d.vendor_id != APPLE] if not devs: - p('No known MTP devices connected to system') + p('No MTP devices connected to system') return False - p('Known MTP devices connected:') + p('MTP devices connected:') for d in devs: p(d) for d in devs: diff --git a/src/calibre/devices/mtp/unix/libmtp.c b/src/calibre/devices/mtp/unix/libmtp.c index 920ddde3d1..0191e04ef1 100644 --- a/src/calibre/devices/mtp/unix/libmtp.c +++ b/src/calibre/devices/mtp/unix/libmtp.c @@ -662,13 +662,6 @@ is_mtp_device(PyObject *self, PyObject *args) { if (!PyArg_ParseTuple(args, "ii", &busnum, &devnum)) return NULL; - /* - * LIBMTP_Check_Specific_Device does not seem to work at least on my linux - * system. Need to investigate why later. Most devices are in the device - * table so this is not terribly important. - */ - /* LIBMTP_Set_Debug(LIBMTP_DEBUG_ALL); */ - /* printf("Calling check: %d %d\n", busnum, devnum); */ Py_BEGIN_ALLOW_THREADS; ans = LIBMTP_Check_Specific_Device(busnum, devnum); Py_END_ALLOW_THREADS; @@ -734,6 +727,7 @@ initlibmtp(void) { // who designs a library without anyway to control/redirect the debugging // output, and hardcoded paths that cannot be changed? int bak, new; + fprintf(stdout, "\n"); // This is needed, without it, for some odd reason the code below causes stdout to buffer all output after it is restored, rather than using line buffering, and setlinebuf does not work. fflush(stdout); bak = dup(STDOUT_FILENO); new = open("/dev/null", O_WRONLY); diff --git a/src/calibre/devices/mtp/unix/sysfs.py b/src/calibre/devices/mtp/unix/sysfs.py new file mode 100644 index 0000000000..737ea1916b --- /dev/null +++ b/src/calibre/devices/mtp/unix/sysfs.py @@ -0,0 +1,53 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) + +__license__ = 'GPL v3' +__copyright__ = '2013, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import os, glob + +class MTPDetect(object): + + SYSFS_PATH = os.environ.get('SYSFS_PATH', '/sys') + + def __init__(self): + self.base = os.path.join(self.SYSFS_PATH, 'subsystem', 'usb', 'devices') + if not os.path.exists(self.base): + self.base = os.path.join(self.SYSFS_PATH, 'bus', 'usb', 'devices') + self.ok = os.path.exists(self.base) + + def __call__(self, dev, debug=None): + ''' + Check if the device has an interface named "MTP" using sysfs, which + avoids probing the device. + ''' + if not self.ok: return False + + def read(x): + try: + with open(x, 'rb') as f: + return f.read() + except EnvironmentError: + pass + + ipath = os.path.join(self.base, '{0}-*/{0}-*/interface'.format(dev.busnum)) + for x in glob.glob(ipath): + raw = read(x) + if not raw or raw.strip() != b'MTP': continue + raw = read(os.path.join(os.path.dirname(os.path.dirname(x)), + 'devnum')) + try: + if raw and int(raw) == dev.devnum: + if debug is not None: + debug('Unknown device {0} claims to be an MTP device' + .format(dev)) + return True + except (ValueError, TypeError): + continue + + return False + + diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py index a9df1c0d94..9da1ab9635 100644 --- a/src/calibre/devices/smart_device_app/driver.py +++ b/src/calibre/devices/smart_device_app/driver.py @@ -300,19 +300,21 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): 'particular IP address. The driver will listen only on the ' 'entered address, and this address will be the one advertized ' 'over mDNS (bonjour).') + '

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

' + + _('Use this option to overwrite a book on the device if that book ' + 'has the same calibre identifier as the book being sent. The file name of the ' + 'book will not change even if the save template produces a ' + 'different result. Using this option in most cases prevents ' + 'having multiple copies of a book on the device.') + '

', ] EXTRA_CUSTOMIZATION_DEFAULT = [ - False, - '', - '', - '', + False, '', + '', '', False, '9090', - False, - '', - '', - '', - True, - '' + False, '', + '', '', + True, '', + True ] OPT_AUTOSTART = 0 OPT_PASSWORD = 2 @@ -322,6 +324,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): OPT_COLLECTIONS = 8 OPT_AUTODISCONNECT = 10 OPT_FORCE_IP_ADDRESS = 11 + OPT_OVERWRITE_BOOKS_UUID = 12 def __init__(self, path): @@ -385,6 +388,20 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): fname = sanitize(fname) ext = os.path.splitext(fname)[1] + try: + # If we have already seen this book's UUID, use the existing path + if self.settings().extra_customization[self.OPT_OVERWRITE_BOOKS_UUID]: + existing_book = self._uuid_already_on_device(mdata.uuid, ext) + if existing_book and existing_book.lpath: + return existing_book.lpath + + # If the device asked for it, try to use the UUID as the file name. + # Fall back to the ch if the UUID doesn't exist. + if self.client_wants_uuid_file_names and mdata.uuid: + return (mdata.uuid + ext) + except: + pass + maxlen = (self.MAX_PATH_LEN - (self.PATH_FUDGE_FACTOR + self.exts_path_lengths.get(ext, self.PATH_FUDGE_FACTOR))) @@ -671,12 +688,24 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): return not v_thumb or v_thumb[1] == b_thumb[1] return False + def _uuid_already_on_device(self, uuid, ext): + try: + return self.known_uuids.get(uuid + ext, None) + except: + return None + def _set_known_metadata(self, book, remove=False): lpath = book.lpath + ext = os.path.splitext(lpath)[1] + uuid = book.get('uuid', None) if remove: self.known_metadata.pop(lpath, None) + if uuid and ext: + self.known_uuids.pop(uuid+ext, None) else: - self.known_metadata[lpath] = book.deepcopy() + new_book = self.known_metadata[lpath] = book.deepcopy() + if uuid and ext: + self.known_uuids[uuid+ext] = new_book def _close_device_socket(self): if self.device_socket is not None: @@ -845,6 +874,10 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): self._close_device_socket() return False + self.client_wants_uuid_file_names = result.get('useUuidFileNames', False) + self._debug('Device wants UUID file names', self.client_wants_uuid_file_names) + + config = self._configProxy() config['format_map'] = exts self._debug('selected formats', config['format_map']) @@ -1085,6 +1118,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): for i, infile in enumerate(files): mdata, fname = metadata.next(), names.next() lpath = self._create_upload_path(mdata, fname, create_dirs=False) + self._debug('lpath', lpath) if not hasattr(infile, 'read'): infile = USBMS.normalize_path(infile) book = SDBook(self.PREFIX, lpath, other=mdata) @@ -1246,6 +1280,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): self.device_socket = None self.json_codec = JsonCodec() self.known_metadata = {} + self.known_uuids = {} self.debug_time = time.time() self.debug_start_time = time.time() self.max_book_packet_len = 0 @@ -1253,6 +1288,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin): self.connection_attempts = {} self.client_can_stream_books = False self.client_can_stream_metadata = False + self.client_wants_uuid_file_names = False self._debug("All IP addresses", get_all_ips()) diff --git a/src/calibre/ebooks/conversion/plugins/pdf_output.py b/src/calibre/ebooks/conversion/plugins/pdf_output.py index c042de7050..b9d016de2d 100644 --- a/src/calibre/ebooks/conversion/plugins/pdf_output.py +++ b/src/calibre/ebooks/conversion/plugins/pdf_output.py @@ -8,11 +8,11 @@ __docformat__ = 'restructuredtext en' Convert OEB ebook format to PDF. ''' -import glob -import os +import glob, os -from calibre.customize.conversion import OutputFormatPlugin, \ - OptionRecommendation +from calibre.constants import iswindows, islinux +from calibre.customize.conversion import (OutputFormatPlugin, + OptionRecommendation) from calibre.ptempfile import TemporaryDirectory UNITS = ['millimeter', 'centimeter', 'point', 'inch' , 'pica' , 'didot', @@ -73,13 +73,13 @@ class PDFOutput(OutputFormatPlugin): ' of stretching it to fill the full first page of the' ' generated pdf.')), OptionRecommendation(name='pdf_serif_family', - recommended_value='Times New Roman', help=_( + recommended_value='Liberation Serif' if islinux else 'Times New Roman', help=_( 'The font family used to render serif fonts')), OptionRecommendation(name='pdf_sans_family', - recommended_value='Helvetica', help=_( + recommended_value='Liberation Sans' if islinux else 'Helvetica', help=_( 'The font family used to render sans-serif fonts')), OptionRecommendation(name='pdf_mono_family', - recommended_value='Courier New', help=_( + recommended_value='Liberation Mono' if islinux else 'Courier New', help=_( 'The font family used to render monospaced fonts')), OptionRecommendation(name='pdf_standard_font', choices=['serif', 'sans', 'mono'], @@ -102,6 +102,10 @@ class PDFOutput(OutputFormatPlugin): ]) def convert(self, oeb_book, output_path, input_plugin, opts, log): + from calibre.gui2 import must_use_qt, load_builtin_fonts + must_use_qt() + load_builtin_fonts() + self.oeb = oeb_book self.input_plugin, self.opts, self.log = input_plugin, opts, log self.output_path = output_path @@ -135,9 +139,8 @@ class PDFOutput(OutputFormatPlugin): If you ever move to Qt WebKit 2.3+ then this will be unnecessary. ''' from calibre.ebooks.oeb.base import urlnormalize - from calibre.gui2 import must_use_qt - from calibre.utils.fonts.utils import get_font_names, remove_embed_restriction - from PyQt4.Qt import QFontDatabase, QByteArray + from calibre.utils.fonts.utils import remove_embed_restriction + from PyQt4.Qt import QFontDatabase, QByteArray, QRawFont, QFont # First find all @font-face rules and remove them, adding the embedded # fonts to Qt @@ -165,12 +168,13 @@ class PDFOutput(OutputFormatPlugin): raw = remove_embed_restriction(raw) except: continue - must_use_qt() - QFontDatabase.addApplicationFontFromData(QByteArray(raw)) - try: - family_name = get_font_names(raw)[0] - except: - family_name = None + fid = QFontDatabase.addApplicationFontFromData(QByteArray(raw)) + family_name = None + if fid > -1: + try: + family_name = unicode(QFontDatabase.applicationFontFamilies(fid)[0]) + except (IndexError, KeyError): + pass if family_name: family_map[icu_lower(font_family)] = family_name @@ -179,6 +183,7 @@ class PDFOutput(OutputFormatPlugin): # Now map the font family name specified in the css to the actual # family name of the embedded font (they may be different in general). + font_warnings = set() for item in self.oeb.manifest: if not hasattr(item.data, 'cssRules'): continue for i, rule in enumerate(item.data.cssRules): @@ -187,9 +192,28 @@ class PDFOutput(OutputFormatPlugin): if ff is None: continue val = ff.propertyValue for i in xrange(val.length): - k = icu_lower(val[i].value) + try: + k = icu_lower(val[i].value) + except (AttributeError, TypeError): + val[i].value = k = 'times' if k in family_map: val[i].value = family_map[k] + if iswindows: + # On windows, Qt uses GDI which does not support OpenType + # (CFF) fonts, so we need to nuke references to OpenType + # fonts. Note that you could compile QT with configure + # -directwrite, but that requires atleast Vista SP2 + for i in xrange(val.length): + family = val[i].value + if family: + f = QRawFont.fromFont(QFont(family)) + if len(f.fontTable('head')) == 0: + if family not in font_warnings: + self.log.warn('Ignoring unsupported font: %s' + %family) + font_warnings.add(family) + # Either a bitmap or (more likely) a CFF font + val[i].value = 'times' def convert_text(self, oeb_book): from calibre.ebooks.metadata.opf2 import OPF @@ -232,7 +256,15 @@ class PDFOutput(OutputFormatPlugin): out_stream.seek(0) out_stream.truncate() self.log.debug('Rendering pages to PDF...') - writer.dump(items, out_stream, PDFMetadata(self.metadata)) + import time + st = time.time() + if False: + import cProfile + cProfile.runctx('writer.dump(items, out_stream, PDFMetadata(self.metadata))', + globals(), locals(), '/tmp/profile') + else: + writer.dump(items, out_stream, PDFMetadata(self.metadata)) + self.log('Rendered PDF in %g seconds:'%(time.time()-st)) if close: out_stream.close() diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py index a673de87d7..98b230e5bb 100644 --- a/src/calibre/ebooks/lit/reader.py +++ b/src/calibre/ebooks/lit/reader.py @@ -11,13 +11,17 @@ import struct, os, functools, re from urlparse import urldefrag from cStringIO import StringIO from urllib import unquote as urlunquote + +from lxml import etree + from calibre.ebooks.lit import LitError from calibre.ebooks.lit.maps import OPF_MAP, HTML_MAP import calibre.ebooks.lit.mssha1 as mssha1 -from calibre.ebooks.oeb.base import urlnormalize +from calibre.ebooks.oeb.base import urlnormalize, xpath from calibre.ebooks.oeb.reader import OEBReader from calibre.ebooks import DRMError from calibre import plugins + lzx, lxzerror = plugins['lzx'] msdes, msdeserror = plugins['msdes'] @@ -907,3 +911,16 @@ class LitReader(OEBReader): Container = LitContainer DEFAULT_PROFILE = 'MSReader' + def _spine_from_opf(self, opf): + manifest = self.oeb.manifest + for elem in xpath(opf, '/o2:package/o2:spine/o2:itemref'): + idref = elem.get('idref') + if idref not in manifest.ids: + continue + item = manifest.ids[idref] + if (item.media_type.lower() == 'application/xml' and + hasattr(item.data, 'xpath') and item.data.xpath('/html')): + item.media_type = 'application/xhtml+xml' + item.data = item._parse_xhtml(etree.tostring(item.data)) + super(LitReader, self)._spine_from_opf(opf) + diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py index 725338ead8..d99d914ed0 100644 --- a/src/calibre/ebooks/lrf/__init__.py +++ b/src/calibre/ebooks/lrf/__init__.py @@ -41,7 +41,6 @@ def find_custom_fonts(options, logger): if options.serif_family: f = family(options.serif_family) fonts['serif'] = font_scanner.legacy_fonts_for_family(f) - print (111111, fonts['serif']) if not fonts['serif']: logger.warn('Unable to find serif family %s'%f) if options.sans_family: diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py index bc81df5a79..e216610ad5 100644 --- a/src/calibre/ebooks/metadata/epub.py +++ b/src/calibre/ebooks/metadata/epub.py @@ -291,6 +291,8 @@ def set_metadata(stream, mi, apply_null=False, update_timestamp=False): reader.opf.smart_update(mi) + if getattr(mi, 'uuid', None): + reader.opf.application_id = mi.uuid if apply_null: if not getattr(mi, 'series', None): reader.opf.series = None diff --git a/src/calibre/ebooks/metadata/mobi.py b/src/calibre/ebooks/metadata/mobi.py index e701946c01..e223dcac23 100644 --- a/src/calibre/ebooks/metadata/mobi.py +++ b/src/calibre/ebooks/metadata/mobi.py @@ -390,6 +390,10 @@ class MetadataUpdater(object): not added_501 and not share_not_sync): from uuid import uuid4 update_exth_record((113, str(uuid4()))) + # Add a 112 record with actual UUID + if getattr(mi, 'uuid', None): + update_exth_record((112, + (u"calibre:%s" % mi.uuid).encode(self.codec, 'replace'))) if 503 in self.original_exth_records: update_exth_record((503, mi.title.encode(self.codec, 'replace'))) diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py index 3e5d95f1ce..92287589eb 100644 --- a/src/calibre/ebooks/metadata/opf2.py +++ b/src/calibre/ebooks/metadata/opf2.py @@ -941,12 +941,11 @@ class OPF(object): # {{{ return self.get_text(match) or None def fset(self, val): - matches = self.application_id_path(self.metadata) - if not matches: - attrib = {'{%s}scheme'%self.NAMESPACES['opf']: 'calibre'} - matches = [self.create_metadata_element('identifier', - attrib=attrib)] - self.set_text(matches[0], unicode(val)) + for x in tuple(self.application_id_path(self.metadata)): + x.getparent().remove(x) + attrib = {'{%s}scheme'%self.NAMESPACES['opf']: 'calibre'} + self.set_text(self.create_metadata_element( + 'identifier', attrib=attrib), unicode(val)) return property(fget=fget, fset=fset) diff --git a/src/calibre/ebooks/mobi/writer8/exth.py b/src/calibre/ebooks/mobi/writer8/exth.py index a060e338d1..31792d2156 100644 --- a/src/calibre/ebooks/mobi/writer8/exth.py +++ b/src/calibre/ebooks/mobi/writer8/exth.py @@ -110,6 +110,12 @@ def build_exth(metadata, prefer_author_sort=False, is_periodical=False, exth.write(uuid) nrecs += 1 + # Write UUID as SOURCE + c_uuid = b'calibre:%s' % uuid + exth.write(pack(b'>II', 112, len(c_uuid) + 8)) + exth.write(c_uuid) + nrecs += 1 + # Write cdetype if not is_periodical: if not share_not_sync: diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py index bfa52368a4..6da1e4c529 100644 --- a/src/calibre/ebooks/oeb/transforms/metadata.py +++ b/src/calibre/ebooks/oeb/transforms/metadata.py @@ -115,8 +115,11 @@ class MergeMetadata(object): if mi.uuid is not None: m.filter('identifier', lambda x:x.id=='uuid_id') self.oeb.metadata.add('identifier', mi.uuid, id='uuid_id', - scheme='uuid') + scheme='uuid') self.oeb.uid = self.oeb.metadata.identifier[-1] + if mi.application_id is not None: + m.filter('identifier', lambda x:x.scheme=='calibre') + self.oeb.metadata.add('identifier', mi.application_id, scheme='calibre') def set_cover(self, mi, prefer_metadata_cover): cdata, ext = '', 'jpg' diff --git a/src/calibre/ebooks/oeb/transforms/subset.py b/src/calibre/ebooks/oeb/transforms/subset.py index f85f786547..0cca73fcce 100644 --- a/src/calibre/ebooks/oeb/transforms/subset.py +++ b/src/calibre/ebooks/oeb/transforms/subset.py @@ -36,7 +36,15 @@ class SubsetFonts(object): self.oeb.manifest.remove(font['item']) font['rule'].parentStyleSheet.deleteRule(font['rule']) + fonts = {} for font in self.embedded_fonts: + item, chars = font['item'], font['chars'] + if item.href in fonts: + fonts[item.href]['chars'] |= chars + else: + fonts[item.href] = font + + for font in fonts.itervalues(): if not font['chars']: self.log('The font %s is unused. Removing it.'%font['src']) remove(font) diff --git a/src/calibre/ebooks/pdf/render/common.py b/src/calibre/ebooks/pdf/render/common.py index 5be06b1b98..d5f4b6a66b 100644 --- a/src/calibre/ebooks/pdf/render/common.py +++ b/src/calibre/ebooks/pdf/render/common.py @@ -9,8 +9,11 @@ __docformat__ = 'restructuredtext en' import codecs, zlib from io import BytesIO -from struct import pack -from decimal import Decimal +from datetime import datetime + +from calibre.constants import plugins, ispy3 + +pdf_float = plugins['speedup'][0].pdf_float EOL = b'\n' @@ -52,32 +55,31 @@ PAPER_SIZES = {k:globals()[k.upper()] for k in ('a0 a1 a2 a3 a4 a5 a6 b0 b1 b2' # Basic PDF datatypes {{{ -def format_float(f): - if abs(f) < 1e-7: - return '0' - places = 6 - a, b = type(u'')(Decimal(f).quantize(Decimal(10)**-places)).partition('.')[0::2] - b = b.rstrip('0') - if not b: - return '0' if a == '-0' else a - return '%s.%s'%(a, b) +ic = str if ispy3 else unicode +icb = (lambda x: str(x).encode('ascii')) if ispy3 else bytes def fmtnum(o): - if isinstance(o, (int, long)): - return type(u'')(o) - return format_float(o) + if isinstance(o, float): + return pdf_float(o) + return ic(o) def serialize(o, stream): - if hasattr(o, 'pdf_serialize'): - o.pdf_serialize(stream) + if isinstance(o, float): + stream.write_raw(pdf_float(o).encode('ascii')) elif isinstance(o, bool): - stream.write(b'true' if o else b'false') + # Must check bool before int as bools are subclasses of int + stream.write_raw(b'true' if o else b'false') elif isinstance(o, (int, long)): - stream.write(type(u'')(o).encode('ascii')) - elif isinstance(o, float): - stream.write(format_float(o).encode('ascii')) + stream.write_raw(icb(o)) + elif hasattr(o, 'pdf_serialize'): + o.pdf_serialize(stream) elif o is None: - stream.write(b'null') + stream.write_raw(b'null') + elif isinstance(o, datetime): + val = o.strftime("D:%Y%m%d%H%M%%02d%z")%min(59, o.second) + if datetime.tzinfo is not None: + val = "(%s'%s')"%(val[:-2], val[-2:]) + stream.write(val.encode('ascii')) else: raise ValueError('Unknown object: %r'%o) @@ -103,13 +105,6 @@ class String(unicode): raw = codecs.BOM_UTF16_BE + s.encode('utf-16-be') stream.write(b'('+raw+b')') -class GlyphIndex(int): - - def pdf_serialize(self, stream): - byts = bytearray(pack(b'>H', self)) - stream.write('<%s>'%''.join(map( - lambda x: bytes(hex(x)[2:]).rjust(2, b'0'), byts))) - class Dictionary(dict): def pdf_serialize(self, stream): @@ -180,6 +175,9 @@ class Stream(BytesIO): super(Stream, self).write(raw if isinstance(raw, bytes) else raw.encode('ascii')) + def write_raw(self, raw): + BytesIO.write(self, raw) + class Reference(object): def __init__(self, num, obj): diff --git a/src/calibre/ebooks/pdf/render/engine.py b/src/calibre/ebooks/pdf/render/engine.py index aa1fa17cc3..1be8613cea 100644 --- a/src/calibre/ebooks/pdf/render/engine.py +++ b/src/calibre/ebooks/pdf/render/engine.py @@ -13,15 +13,13 @@ from functools import wraps, partial from future_builtins import map import sip -from PyQt4.Qt import (QPaintEngine, QPaintDevice, Qt, QApplication, QPainter, - QTransform, QImage, QByteArray, QBuffer, - qRgba) +from PyQt4.Qt import (QPaintEngine, QPaintDevice, Qt, QTransform, QBrush) from calibre.constants import plugins from calibre.ebooks.pdf.render.serialize import (PDFStream, Path) from calibre.ebooks.pdf.render.common import inch, A4, fmtnum from calibre.ebooks.pdf.render.graphics import convert_path, Graphics -from calibre.utils.fonts.sfnt.container import Sfnt +from calibre.utils.fonts.sfnt.container import Sfnt, UnsupportedFont from calibre.utils.fonts.sfnt.metrics import FontMetrics Point = namedtuple('Point', 'x y') @@ -51,11 +49,18 @@ class Font(FontMetrics): class PdfEngine(QPaintEngine): + FEATURES = QPaintEngine.AllFeatures & ~( + QPaintEngine.PorterDuff | QPaintEngine.PerspectiveTransform + | QPaintEngine.ObjectBoundingModeGradients + | QPaintEngine.RadialGradientFill + | QPaintEngine.ConicalGradientFill + ) + def __init__(self, file_object, page_width, page_height, left_margin, top_margin, right_margin, bottom_margin, width, height, errors=print, debug=print, compress=True, mark_links=False): - QPaintEngine.__init__(self, self.features) + QPaintEngine.__init__(self, self.FEATURES) self.file_object = file_object self.compress, self.mark_links = compress, mark_links self.page_height, self.page_width = page_height, page_width @@ -76,13 +81,10 @@ class PdfEngine(QPaintEngine): self.bottom_margin) / self.pixel_height self.pdf_system = QTransform(sx, 0, 0, -sy, dx, dy) - self.graphics = Graphics() + self.graphics = Graphics(self.pixel_width, self.pixel_height) self.errors_occurred = False self.errors, self.debug = errors, debug self.fonts = {} - i = QImage(1, 1, QImage.Format_ARGB32) - i.fill(qRgba(0, 0, 0, 255)) - self.alpha_bit = i.constBits().asstring(4).find(b'\xff') self.current_page_num = 1 self.current_page_inited = False self.qt_hack, err = plugins['qt_hack'] @@ -90,7 +92,11 @@ class PdfEngine(QPaintEngine): raise RuntimeError('Failed to load qt_hack with err: %s'%err) def apply_graphics_state(self): - self.graphics(self.pdf, self.pdf_system, self.painter()) + self.graphics(self.pdf_system, self.painter()) + + def resolve_fill(self, rect): + self.graphics.resolve_fill(rect, self.pdf_system, + self.painter().transform()) @property def do_fill(self): @@ -102,18 +108,10 @@ class PdfEngine(QPaintEngine): def init_page(self): self.pdf.transform(self.pdf_system) - self.pdf.set_rgb_colorspace() self.graphics.reset() self.pdf.save_stack() self.current_page_inited = True - @property - def features(self): - # gradient_flags = self.MaskedBrush | self.PatternBrush | self.PatternTransform - return (self.Antialiasing | self.AlphaBlend | self.ConstantOpacity | - self.PainterPaths | self.PaintOutsidePaintEvent | - self.PrimitiveTransform | self.PixmapTransform) #| gradient_flags - def begin(self, device): if not hasattr(self, 'pdf'): try: @@ -121,6 +119,7 @@ class PdfEngine(QPaintEngine): self.page_height), compress=self.compress, mark_links=self.mark_links, debug=self.debug) + self.graphics.begin(self.pdf) except: self.errors(traceback.format_exc()) self.errors_occurred = True @@ -149,7 +148,23 @@ class PdfEngine(QPaintEngine): def type(self): return QPaintEngine.Pdf - # TODO: Tiled pixmap + def add_image(self, img, cache_key): + if img.isNull(): return + return self.pdf.add_image(img, cache_key) + + @store_error + def drawTiledPixmap(self, rect, pixmap, point): + self.apply_graphics_state() + brush = QBrush(pixmap) + bl = rect.topLeft() + color, opacity, pattern, do_fill = self.graphics.convert_brush( + brush, bl-point, 1.0, self.pdf_system, + self.painter().transform()) + self.pdf.save_stack() + self.pdf.apply_fill(color, pattern) + self.pdf.draw_rect(bl.x(), bl.y(), rect.width(), rect.height(), + stroke=False, fill=True) + self.pdf.restore_stack() @store_error def drawPixmap(self, rect, pixmap, source_rect): @@ -160,8 +175,8 @@ class PdfEngine(QPaintEngine): image = pixmap.toImage() ref = self.add_image(image, pixmap.cacheKey()) if ref is not None: - self.pdf.draw_image(rect.x(), rect.height()+rect.y(), rect.width(), - -rect.height(), ref) + self.pdf.draw_image(rect.x(), rect.y(), rect.width(), + rect.height(), ref) @store_error def drawImage(self, rect, image, source_rect, flags=Qt.AutoColor): @@ -171,72 +186,8 @@ class PdfEngine(QPaintEngine): image.copy(source_rect)) ref = self.add_image(image, image.cacheKey()) if ref is not None: - self.pdf.draw_image(rect.x(), rect.height()+rect.y(), rect.width(), - -rect.height(), ref) - - def add_image(self, img, cache_key): - if img.isNull(): return - ref = self.pdf.get_image(cache_key) - if ref is not None: - return ref - - fmt = img.format() - image = QImage(img) - if (image.depth() == 1 and img.colorTable().size() == 2 and - img.colorTable().at(0) == QColor(Qt.black).rgba() and - img.colorTable().at(1) == QColor(Qt.white).rgba()): - if fmt == QImage.Format_MonoLSB: - image = image.convertToFormat(QImage.Format_Mono) - fmt = QImage.Format_Mono - else: - if (fmt != QImage.Format_RGB32 and fmt != QImage.Format_ARGB32): - image = image.convertToFormat(QImage.Format_ARGB32) - fmt = QImage.Format_ARGB32 - - w = image.width() - h = image.height() - d = image.depth() - - if fmt == QImage.Format_Mono: - bytes_per_line = (w + 7) >> 3 - data = image.constBits().asstring(bytes_per_line * h) - return self.pdf.write_image(data, w, h, d, cache_key=cache_key) - - ba = QByteArray() - buf = QBuffer(ba) - image.save(buf, 'jpeg', 94) - data = bytes(ba.data()) - has_alpha = has_mask = False - soft_mask = mask = None - - if fmt == QImage.Format_ARGB32: - tmask = image.constBits().asstring(4*w*h)[self.alpha_bit::4] - sdata = bytearray(tmask) - vals = set(sdata) - vals.discard(255) - has_mask = bool(vals) - vals.discard(0) - has_alpha = bool(vals) - - if has_alpha: - soft_mask = self.pdf.write_image(tmask, w, h, 8) - elif has_mask: - # dither the soft mask to 1bit and add it. This also helps PDF - # viewers without transparency support - bytes_per_line = (w + 7) >> 3 - mdata = bytearray(0 for i in xrange(bytes_per_line * h)) - spos = mpos = 0 - for y in xrange(h): - for x in xrange(w): - if sdata[spos]: - mdata[mpos + x>>3] |= (0x80 >> (x&7)) - spos += 1 - mpos += bytes_per_line - mdata = bytes(mdata) - mask = self.pdf.write_image(mdata, w, h, 1) - - return self.pdf.write_image(data, w, h, 32, mask=mask, dct=True, - soft_mask=soft_mask, cache_key=cache_key) + self.pdf.draw_image(rect.x(), rect.y(), rect.width(), + rect.height(), ref) @store_error def updateState(self, state): @@ -263,14 +214,20 @@ class PdfEngine(QPaintEngine): @store_error def drawRects(self, rects): self.apply_graphics_state() - for rect in rects: - bl = rect.topLeft() - self.pdf.draw_rect(bl.x(), bl.y(), rect.width(), rect.height(), - stroke=self.do_stroke, fill=self.do_fill) + with self.graphics: + for rect in rects: + self.resolve_fill(rect) + bl = rect.topLeft() + self.pdf.draw_rect(bl.x(), bl.y(), rect.width(), rect.height(), + stroke=self.do_stroke, fill=self.do_fill) def create_sfnt(self, text_item): get_table = partial(self.qt_hack.get_sfnt_table, text_item) - ans = Font(Sfnt(get_table)) + try: + ans = Font(Sfnt(get_table)) + except UnsupportedFont as e: + raise UnsupportedFont('The font %s is not a valid sfnt. Error: %s'%( + text_item.font().family(), e)) glyph_map = self.qt_hack.get_glyph_map(text_item) gm = {} for uc, glyph_id in enumerate(glyph_map): @@ -281,7 +238,7 @@ class PdfEngine(QPaintEngine): @store_error def drawTextItem(self, point, text_item): - # super(PdfEngine, self).drawTextItem(point, text_item) + # return super(PdfEngine, self).drawTextItem(point, text_item) self.apply_graphics_state() gi = self.qt_hack.get_glyphs(point, text_item) if not gi.indices: @@ -289,7 +246,10 @@ class PdfEngine(QPaintEngine): return name = hash(bytes(gi.name)) if name not in self.fonts: - self.fonts[name] = self.create_sfnt(text_item) + try: + self.fonts[name] = self.create_sfnt(text_item) + except UnsupportedFont: + return super(PdfEngine, self).drawTextItem(point, text_item) metrics = self.fonts[name] for glyph_id in gi.indices: try: @@ -297,18 +257,14 @@ class PdfEngine(QPaintEngine): except (KeyError, ValueError): pass glyphs = [] - pdf_pos = point - first_baseline = None + last_x = last_y = 0 for i, pos in enumerate(gi.positions): - if first_baseline is None: - first_baseline = pos.y() - glyph_pos = pos - delta = glyph_pos - pdf_pos - glyphs.append((delta.x(), pos.y()-first_baseline, gi.indices[i])) - pdf_pos = glyph_pos + x, y = pos.x(), pos.y() + glyphs.append((x-last_x, last_y - y, gi.indices[i])) + last_x, last_y = x, y - self.pdf.draw_glyph_run([1, 0, 0, -1, point.x(), - point.y()], gi.size, metrics, glyphs) + self.pdf.draw_glyph_run([gi.stretch, 0, 0, -1, 0, 0], gi.size, metrics, + glyphs) sip.delete(gi) @store_error @@ -388,8 +344,8 @@ class PdfDevice(QPaintDevice): # {{{ return int(round(self.body_height * self.ydpi / 72.0)) return 0 - def end_page(self): - self.engine.end_page() + def end_page(self, *args, **kwargs): + self.engine.end_page(*args, **kwargs) def init_page(self): self.engine.init_page() @@ -411,55 +367,4 @@ class PdfDevice(QPaintDevice): # {{{ # }}} -if __name__ == '__main__': - from PyQt4.Qt import (QBrush, QColor, QPoint, QPixmap, QPainterPath) - QBrush, QColor, QPoint, QPixmap, QPainterPath - app = QApplication([]) - p = QPainter() - with open('/t/painter.pdf', 'wb') as f: - dev = PdfDevice(f, compress=False) - p.begin(dev) - dev.init_page() - xmax, ymax = p.viewport().width(), p.viewport().height() - b = p.brush() - try: - p.drawRect(0, 0, xmax, ymax) - # p.drawPolyline(QPoint(0, 0), QPoint(xmax, 0), QPoint(xmax, ymax), - # QPoint(0, ymax), QPoint(0, 0)) - # pp = QPainterPath() - # pp.addRect(0, 0, xmax, ymax) - # p.drawPath(pp) - p.save() - for i in xrange(3): - col = [0, 0, 0, 200] - col[i] = 255 - p.setOpacity(0.3) - p.fillRect(0, 0, xmax/10, xmax/10, QBrush(QColor(*col))) - p.setOpacity(1) - p.drawRect(0, 0, xmax/10, xmax/10) - p.translate(xmax/10, xmax/10) - p.scale(1, 1.5) - p.restore() - - # p.scale(2, 2) - # p.rotate(45) - p.drawPixmap(0, 0, 2048, 2048, QPixmap(I('library.png'))) - p.drawRect(0, 0, 2048, 2048) - - f = p.font() - f.setPointSize(20) - # f.setLetterSpacing(f.PercentageSpacing, 200) - # f.setUnderline(True) - # f.setOverline(True) - # f.setStrikeOut(True) - f.setFamily('Calibri') - p.setFont(f) - # p.setPen(QColor(0, 0, 255)) - # p.scale(2, 2) - # p.rotate(45) - p.drawText(QPoint(300, 300), 'Some—text not By’s ū --- Д AV ff ff') - finally: - p.end() - if dev.engine.errors_occurred: - raise SystemExit(1) diff --git a/src/calibre/ebooks/pdf/render/from_html.py b/src/calibre/ebooks/pdf/render/from_html.py index 47aa295743..69636f8b9a 100644 --- a/src/calibre/ebooks/pdf/render/from_html.py +++ b/src/calibre/ebooks/pdf/render/from_html.py @@ -47,7 +47,7 @@ def get_page_size(opts, for_comic=False): # {{{ if opts.unit == 'devicepixel': factor = 72.0 / opts.output_profile.dpi else: - {'point':1.0, 'inch':inch, 'cicero':cicero, + factor = {'point':1.0, 'inch':inch, 'cicero':cicero, 'didot':didot, 'pica':pica, 'millimeter':mm, 'centimeter':cm}[opts.unit] page_size = (factor*width, factor*height) @@ -147,9 +147,10 @@ class PDFWriter(QObject): opts = self.opts page_size = get_page_size(self.opts) xdpi, ydpi = self.view.logicalDpiX(), self.view.logicalDpiY() + # We cannot set the side margins in the webview as there is no right + # margin for the last page (the margins are implemented with + # -webkit-column-gap) ml, mr = opts.margin_left, opts.margin_right - margin_side = min(ml, mr) - ml, mr = ml - margin_side, mr - margin_side self.doc = PdfDevice(out_stream, page_size=page_size, left_margin=ml, top_margin=0, right_margin=mr, bottom_margin=0, xdpi=xdpi, ydpi=ydpi, errors=self.log.error, @@ -162,9 +163,7 @@ class PDFWriter(QObject): self.total_items = len(items) mt, mb = map(self.doc.to_px, (opts.margin_top, opts.margin_bottom)) - ms = self.doc.to_px(margin_side, vertical=False) - self.margin_top, self.margin_size, self.margin_bottom = map( - lambda x:int(floor(x)), (mt, ms, mb)) + self.margin_top, self.margin_bottom = map(lambda x:int(floor(x)), (mt, mb)) self.painter = QPainter(self.doc) self.doc.set_metadata(title=pdf_metadata.title, @@ -176,6 +175,7 @@ class PDFWriter(QObject): p = QPixmap() p.loadFromData(self.cover_data) if not p.isNull(): + self.doc.init_page() draw_image_page(QRect(0, 0, self.doc.width(), self.doc.height()), self.painter, p, preserve_aspect_ratio=self.opts.preserve_cover_aspect_ratio) @@ -184,7 +184,8 @@ class PDFWriter(QObject): self.painter.restore() QTimer.singleShot(0, self.render_book) - self.loop.exec_() + if self.loop.exec_() == 1: + raise Exception('PDF Output failed, see log for details') if self.toc is not None and len(self.toc) > 0: self.doc.add_outline(self.toc) @@ -257,7 +258,7 @@ class PDFWriter(QObject): paged_display.layout(); paged_display.fit_images(); py_bridge.value = book_indexing.all_links_and_anchors(); - '''%(self.margin_top, self.margin_size, self.margin_bottom)) + '''%(self.margin_top, 0, self.margin_bottom)) amap = self.bridge_value if not isinstance(amap, dict): @@ -278,6 +279,7 @@ class PDFWriter(QObject): if self.doc.errors_occurred: break - self.doc.add_links(self.current_item, start_page, amap['links'], - amap['anchors']) + if not self.doc.errors_occurred: + self.doc.add_links(self.current_item, start_page, amap['links'], + amap['anchors']) diff --git a/src/calibre/ebooks/pdf/render/gradients.py b/src/calibre/ebooks/pdf/render/gradients.py new file mode 100644 index 0000000000..0c6a2485d1 --- /dev/null +++ b/src/calibre/ebooks/pdf/render/gradients.py @@ -0,0 +1,153 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) + +__license__ = 'GPL v3' +__copyright__ = '2013, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import sys, copy +from future_builtins import map +from collections import namedtuple + +import sip +from PyQt4.Qt import QLinearGradient, QPointF + +from calibre.ebooks.pdf.render.common import Name, Array, Dictionary + +Stop = namedtuple('Stop', 't color') + +class LinearGradientPattern(Dictionary): + + def __init__(self, brush, matrix, pdf, pixel_page_width, pixel_page_height): + self.matrix = (matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), + matrix.dx(), matrix.dy()) + gradient = sip.cast(brush.gradient(), QLinearGradient) + + start, stop, stops = self.spread_gradient(gradient, pixel_page_width, + pixel_page_height, matrix) + + # TODO: Handle colors with different opacities + self.const_opacity = stops[0].color[-1] + + funcs = Array() + bounds = Array() + encode = Array() + + for i, current_stop in enumerate(stops): + if i < len(stops) - 1: + next_stop = stops[i+1] + func = Dictionary({ + 'FunctionType': 2, + 'Domain': Array([0, 1]), + 'C0': Array(current_stop.color[:3]), + 'C1': Array(next_stop.color[:3]), + 'N': 1, + }) + funcs.append(func) + encode.extend((0, 1)) + if i+1 < len(stops) - 1: + bounds.append(next_stop.t) + + func = Dictionary({ + 'FunctionType': 3, + 'Domain': Array([stops[0].t, stops[-1].t]), + 'Functions': funcs, + 'Bounds': bounds, + 'Encode': encode, + }) + + shader = Dictionary({ + 'ShadingType': 2, + 'ColorSpace': Name('DeviceRGB'), + 'AntiAlias': True, + 'Coords': Array([start.x(), start.y(), stop.x(), stop.y()]), + 'Function': func, + 'Extend': Array([True, True]), + }) + + Dictionary.__init__(self, { + 'Type': Name('Pattern'), + 'PatternType': 2, + 'Shading': shader, + 'Matrix': Array(self.matrix), + }) + + self.cache_key = (self.__class__.__name__, self.matrix, + tuple(shader['Coords']), stops) + + def spread_gradient(self, gradient, pixel_page_width, pixel_page_height, + matrix): + start = gradient.start() + stop = gradient.finalStop() + stops = list(map(lambda x: [x[0], x[1].getRgbF()], gradient.stops())) + spread = gradient.spread() + if spread != gradient.PadSpread: + inv = matrix.inverted()[0] + page_rect = tuple(map(inv.map, ( + QPointF(0, 0), QPointF(pixel_page_width, 0), QPointF(0, pixel_page_height), + QPointF(pixel_page_width, pixel_page_height)))) + maxx = maxy = -sys.maxint-1 + minx = miny = sys.maxint + + for p in page_rect: + minx, maxx = min(minx, p.x()), max(maxx, p.x()) + miny, maxy = min(miny, p.y()), max(maxy, p.y()) + + def in_page(point): + return (minx <= point.x() <= maxx and miny <= point.y() <= maxy) + + offset = stop - start + llimit, rlimit = start, stop + + reflect = False + base_stops = copy.deepcopy(stops) + reversed_stops = list(reversed(stops)) + do_reflect = spread == gradient.ReflectSpread + totl = abs(stops[-1][0] - stops[0][0]) + intervals = [abs(stops[i+1][0] - stops[i][0])/totl + for i in xrange(len(stops)-1)] + + while in_page(llimit): + reflect ^= True + llimit -= offset + estops = reversed_stops if (reflect and do_reflect) else base_stops + stops = copy.deepcopy(estops) + stops + + first_is_reflected = reflect + reflect = False + + while in_page(rlimit): + reflect ^= True + rlimit += offset + estops = reversed_stops if (reflect and do_reflect) else base_stops + stops = stops + copy.deepcopy(estops) + + start, stop = llimit, rlimit + + num = len(stops) // len(base_stops) + if num > 1: + # Adjust the stop parameter values + t = base_stops[0][0] + rlen = totl/num + reflect = first_is_reflected ^ True + intervals = [i*rlen for i in intervals] + rintervals = list(reversed(intervals)) + + for i in xrange(num): + reflect ^= True + pos = i * len(base_stops) + tvals = [t] + for ival in (rintervals if reflect and do_reflect else + intervals): + tvals.append(tvals[-1] + ival) + for j in xrange(len(base_stops)): + stops[pos+j][0] = tvals[j] + t = tvals[-1] + + # In case there were rounding errors + stops[-1][0] = base_stops[-1][0] + + return start, stop, tuple(Stop(s[0], s[1]) for s in stops) + diff --git a/src/calibre/ebooks/pdf/render/graphics.py b/src/calibre/ebooks/pdf/render/graphics.py index 68efb2514a..25e23fcd0b 100644 --- a/src/calibre/ebooks/pdf/render/graphics.py +++ b/src/calibre/ebooks/pdf/render/graphics.py @@ -8,14 +8,17 @@ __copyright__ = '2012, Kovid Goyal ' __docformat__ = 'restructuredtext en' from math import sqrt +from collections import namedtuple -from PyQt4.Qt import (QBrush, QPen, Qt, QPointF, QTransform, QPainterPath, - QPaintEngine) +from PyQt4.Qt import ( + QBrush, QPen, Qt, QPointF, QTransform, QPaintEngine, QImage) -from calibre.ebooks.pdf.render.common import Array -from calibre.ebooks.pdf.render.serialize import Path, Color +from calibre.ebooks.pdf.render.common import ( + Name, Array, fmtnum, Stream, Dictionary) +from calibre.ebooks.pdf.render.serialize import Path +from calibre.ebooks.pdf.render.gradients import LinearGradientPattern -def convert_path(path): +def convert_path(path): # {{{ p = Path() i = 0 while i < path.elementCount(): @@ -38,12 +41,215 @@ def convert_path(path): if not added: raise ValueError('Invalid curve to operation') return p +# }}} +Brush = namedtuple('Brush', 'origin brush color') + +class TilingPattern(Stream): + + def __init__(self, cache_key, matrix, w=8, h=8, paint_type=2, compress=False): + Stream.__init__(self, compress=compress) + self.paint_type = paint_type + self.w, self.h = w, h + self.matrix = (matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), + matrix.dx(), matrix.dy()) + self.resources = Dictionary() + self.cache_key = (self.__class__.__name__, cache_key, self.matrix) + + def add_extra_keys(self, d): + d['Type'] = Name('Pattern') + d['PatternType'] = 1 + d['PaintType'] = self.paint_type + d['TilingType'] = 1 + d['BBox'] = Array([0, 0, self.w, self.h]) + d['XStep'] = self.w + d['YStep'] = self.h + d['Matrix'] = Array(self.matrix) + d['Resources'] = self.resources + +class QtPattern(TilingPattern): + + qt_patterns = ( # {{{ + "0 J\n" + "6 w\n" + "[] 0 d\n" + "4 0 m\n" + "4 8 l\n" + "0 4 m\n" + "8 4 l\n" + "S\n", # Dense1Pattern + + "0 J\n" + "2 w\n" + "[6 2] 1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n" + "[] 0 d\n" + "2 0 m\n" + "2 8 l\n" + "6 0 m\n" + "6 8 l\n" + "S\n" + "[6 2] -3 d\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # Dense2Pattern + + "0 J\n" + "2 w\n" + "[6 2] 1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n" + "[2 2] -1 d\n" + "2 0 m\n" + "2 8 l\n" + "6 0 m\n" + "6 8 l\n" + "S\n" + "[6 2] -3 d\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # Dense3Pattern + + "0 J\n" + "2 w\n" + "[2 2] 1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n" + "[2 2] -1 d\n" + "2 0 m\n" + "2 8 l\n" + "6 0 m\n" + "6 8 l\n" + "S\n" + "[2 2] 1 d\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # Dense4Pattern + + "0 J\n" + "2 w\n" + "[2 6] -1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n" + "[2 2] 1 d\n" + "2 0 m\n" + "2 8 l\n" + "6 0 m\n" + "6 8 l\n" + "S\n" + "[2 6] 3 d\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # Dense5Pattern + + "0 J\n" + "2 w\n" + "[2 6] -1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n" + "[2 6] 3 d\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # Dense6Pattern + + "0 J\n" + "2 w\n" + "[2 6] -1 d\n" + "0 0 m\n" + "0 8 l\n" + "8 0 m\n" + "8 8 l\n" + "S\n", # Dense7Pattern + + "1 w\n" + "0 4 m\n" + "8 4 l\n" + "S\n", # HorPattern + + "1 w\n" + "4 0 m\n" + "4 8 l\n" + "S\n", # VerPattern + + "1 w\n" + "4 0 m\n" + "4 8 l\n" + "0 4 m\n" + "8 4 l\n" + "S\n", # CrossPattern + + "1 w\n" + "-1 5 m\n" + "5 -1 l\n" + "3 9 m\n" + "9 3 l\n" + "S\n", # BDiagPattern + + "1 w\n" + "-1 3 m\n" + "5 9 l\n" + "3 -1 m\n" + "9 5 l\n" + "S\n", # FDiagPattern + + "1 w\n" + "-1 3 m\n" + "5 9 l\n" + "3 -1 m\n" + "9 5 l\n" + "-1 5 m\n" + "5 -1 l\n" + "3 9 m\n" + "9 3 l\n" + "S\n", # DiagCrossPattern + ) # }}} + + def __init__(self, pattern_num, matrix): + super(QtPattern, self).__init__(pattern_num, matrix) + self.write(self.qt_patterns[pattern_num-2]) + +class TexturePattern(TilingPattern): + + def __init__(self, pixmap, matrix, pdf, clone=None): + if clone is None: + image = pixmap.toImage() + cache_key = pixmap.cacheKey() + imgref = pdf.add_image(image, cache_key) + paint_type = (2 if image.format() in {QImage.Format_MonoLSB, + QImage.Format_Mono} else 1) + super(TexturePattern, self).__init__( + cache_key, matrix, w=image.width(), h=image.height(), + paint_type=paint_type) + m = (self.w, 0, 0, -self.h, 0, self.h) + self.resources['XObject'] = Dictionary({'Texture':imgref}) + self.write_line('%s cm /Texture Do'%(' '.join(map(fmtnum, m)))) + else: + super(TexturePattern, self).__init__( + clone.cache_key[1], matrix, w=clone.w, h=clone.h, + paint_type=clone.paint_type) + self.resources['XObject'] = Dictionary(clone.resources['XObject']) + self.write(clone.getvalue()) class GraphicsState(object): FIELDS = ('fill', 'stroke', 'opacity', 'transform', 'brush_origin', - 'clip', 'do_fill', 'do_stroke') + 'clip_updated', 'do_fill', 'do_stroke') def __init__(self): self.fill = QBrush() @@ -51,9 +257,10 @@ class GraphicsState(object): self.opacity = 1.0 self.transform = QTransform() self.brush_origin = QPointF() - self.clip = QPainterPath() + self.clip_updated = False self.do_fill = False self.do_stroke = True + self.qt_pattern_cache = {} def __eq__(self, other): for x in self.FIELDS: @@ -68,16 +275,20 @@ class GraphicsState(object): ans.opacity = self.opacity ans.transform = self.transform * QTransform() ans.brush_origin = QPointF(self.brush_origin) - ans.clip = self.clip + ans.clip_updated = self.clip_updated ans.do_fill, ans.do_stroke = self.do_fill, self.do_stroke return ans class Graphics(object): - def __init__(self): + def __init__(self, page_width_px, page_height_px): self.base_state = GraphicsState() self.current_state = GraphicsState() self.pending_state = None + self.page_width_px, self.page_height_px = (page_width_px, page_height_px) + + def begin(self, pdf): + self.pdf = pdf def update_state(self, state, painter): flags = state.state() @@ -102,21 +313,22 @@ class Graphics(object): s.opacity = state.opacity() if flags & QPaintEngine.DirtyClipPath or flags & QPaintEngine.DirtyClipRegion: - s.clip = painter.clipPath() + s.clip_updated = True def reset(self): self.current_state = GraphicsState() self.pending_state = None - def __call__(self, pdf, pdf_system, painter): + def __call__(self, pdf_system, painter): # Apply the currently pending state to the PDF if self.pending_state is None: return pdf_state = self.current_state ps = self.pending_state + pdf = self.pdf - if (ps.transform != pdf_state.transform or ps.clip != pdf_state.clip): + if ps.transform != pdf_state.transform or ps.clip_updated: pdf.restore_stack() pdf.save_stack() pdf_state = self.base_state @@ -125,29 +337,71 @@ class Graphics(object): pdf.transform(ps.transform) if (pdf_state.opacity != ps.opacity or pdf_state.stroke != ps.stroke): - self.apply_stroke(ps, pdf, pdf_system, painter) + self.apply_stroke(ps, pdf_system, painter) if (pdf_state.opacity != ps.opacity or pdf_state.fill != ps.fill or pdf_state.brush_origin != ps.brush_origin): - self.apply_fill(ps, pdf, pdf_system, painter) + self.apply_fill(ps, pdf_system, painter) - if (pdf_state.clip != ps.clip): - p = convert_path(ps.clip) - fill_rule = {Qt.OddEvenFill:'evenodd', - Qt.WindingFill:'winding'}[ps.clip.fillRule()] - pdf.add_clip(p, fill_rule=fill_rule) + if ps.clip_updated: + ps.clip_updated = False + path = painter.clipPath() + if not path.isEmpty(): + p = convert_path(path) + fill_rule = {Qt.OddEvenFill:'evenodd', + Qt.WindingFill:'winding'}[path.fillRule()] + pdf.add_clip(p, fill_rule=fill_rule) self.current_state = self.pending_state self.pending_state = None - def apply_stroke(self, state, pdf, pdf_system, painter): - # TODO: Handle pens with non solid brushes by setting the colorspace - # for stroking to a pattern + def convert_brush(self, brush, brush_origin, global_opacity, + pdf_system, qt_system): + # Convert a QBrush to PDF operators + style = brush.style() + pdf = self.pdf + + pattern = color = pat = None + opacity = global_opacity + do_fill = True + + matrix = (QTransform.fromTranslate(brush_origin.x(), brush_origin.y()) + * pdf_system * qt_system.inverted()[0]) + vals = list(brush.color().getRgbF()) + self.brushobj = None + + if style <= Qt.DiagCrossPattern: + opacity *= vals[-1] + color = vals[:3] + + if style > Qt.SolidPattern: + pat = QtPattern(style, matrix) + + elif style == Qt.TexturePattern: + pat = TexturePattern(brush.texture(), matrix, pdf) + if pat.paint_type == 2: + opacity *= vals[-1] + color = vals[:3] + + elif style == Qt.LinearGradientPattern: + pat = LinearGradientPattern(brush, matrix, pdf, self.page_width_px, + self.page_height_px) + opacity *= pat.const_opacity + # TODO: Add support for radial/conical gradient fills + + if opacity < 1e-4 or style == Qt.NoBrush: + do_fill = False + self.brushobj = Brush(brush_origin, pat, color) + + if pat is not None: + pattern = pdf.add_pattern(pat) + return color, opacity, pattern, do_fill + + def apply_stroke(self, state, pdf_system, painter): # TODO: Support miter limit by using QPainterPathStroker pen = state.stroke self.pending_state.do_stroke = True - if pen.style() == Qt.NoPen: - self.pending_state.do_stroke = False + pdf = self.pdf # Width w = pen.widthF() @@ -172,25 +426,54 @@ class Graphics(object): Qt.DashDotDotLine:[3, 2, 1, 2, 1, 2]}.get(pen.style(), []) if ps: pdf.serialize(Array(ps)) - pdf.current_page.write(' d ') + pdf.current_page.write(' 0 d ') # Stroke fill - b = pen.brush() - vals = list(b.color().getRgbF()) - vals[-1] *= state.opacity - color = Color(*vals) - pdf.set_stroke_color(color) - - if vals[-1] < 1e-5 or b.style() == Qt.NoBrush: + color, opacity, pattern, self.pending_state.do_stroke = self.convert_brush( + pen.brush(), state.brush_origin, state.opacity, pdf_system, + painter.transform()) + self.pdf.apply_stroke(color, pattern, opacity) + if pen.style() == Qt.NoPen: self.pending_state.do_stroke = False - def apply_fill(self, state, pdf, pdf_system, painter): + def apply_fill(self, state, pdf_system, painter): self.pending_state.do_fill = True - b = state.fill - if b.style() == Qt.NoBrush: - self.pending_state.do_fill = False - vals = list(b.color().getRgbF()) - vals[-1] *= state.opacity - color = Color(*vals) - pdf.set_fill_color(color) + color, opacity, pattern, self.pending_state.do_fill = self.convert_brush( + state.fill, state.brush_origin, state.opacity, pdf_system, + painter.transform()) + self.pdf.apply_fill(color, pattern, opacity) + self.last_fill = self.brushobj + + def __enter__(self): + self.pdf.save_stack() + + def __exit__(self, *args): + self.pdf.restore_stack() + + def resolve_fill(self, rect, pdf_system, qt_system): + ''' + Qt's paint system does not update brushOrigin when using + TexturePatterns and it also uses TexturePatterns to emulate gradients, + leading to brokenness. So this method allows the paint engine to update + the brush origin before painting an object. While not perfect, this is + better than nothing. The problem is that if the rect being filled has a + border, then QtWebKit generates an image of the rect size - border but + fills the full rect, and there's no way for the paint engine to know + that and adjust the brush origin. + ''' + if not hasattr(self, 'last_fill') or not self.current_state.do_fill: + return + + if isinstance(self.last_fill.brush, TexturePattern): + tl = rect.topLeft() + if tl == self.last_fill.origin: + return + + matrix = (QTransform.fromTranslate(tl.x(), tl.y()) + * pdf_system * qt_system.inverted()[0]) + + pat = TexturePattern(None, matrix, self.pdf, clone=self.last_fill.brush) + pattern = self.pdf.add_pattern(pat) + self.pdf.apply_fill(self.last_fill.color, pattern) + diff --git a/src/calibre/ebooks/pdf/render/links.py b/src/calibre/ebooks/pdf/render/links.py index 41b7fcfd39..97a6551dbd 100644 --- a/src/calibre/ebooks/pdf/render/links.py +++ b/src/calibre/ebooks/pdf/render/links.py @@ -17,10 +17,14 @@ from calibre.ebooks.pdf.render.common import Array, Name, Dictionary, String class Destination(Array): def __init__(self, start_page, pos, get_pageref): - super(Destination, self).__init__( - [get_pageref(start_page + pos['column']), Name('XYZ'), pos['left'], - pos['top'], None] - ) + pnum = start_page + pos['column'] + try: + pref = get_pageref(pnum) + except IndexError: + pref = get_pageref(pnum-1) + super(Destination, self).__init__([ + pref, Name('XYZ'), pos['left'], pos['top'], None + ]) class Links(object): @@ -58,7 +62,13 @@ class Links(object): 0])}) if is_local: path = combined_path if href else path - annot['Dest'] = self.anchors[path][frag] + try: + annot['Dest'] = self.anchors[path][frag] + except KeyError: + try: + annot['Dest'] = self.anchors[path][None] + except KeyError: + pass else: url = href + (('#'+frag) if frag else '') purl = urlparse(url) diff --git a/src/calibre/ebooks/pdf/render/qt_hack.cpp b/src/calibre/ebooks/pdf/render/qt_hack.cpp index f68f40c921..1a9a33c35f 100644 --- a/src/calibre/ebooks/pdf/render/qt_hack.cpp +++ b/src/calibre/ebooks/pdf/render/qt_hack.cpp @@ -17,18 +17,25 @@ GlyphInfo* get_glyphs(QPointF &p, const QTextItem &text_item) { QFontEngine *fe = ti.fontEngine; qreal size = ti.fontEngine->fontDef.pixelSize; #ifdef Q_WS_WIN - if (ti.fontEngine->type() == QFontEngine::Win) { + if (false && ti.fontEngine->type() == QFontEngine::Win) { + // This is used in the Qt sourcecode, but it gives incorrect results, + // so I have disabled it. I dont understand how it works in qpdf.cpp QFontEngineWin *fe = static_cast(ti.fontEngine); + // I think this should be tmHeight - tmInternalLeading, but pixelSize + // seems to work on windows as well, so leave it as pixelSize size = fe->tm.tmHeight; } #endif + int synthesized = ti.fontEngine->synthesized(); + qreal stretch = synthesized & QFontEngine::SynthesizedStretch ? ti.fontEngine->fontDef.stretch/100. : 1.; + QVarLengthArray glyphs; QVarLengthArray positions; QTransform m = QTransform::fromTranslate(p.x(), p.y()); fe->getGlyphPositions(ti.glyphs, m, ti.flags, glyphs, positions); QVector points = QVector(positions.count()); for (int i = 0; i < positions.count(); i++) { - points[i].setX(positions[i].x.toReal()); + points[i].setX(positions[i].x.toReal()/stretch); points[i].setY(positions[i].y.toReal()); } @@ -38,10 +45,10 @@ GlyphInfo* get_glyphs(QPointF &p, const QTextItem &text_item) { const quint32 *tag = reinterpret_cast("name"); - return new GlyphInfo(fe->getSfntTable(qToBigEndian(*tag)), size, points, indices); + return new GlyphInfo(fe->getSfntTable(qToBigEndian(*tag)), size, stretch, points, indices); } -GlyphInfo::GlyphInfo(const QByteArray& name, qreal size, const QVector &positions, const QVector &indices) :name(name), positions(positions), size(size), indices(indices) { +GlyphInfo::GlyphInfo(const QByteArray& name, qreal size, qreal stretch, const QVector &positions, const QVector &indices) :name(name), positions(positions), size(size), stretch(stretch), indices(indices) { } QByteArray get_sfnt_table(const QTextItem &text_item, const char* tag_name) { diff --git a/src/calibre/ebooks/pdf/render/qt_hack.h b/src/calibre/ebooks/pdf/render/qt_hack.h index d1cb5e208d..1bae8f2624 100644 --- a/src/calibre/ebooks/pdf/render/qt_hack.h +++ b/src/calibre/ebooks/pdf/render/qt_hack.h @@ -17,9 +17,10 @@ class GlyphInfo { QByteArray name; QVector positions; qreal size; + qreal stretch; QVector indices; - GlyphInfo(const QByteArray &name, qreal size, const QVector &positions, const QVector &indices); + GlyphInfo(const QByteArray &name, qreal size, qreal stretch, const QVector &positions, const QVector &indices); private: GlyphInfo(const GlyphInfo&); diff --git a/src/calibre/ebooks/pdf/render/qt_hack.sip b/src/calibre/ebooks/pdf/render/qt_hack.sip index b5a6fcf55e..54d8726f4d 100644 --- a/src/calibre/ebooks/pdf/render/qt_hack.sip +++ b/src/calibre/ebooks/pdf/render/qt_hack.sip @@ -13,9 +13,10 @@ class GlyphInfo { public: QByteArray name; qreal size; + qreal stretch; QVector &positions; QVector indices; - GlyphInfo(const QByteArray &name, qreal size, const QVector &positions, const QVector &indices); + GlyphInfo(const QByteArray &name, qreal size, qreal stretch, const QVector &positions, const QVector &indices); private: GlyphInfo(const GlyphInfo& g); diff --git a/src/calibre/ebooks/pdf/render/serialize.py b/src/calibre/ebooks/pdf/render/serialize.py index be78ddda66..936cb5f156 100644 --- a/src/calibre/ebooks/pdf/render/serialize.py +++ b/src/calibre/ebooks/pdf/render/serialize.py @@ -9,20 +9,19 @@ __docformat__ = 'restructuredtext en' import hashlib from future_builtins import map -from itertools import izip -from collections import namedtuple + +from PyQt4.Qt import QBuffer, QByteArray, QImage, Qt, QColor, qRgba from calibre.constants import (__appname__, __version__) from calibre.ebooks.pdf.render.common import ( Reference, EOL, serialize, Stream, Dictionary, String, Name, Array, - GlyphIndex, fmtnum) + fmtnum) from calibre.ebooks.pdf.render.fonts import FontManager from calibre.ebooks.pdf.render.links import Links +from calibre.utils.date import utcnow PDFVER = b'%PDF-1.3' -Color = namedtuple('Color', 'red green blue opacity') - class IndirectObjects(object): def __init__(self): @@ -90,6 +89,7 @@ class Page(Stream): self.opacities = {} self.fonts = {} self.xobjects = {} + self.patterns = {} def set_opacity(self, opref): if opref not in self.opacities: @@ -108,6 +108,11 @@ class Page(Stream): self.xobjects[imgref] = 'Image%d'%len(self.xobjects) return self.xobjects[imgref] + def add_pattern(self, patternref): + if patternref not in self.patterns: + self.patterns[patternref] = 'Pat%d'%len(self.patterns) + return self.patterns[patternref] + def add_resources(self): r = Dictionary() if self.opacities: @@ -125,6 +130,13 @@ class Page(Stream): for ref, name in self.xobjects.iteritems(): xobjects[name] = ref r['XObject'] = xobjects + if self.patterns: + r['ColorSpace'] = Dictionary({'PCSp':Array( + [Name('Pattern'), Name('DeviceRGB')])}) + patterns = Dictionary() + for ref, name in self.patterns.iteritems(): + patterns[name] = ref + r['Pattern'] = patterns if r: self.page_dict['Resources'] = r @@ -154,54 +166,6 @@ class Path(object): def close(self): self.ops.append(('h',)) -class Text(object): - - def __init__(self): - self.transform = self.default_transform = [1, 0, 0, 1, 0, 0] - self.font_name = 'Times-Roman' - self.font_path = None - self.horizontal_scale = self.default_horizontal_scale = 100 - self.word_spacing = self.default_word_spacing = 0 - self.char_space = self.default_char_space = 0 - self.glyph_adjust = self.default_glyph_adjust = None - self.size = 12 - self.text = '' - - def set_transform(self, *args): - if len(args) == 1: - m = args[0] - vals = [m.m11(), m.m12(), m.m21(), m.m22(), m.dx(), m.dy()] - else: - vals = args - self.transform = vals - - def pdf_serialize(self, stream, font_name): - if not self.text: return - stream.write_line('BT ') - serialize(Name(font_name), stream) - stream.write(' %s Tf '%fmtnum(self.size)) - stream.write(' '.join(map(fmtnum, self.transform)) + ' Tm ') - if self.horizontal_scale != self.default_horizontal_scale: - stream.write('%s Tz '%fmtnum(self.horizontal_scale)) - if self.word_spacing != self.default_word_spacing: - stream.write('%s Tw '%fmtnum(self.word_spacing)) - if self.char_space != self.default_char_space: - stream.write('%s Tc '%fmtnum(self.char_space)) - stream.write_line() - if self.glyph_adjust is self.default_glyph_adjust: - serialize(String(self.text), stream) - stream.write(' Tj ') - else: - chars = Array() - frac, widths = self.glyph_adjust - for c, width in izip(self.text, widths): - chars.append(String(c)) - chars.append(int(width * frac)) - serialize(chars, stream) - stream.write(' TJ ') - stream.write_line('ET') - - class Catalog(Dictionary): def __init__(self, pagetree): @@ -232,7 +196,9 @@ class HashingStream(object): self.last_char = b'' def write(self, raw): - raw = raw if isinstance(raw, bytes) else raw.encode('ascii') + self.write_raw(raw if isinstance(raw, bytes) else raw.encode('ascii')) + + def write_raw(self, raw): self.f.write(raw) self.hashobj.update(raw) if raw: @@ -294,13 +260,20 @@ class PDFStream(object): self.objects.add(PageTree(page_size)) self.objects.add(Catalog(self.page_tree)) self.current_page = Page(self.page_tree, compress=self.compress) - self.info = Dictionary({'Creator':String(creator), - 'Producer':String(creator)}) + self.info = Dictionary({ + 'Creator':String(creator), + 'Producer':String(creator), + 'CreationDate': utcnow(), + }) self.stroke_opacities, self.fill_opacities = {}, {} self.font_manager = FontManager(self.objects, self.compress) self.image_cache = {} + self.pattern_cache, self.shader_cache = {}, {} self.debug = debug self.links = Links(self, mark_links, page_size) + i = QImage(1, 1, QImage.Format_ARGB32) + i.fill(qRgba(0, 0, 0, 255)) + self.alpha_bit = i.constBits().asstring(4).find(b'\xff') @property def page_tree(self): @@ -334,9 +307,6 @@ class PDFStream(object): cm = ' '.join(map(fmtnum, vals)) self.current_page.write_line(cm + ' cm') - def set_rgb_colorspace(self): - self.current_page.write_line('/DeviceRGB CS /DeviceRGB cs') - def save_stack(self): self.current_page.write_line('q') @@ -372,35 +342,24 @@ class PDFStream(object): def serialize(self, o): serialize(o, self.current_page) - def set_stroke_color(self, color): - opacity = color.opacity + def set_stroke_opacity(self, opacity): if opacity not in self.stroke_opacities: op = Dictionary({'Type':Name('ExtGState'), 'CA': opacity}) self.stroke_opacities[opacity] = self.objects.add(op) self.current_page.set_opacity(self.stroke_opacities[opacity]) - self.current_page.write_line(' '.join(map(fmtnum, color[:3])) + ' SC') - def set_fill_color(self, color): - opacity = color.opacity + def set_fill_opacity(self, opacity): + opacity = float(opacity) if opacity not in self.fill_opacities: op = Dictionary({'Type':Name('ExtGState'), 'ca': opacity}) self.fill_opacities[opacity] = self.objects.add(op) self.current_page.set_opacity(self.fill_opacities[opacity]) - self.current_page.write_line(' '.join(map(fmtnum, color[:3])) + ' sc') def end_page(self): pageref = self.current_page.end(self.objects, self.stream) self.page_tree.obj.add_page(pageref) self.current_page = Page(self.page_tree, compress=self.compress) - def draw_text(self, text_object): - if text_object.font_path is None: - fontref = self.font_manager.add_standard_font(text_object.font_name) - else: - raise NotImplementedError() - name = self.current_page.add_font(fontref) - text_object.pdf_serialize(self.current_page, name) - def draw_glyph_run(self, transform, size, font_metrics, glyphs): glyph_ids = {x[-1] for x in glyphs} fontref = self.font_manager.add_font(font_metrics, glyph_ids) @@ -410,9 +369,8 @@ class PDFStream(object): self.current_page.write(' %s Tf '%fmtnum(size)) self.current_page.write('%s Tm '%' '.join(map(fmtnum, transform))) for x, y, glyph_id in glyphs: - self.current_page.write('%s %s Td '%(fmtnum(x), fmtnum(y))) - serialize(GlyphIndex(glyph_id), self.current_page) - self.current_page.write(' Tj ') + self.current_page.write_raw(('%s %s Td <%04X> Tj '%( + fmtnum(x), fmtnum(y), glyph_id)).encode('ascii')) self.current_page.write_line(b' ET') def get_image(self, cache_key): @@ -425,13 +383,108 @@ class PDFStream(object): self.objects.commit(r, self.stream) return r - def draw_image(self, x, y, xscale, yscale, imgref): + def add_image(self, img, cache_key): + ref = self.get_image(cache_key) + if ref is not None: + return ref + + fmt = img.format() + image = QImage(img) + if (image.depth() == 1 and img.colorTable().size() == 2 and + img.colorTable().at(0) == QColor(Qt.black).rgba() and + img.colorTable().at(1) == QColor(Qt.white).rgba()): + if fmt == QImage.Format_MonoLSB: + image = image.convertToFormat(QImage.Format_Mono) + fmt = QImage.Format_Mono + else: + if (fmt != QImage.Format_RGB32 and fmt != QImage.Format_ARGB32): + image = image.convertToFormat(QImage.Format_ARGB32) + fmt = QImage.Format_ARGB32 + + w = image.width() + h = image.height() + d = image.depth() + + if fmt == QImage.Format_Mono: + bytes_per_line = (w + 7) >> 3 + data = image.constBits().asstring(bytes_per_line * h) + return self.write_image(data, w, h, d, cache_key=cache_key) + + ba = QByteArray() + buf = QBuffer(ba) + image.save(buf, 'jpeg', 94) + data = bytes(ba.data()) + has_alpha = has_mask = False + soft_mask = mask = None + + if fmt == QImage.Format_ARGB32: + tmask = image.constBits().asstring(4*w*h)[self.alpha_bit::4] + sdata = bytearray(tmask) + vals = set(sdata) + vals.discard(255) + has_mask = bool(vals) + vals.discard(0) + has_alpha = bool(vals) + + if has_alpha: + soft_mask = self.write_image(tmask, w, h, 8) + elif has_mask: + # dither the soft mask to 1bit and add it. This also helps PDF + # viewers without transparency support + bytes_per_line = (w + 7) >> 3 + mdata = bytearray(0 for i in xrange(bytes_per_line * h)) + spos = mpos = 0 + for y in xrange(h): + for x in xrange(w): + if sdata[spos]: + mdata[mpos + x>>3] |= (0x80 >> (x&7)) + spos += 1 + mpos += bytes_per_line + mdata = bytes(mdata) + mask = self.write_image(mdata, w, h, 1) + + return self.write_image(data, w, h, 32, mask=mask, dct=True, + soft_mask=soft_mask, cache_key=cache_key) + + def add_pattern(self, pattern): + if pattern.cache_key not in self.pattern_cache: + self.pattern_cache[pattern.cache_key] = self.objects.add(pattern) + return self.current_page.add_pattern(self.pattern_cache[pattern.cache_key]) + + def add_shader(self, shader): + if shader.cache_key not in self.shader_cache: + self.shader_cache[shader.cache_key] = self.objects.add(shader) + return self.shader_cache[shader.cache_key] + + def draw_image(self, x, y, width, height, imgref): name = self.current_page.add_image(imgref) - self.current_page.write('q %s 0 0 %s %s %s cm '%(fmtnum(xscale), - fmtnum(yscale), fmtnum(x), fmtnum(y))) + self.current_page.write('q %s 0 0 %s %s %s cm '%(fmtnum(width), + fmtnum(-height), fmtnum(x), fmtnum(y+height))) serialize(Name(name), self.current_page) self.current_page.write_line(' Do Q') + def apply_color_space(self, color, pattern, stroke=False): + wl = self.current_page.write_line + if color is not None and pattern is None: + wl(' '.join(map(fmtnum, color)) + (' RG' if stroke else ' rg')) + elif color is None and pattern is not None: + wl('/Pattern %s /%s %s'%('CS' if stroke else 'cs', pattern, + 'SCN' if stroke else 'scn')) + elif color is not None and pattern is not None: + col = ' '.join(map(fmtnum, color)) + wl('/PCSp %s %s /%s %s'%('CS' if stroke else 'cs', col, pattern, + 'SCN' if stroke else 'scn')) + + def apply_fill(self, color=None, pattern=None, opacity=None): + if opacity is not None: + self.set_fill_opacity(opacity) + self.apply_color_space(color, pattern) + + def apply_stroke(self, color=None, pattern=None, opacity=None): + if opacity is not None: + self.set_stroke_opacity(opacity) + self.apply_color_space(color, pattern, stroke=True) + def end(self): if self.current_page.getvalue(): self.end_page() diff --git a/src/calibre/ebooks/pdf/render/test.py b/src/calibre/ebooks/pdf/render/test.py new file mode 100644 index 0000000000..a68daea97b --- /dev/null +++ b/src/calibre/ebooks/pdf/render/test.py @@ -0,0 +1,135 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) + +__license__ = 'GPL v3' +__copyright__ = '2012, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import os + +from PyQt4.Qt import (QBrush, QColor, QPoint, QPixmap, QPainterPath, QRectF, + QApplication, QPainter, Qt, QImage, QLinearGradient, + QPointF, QPen) +QBrush, QColor, QPoint, QPixmap, QPainterPath, QRectF, Qt, QPointF + +from calibre.ebooks.pdf.render.engine import PdfDevice + +def full(p, xmax, ymax): + p.drawRect(0, 0, xmax, ymax) + p.drawPolyline(QPoint(0, 0), QPoint(xmax, 0), QPoint(xmax, ymax), + QPoint(0, ymax), QPoint(0, 0)) + pp = QPainterPath() + pp.addRect(0, 0, xmax, ymax) + p.drawPath(pp) + p.save() + for i in xrange(3): + col = [0, 0, 0, 200] + col[i] = 255 + p.setOpacity(0.3) + p.fillRect(0, 0, xmax/10, xmax/10, QBrush(QColor(*col))) + p.setOpacity(1) + p.drawRect(0, 0, xmax/10, xmax/10) + p.translate(xmax/10, xmax/10) + p.scale(1, 1.5) + p.restore() + + # p.scale(2, 2) + # p.rotate(45) + p.drawPixmap(0, 0, xmax/4, xmax/4, QPixmap(I('library.png'))) + p.drawRect(0, 0, xmax/4, xmax/4) + + f = p.font() + f.setPointSize(20) + # f.setLetterSpacing(f.PercentageSpacing, 200) + f.setUnderline(True) + # f.setOverline(True) + # f.setStrikeOut(True) + f.setFamily('Calibri') + p.setFont(f) + # p.setPen(QColor(0, 0, 255)) + # p.scale(2, 2) + # p.rotate(45) + p.drawText(QPoint(xmax/3.9, 30), 'Some—text not By’s ū --- Д AV ff ff') + + b = QBrush(Qt.HorPattern) + b.setColor(QColor(Qt.blue)) + pix = QPixmap(I('console.png')) + w = xmax/4 + p.fillRect(0, ymax/3, w, w, b) + p.fillRect(xmax/3, ymax/3, w, w, QBrush(pix)) + x, y = 2*xmax/3, ymax/3 + p.drawTiledPixmap(QRectF(x, y, w, w), pix, QPointF(10, 10)) + + x, y = 1, ymax/1.9 + g = QLinearGradient(QPointF(x, y), QPointF(x+w, y+w)) + g.setColorAt(0, QColor('#00f')) + g.setColorAt(1, QColor('#fff')) + p.fillRect(x, y, w, w, QBrush(g)) + + +def run(dev, func): + p = QPainter(dev) + if isinstance(dev, PdfDevice): + dev.init_page() + xmax, ymax = p.viewport().width(), p.viewport().height() + try: + func(p, xmax, ymax) + finally: + p.end() + if isinstance(dev, PdfDevice): + if dev.engine.errors_occurred: + raise SystemExit(1) + +def brush(p, xmax, ymax): + x = 0 + y = 0 + w = xmax/2 + g = QLinearGradient(QPointF(x, y+w/3), QPointF(x, y+(2*w/3))) + g.setColorAt(0, QColor('#f00')) + g.setColorAt(0.5, QColor('#fff')) + g.setColorAt(1, QColor('#00f')) + g.setSpread(g.ReflectSpread) + p.fillRect(x, y, w, w, QBrush(g)) + p.drawRect(x, y, w, w) + +def pen(p, xmax, ymax): + pix = QPixmap(I('console.png')) + pen = QPen(QBrush(pix), 60) + p.setPen(pen) + p.drawRect(0, xmax/3, xmax/3, xmax/2) + +def text(p, xmax, ymax): + f = p.font() + f.setPixelSize(24) + f.setFamily('Candara') + p.setFont(f) + p.drawText(QPoint(0, 100), + 'Test intra glyph spacing ffagain imceo') + +def main(): + app = QApplication([]) + app + tdir = os.path.abspath('.') + pdf = os.path.join(tdir, 'painter.pdf') + func = brush + dpi = 100 + with open(pdf, 'wb') as f: + dev = PdfDevice(f, xdpi=dpi, ydpi=dpi, compress=False) + img = QImage(dev.width(), dev.height(), + QImage.Format_ARGB32_Premultiplied) + img.setDotsPerMeterX(dpi*39.37) + img.setDotsPerMeterY(dpi*39.37) + img.fill(Qt.white) + run(dev, func) + run(img, func) + path = os.path.join(tdir, 'painter.png') + img.save(path) + print ('PDF written to:', pdf) + print ('Image written to:', path) + +if __name__ == '__main__': + main() + + diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py index 9dbf769511..d7a2669b0b 100644 --- a/src/calibre/gui2/__init__.py +++ b/src/calibre/gui2/__init__.py @@ -766,6 +766,26 @@ class Translator(QTranslator): gui_thread = None qt_app = None + +def load_builtin_fonts(): + global _rating_font + # Load the builtin fonts and any fonts added to calibre by the user to + # Qt + for ff in glob.glob(P('fonts/liberation/*.?tf')) + \ + [P('fonts/calibreSymbols.otf')] + \ + glob.glob(os.path.join(config_dir, 'fonts', '*.?tf')): + if ff.rpartition('.')[-1].lower() in {'ttf', 'otf'}: + with open(ff, 'rb') as s: + # Windows requires font files to be executable for them to be + # loaded successfully, so we use the in memory loader + fid = QFontDatabase.addApplicationFontFromData(s.read()) + if fid > -1: + fam = QFontDatabase.applicationFontFamilies(fid) + fam = set(map(unicode, fam)) + if u'calibre Symbols' in fam: + _rating_font = u'calibre Symbols' + + class Application(QApplication): def __init__(self, args, force_calibre_style=False, @@ -798,27 +818,12 @@ class Application(QApplication): return ret def load_builtin_fonts(self, scan_for_fonts=False): - global _rating_font if scan_for_fonts: from calibre.utils.fonts.scanner import font_scanner # Start scanning the users computer for fonts font_scanner - # Load the builtin fonts and any fonts added to calibre by the user to - # Qt - for ff in glob.glob(P('fonts/liberation/*.?tf')) + \ - [P('fonts/calibreSymbols.otf')] + \ - glob.glob(os.path.join(config_dir, 'fonts', '*.?tf')): - if ff.rpartition('.')[-1].lower() in {'ttf', 'otf'}: - with open(ff, 'rb') as s: - # Windows requires font files to be executable for them to be - # loaded successfully, so we use the in memory loader - fid = QFontDatabase.addApplicationFontFromData(s.read()) - if fid > -1: - fam = QFontDatabase.applicationFontFamilies(fid) - fam = set(map(unicode, fam)) - if u'calibre Symbols' in fam: - _rating_font = u'calibre Symbols' + load_builtin_fonts() def load_calibre_style(self): # On OS X QtCurve resets the palette, so we preserve it explicitly diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py index 3e8d6154b3..d830970057 100644 --- a/src/calibre/gui2/actions/choose_library.py +++ b/src/calibre/gui2/actions/choose_library.py @@ -169,6 +169,10 @@ class ChooseLibraryAction(InterfaceAction): self.choose_menu = self.qaction.menu() + ac = self.create_action(spec=(_('Pick a random book'), 'random.png', + None, None), attr='action_pick_random') + ac.triggered.connect(self.pick_random) + if not os.environ.get('CALIBRE_OVERRIDE_DATABASE_PATH', None): self.choose_menu.addAction(self.action_choose) @@ -176,13 +180,11 @@ class ChooseLibraryAction(InterfaceAction): self.quick_menu_action = self.choose_menu.addMenu(self.quick_menu) self.rename_menu = QMenu(_('Rename library')) self.rename_menu_action = self.choose_menu.addMenu(self.rename_menu) + self.choose_menu.addAction(ac) self.delete_menu = QMenu(_('Remove library')) self.delete_menu_action = self.choose_menu.addMenu(self.delete_menu) - - ac = self.create_action(spec=(_('Pick a random book'), 'random.png', - None, None), attr='action_pick_random') - ac.triggered.connect(self.pick_random) - self.choose_menu.addAction(ac) + else: + self.choose_menu.addAction(ac) self.rename_separator = self.choose_menu.addSeparator() diff --git a/src/calibre/gui2/actions/store.py b/src/calibre/gui2/actions/store.py index adc66edea4..b84836c465 100644 --- a/src/calibre/gui2/actions/store.py +++ b/src/calibre/gui2/actions/store.py @@ -43,14 +43,16 @@ class StoreAction(InterfaceAction): icon.addFile(I('donate.png'), QSize(16, 16)) for n, p in sorted(self.gui.istores.items(), key=lambda x: x[0].lower()): if p.base_plugin.affiliate: - self.store_list_menu.addAction(icon, n, partial(self.open_store, p)) + self.store_list_menu.addAction(icon, n, + partial(self.open_store, n)) else: - self.store_list_menu.addAction(n, partial(self.open_store, p)) + self.store_list_menu.addAction(n, partial(self.open_store, n)) def do_search(self): return self.search() def search(self, query=''): + self.gui.istores.check_for_updates() self.show_disclaimer() from calibre.gui2.store.search.search import SearchDialog sd = SearchDialog(self.gui, self.gui, query) @@ -125,9 +127,13 @@ class StoreAction(InterfaceAction): self.gui.load_store_plugins() self.load_menu() - def open_store(self, store_plugin): + def open_store(self, store_plugin_name): + self.gui.istores.check_for_updates() self.show_disclaimer() - store_plugin.open(self.gui) + # It's not too important that the updated plugin have finished loading + # at this point + self.gui.istores.join(1.0) + self.gui.istores[store_plugin_name].open(self.gui) def show_disclaimer(self): confirm(('

' + diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 2b817b663a..3a958c4cfa 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -8,10 +8,10 @@ from functools import partial from PyQt4.Qt import QThread, QObject, Qt, QProgressDialog, pyqtSignal, QTimer from calibre.gui2.dialogs.progress import ProgressDialog -from calibre.gui2 import (question_dialog, error_dialog, info_dialog, gprefs, +from calibre.gui2 import (error_dialog, info_dialog, gprefs, warning_dialog, available_width) from calibre.ebooks.metadata.opf2 import OPF -from calibre.ebooks.metadata import MetaInformation, authors_to_string +from calibre.ebooks.metadata import MetaInformation from calibre.constants import preferred_encoding, filesystem_encoding, DEBUG from calibre.utils.config import prefs from calibre import prints, force_unicode, as_unicode @@ -391,25 +391,10 @@ class Adder(QObject): # {{{ if not duplicates: return self.duplicates_processed() self.pd.hide() - duplicate_message = [] - for x in duplicates: - duplicate_message.append(_('Already in calibre:')) - matching_books = self.db.books_with_same_title(x[0]) - for book_id in matching_books: - aut = [a.replace('|', ',') for a in (self.db.authors(book_id, - index_is_id=True) or '').split(',')] - duplicate_message.append('\t'+ _('%(title)s by %(author)s')% - dict(title=self.db.title(book_id, index_is_id=True), - author=authors_to_string(aut))) - duplicate_message.append(_('You are trying to add:')) - duplicate_message.append('\t'+_('%(title)s by %(author)s')% - dict(title=x[0].title, - author=x[0].format_field('authors')[1])) - duplicate_message.append('') - if question_dialog(self._parent, _('Duplicates found!'), - _('Books with the same title as the following already ' - 'exist in calibre. Add them anyway?'), - '\n'.join(duplicate_message)): + from calibre.gui2.dialogs.duplicates import DuplicatesQuestion + d = DuplicatesQuestion(self.db, duplicates, self._parent) + duplicates = tuple(d.duplicates) + if duplicates: pd = QProgressDialog(_('Adding duplicates...'), '', 0, len(duplicates), self._parent) pd.setCancelButton(None) diff --git a/src/calibre/gui2/convert/look_and_feel.ui b/src/calibre/gui2/convert/look_and_feel.ui index 505079a14c..43736fb1f2 100644 --- a/src/calibre/gui2/convert/look_and_feel.ui +++ b/src/calibre/gui2/convert/look_and_feel.ui @@ -411,7 +411,7 @@ - &Subset all embedded fonts (Experimental) + &Subset all embedded fonts diff --git a/src/calibre/gui2/convert/metadata.py b/src/calibre/gui2/convert/metadata.py index a2c1427b91..9af287f641 100644 --- a/src/calibre/gui2/convert/metadata.py +++ b/src/calibre/gui2/convert/metadata.py @@ -26,6 +26,7 @@ def create_opf_file(db, book_id): mi.application_id = uuid.uuid4() old_cover = mi.cover mi.cover = None + mi.application_id = mi.uuid raw = metadata_to_opf(mi) mi.cover = old_cover opf_file = PersistentTemporaryFile('.opf') diff --git a/src/calibre/gui2/convert/single.py b/src/calibre/gui2/convert/single.py index 332dc4ae92..cff7ee8c3d 100644 --- a/src/calibre/gui2/convert/single.py +++ b/src/calibre/gui2/convert/single.py @@ -33,7 +33,10 @@ from calibre.utils.config import prefs from calibre.utils.logging import Log class NoSupportedInputFormats(Exception): - pass + + def __init__(self, available_formats): + Exception.__init__(self) + self.available_formats = available_formats def sort_formats_by_preference(formats, prefs): uprefs = [x.upper() for x in prefs] @@ -86,7 +89,7 @@ def get_supported_input_formats_for_book(db, book_id): input_formats = set([x.lower() for x in supported_input_formats()]) input_formats = sorted(available_formats.intersection(input_formats)) if not input_formats: - raise NoSupportedInputFormats + raise NoSupportedInputFormats(tuple(x for x in available_formats if x)) return input_formats diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index 89824dbc7a..0f5bb0a1c9 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -369,6 +369,7 @@ class Series(Base): w.setMinimumContentsLength(25) self.name_widget = w self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), w] + w.editTextChanged.connect(self.series_changed) self.widgets.append(QLabel('&'+self.col_metadata['name']+_(' index:'), parent)) w = QDoubleSpinBox(parent) @@ -382,33 +383,42 @@ class Series(Base): values = list(self.db.all_custom(num=self.col_id)) values.sort(key=sort_key) val = self.db.get_custom(book_id, num=self.col_id, index_is_id=True) - s_index = self.db.get_custom_extra(book_id, num=self.col_id, index_is_id=True) - if s_index is None: - s_index = 0.0 - self.idx_widget.setValue(s_index) - self.initial_index = s_index self.initial_val = val + s_index = self.db.get_custom_extra(book_id, num=self.col_id, index_is_id=True) + self.initial_index = s_index + try: + s_index = float(s_index) + except (ValueError, TypeError): + s_index = 1.0 + self.idx_widget.setValue(s_index) val = self.normalize_db_val(val) + self.name_widget.blockSignals(True) self.name_widget.update_items_cache(values) self.name_widget.show_initial_value(val) + self.name_widget.blockSignals(False) def getter(self): n = unicode(self.name_widget.currentText()).strip() i = self.idx_widget.value() return n, i + def series_changed(self, val): + val, s_index = self.gui_val + if tweaks['series_index_auto_increment'] == 'no_change': + pass + elif tweaks['series_index_auto_increment'] == 'const': + s_index = 1.0 + else: + s_index = self.db.get_next_cc_series_num_for(val, + num=self.col_id) + self.idx_widget.setValue(s_index) + def commit(self, book_id, notify=False): val, s_index = self.gui_val val = self.normalize_ui_val(val) if val != self.initial_val or s_index != self.initial_index: if val == '': val = s_index = None - elif s_index == 0.0: - if tweaks['series_index_auto_increment'] != 'const': - s_index = self.db.get_next_cc_series_num_for(val, - num=self.col_id) - else: - s_index = None return self.db.set_custom(book_id, val, extra=s_index, num=self.col_id, notify=notify, commit=False, allow_case_change=True) else: diff --git a/src/calibre/gui2/dialogs/duplicates.py b/src/calibre/gui2/dialogs/duplicates.py new file mode 100644 index 0000000000..eb1787c0c5 --- /dev/null +++ b/src/calibre/gui2/dialogs/duplicates.py @@ -0,0 +1,118 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) + +__license__ = 'GPL v3' +__copyright__ = '2013, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +from PyQt4.Qt import (QDialog, QGridLayout, QIcon, QLabel, QTreeWidget, + QTreeWidgetItem, Qt, QFont, QDialogButtonBox) + +from calibre.ebooks.metadata import authors_to_string + +class DuplicatesQuestion(QDialog): + + def __init__(self, db, duplicates, parent=None): + QDialog.__init__(self, parent) + self.l = l = QGridLayout() + self.setLayout(l) + self.setWindowTitle(_('Duplicates found!')) + self.i = i = QIcon(I('dialog_question.png')) + self.setWindowIcon(i) + + self.l1 = l1 = QLabel() + self.l2 = l2 = QLabel(_( + 'Books with the same titles as the following already ' + 'exist in calibre. Select which books you want added anyway.')) + l2.setWordWrap(True) + l1.setPixmap(i.pixmap(128, 128)) + l.addWidget(l1, 0, 0) + l.addWidget(l2, 0, 1) + + self.dup_list = dl = QTreeWidget(self) + l.addWidget(dl, 1, 0, 1, 2) + dl.setHeaderHidden(True) + dl.addTopLevelItems(list(self.process_duplicates(db, duplicates))) + dl.expandAll() + dl.setIndentation(30) + + self.bb = bb = QDialogButtonBox(QDialogButtonBox.Ok|QDialogButtonBox.Cancel) + bb.accepted.connect(self.accept) + bb.rejected.connect(self.reject) + l.addWidget(bb, 2, 0, 1, 2) + self.ab = ab = bb.addButton(_('Select &all'), bb.ActionRole) + ab.clicked.connect(self.select_all) + self.nb = ab = bb.addButton(_('Select &none'), bb.ActionRole) + ab.clicked.connect(self.select_none) + + self.resize(self.sizeHint()) + self.exec_() + + def select_all(self): + for i in xrange(self.dup_list.topLevelItemCount()): + x = self.dup_list.topLevelItem(i) + x.setCheckState(0, Qt.Checked) + + def select_none(self): + for i in xrange(self.dup_list.topLevelItemCount()): + x = self.dup_list.topLevelItem(i) + x.setCheckState(0, Qt.Unchecked) + + def reject(self): + self.select_none() + QDialog.reject(self) + + def process_duplicates(self, db, duplicates): + ta = _('%(title)s by %(author)s') + bf = QFont(self.dup_list.font()) + bf.setBold(True) + itf = QFont(self.dup_list.font()) + itf.setItalic(True) + + for mi, cover, formats in duplicates: + item = QTreeWidgetItem([ta%dict( + title=mi.title, author=mi.format_field('authors')[1])] , 0) + item.setCheckState(0, Qt.Checked) + item.setFlags(Qt.ItemIsEnabled|Qt.ItemIsUserCheckable) + item.setData(0, Qt.FontRole, bf) + item.setData(0, Qt.UserRole, (mi, cover, formats)) + matching_books = db.books_with_same_title(mi) + + def add_child(text): + c = QTreeWidgetItem([text], 1) + c.setFlags(Qt.ItemIsEnabled) + item.addChild(c) + return c + + add_child(_('Already in calibre:')).setData(0, Qt.FontRole, itf) + + for book_id in matching_books: + aut = [a.replace('|', ',') for a in (db.authors(book_id, + index_is_id=True) or '').split(',')] + add_child(ta%dict( + title=db.title(book_id, index_is_id=True), + author=authors_to_string(aut))) + add_child('') + + yield item + + @property + def duplicates(self): + for i in xrange(self.dup_list.topLevelItemCount()): + x = self.dup_list.topLevelItem(i) + if x.checkState(0) == Qt.Checked: + yield x.data(0, Qt.UserRole).toPyObject() + +if __name__ == '__main__': + from PyQt4.Qt import QApplication + from calibre.ebooks.metadata.book.base import Metadata as M + from calibre.library import db + + app = QApplication([]) + db = db() + d = DuplicatesQuestion(db, [(M('Life of Pi', ['Yann Martel']), None, None), + (M('Heirs of the blade', ['Adrian Tchaikovsky']), None, None)]) + print (tuple(d.duplicates)) + diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui index 917dfbb159..24a84eb1b4 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.ui +++ b/src/calibre/gui2/dialogs/metadata_bulk.ui @@ -1109,8 +1109,8 @@ not multiple and the destination field is multiple 0 0 - 205 - 66 + 934 + 213 @@ -1269,8 +1269,8 @@ not multiple and the destination field is multiple accept() - 252 - 382 + 258 + 638 157 @@ -1285,8 +1285,8 @@ not multiple and the destination field is multiple reject() - 320 - 382 + 326 + 638 286 @@ -1294,5 +1294,37 @@ not multiple and the destination field is multiple + + remove_all_tags + toggled(bool) + remove_tags + setDisabled(bool) + + + 888 + 266 + + + 814 + 268 + + + + + clear_languages + toggled(bool) + languages + setDisabled(bool) + + + 874 + 418 + + + 817 + 420 + + + diff --git a/src/calibre/gui2/dialogs/plugin_updater.py b/src/calibre/gui2/dialogs/plugin_updater.py index 4e56db9016..3820169876 100644 --- a/src/calibre/gui2/dialogs/plugin_updater.py +++ b/src/calibre/gui2/dialogs/plugin_updater.py @@ -519,6 +519,7 @@ class PluginUpdaterDialog(SizePersistedDialog): self.description.setFrameStyle(QFrame.Panel | QFrame.Sunken) self.description.setAlignment(Qt.AlignTop | Qt.AlignLeft) self.description.setMinimumHeight(40) + self.description.setWordWrap(True) layout.addWidget(self.description) self.button_box = QDialogButtonBox(QDialogButtonBox.Close) diff --git a/src/calibre/gui2/duplicates.py b/src/calibre/gui2/duplicates.py deleted file mode 100644 index 6e45b0e9e6..0000000000 --- a/src/calibre/gui2/duplicates.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env python -# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai -from __future__ import (unicode_literals, division, absolute_import, - print_function) - -__license__ = 'GPL v3' -__copyright__ = '2011, Kovid Goyal ' -__docformat__ = 'restructuredtext en' - - diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py index df277aa13c..6563059821 100644 --- a/src/calibre/gui2/layout.py +++ b/src/calibre/gui2/layout.py @@ -201,6 +201,7 @@ class SearchBar(QWidget): # {{{ x.setObjectName("search") x.setToolTip(_("

Search the list of books by title, author, publisher, " "tags, comments, etc.

Words separated by spaces are ANDed")) + x.setMinimumContentsLength(10) l.addWidget(x) self.search_button = QToolButton() @@ -225,7 +226,7 @@ class SearchBar(QWidget): # {{{ x = parent.saved_search = SavedSearchBox(self) x.setMaximumSize(QSize(150, 16777215)) - x.setMinimumContentsLength(15) + x.setMinimumContentsLength(10) x.setObjectName("saved_search") l.addWidget(x) diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index f715ae6580..7b3d4de5f2 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -88,13 +88,16 @@ class DateDelegate(QStyledItemDelegate): # {{{ class PubDateDelegate(QStyledItemDelegate): # {{{ + def __init__(self, *args, **kwargs): + QStyledItemDelegate.__init__(self, *args, **kwargs) + self.format = tweaks['gui_pubdate_display_format'] + if self.format is None: + self.format = 'MMM yyyy' + def displayText(self, val, locale): d = val.toDateTime() if d <= UNDEFINED_QDATETIME: return '' - self.format = tweaks['gui_pubdate_display_format'] - if self.format is None: - self.format = 'MMM yyyy' return format_date(qt_to_dt(d, as_utc=False), self.format) def createEditor(self, parent, option, index): diff --git a/src/calibre/gui2/preferences/ignored_devices.py b/src/calibre/gui2/preferences/ignored_devices.py index 99fa350f73..e0c0ae1dc1 100644 --- a/src/calibre/gui2/preferences/ignored_devices.py +++ b/src/calibre/gui2/preferences/ignored_devices.py @@ -7,8 +7,10 @@ __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' __docformat__ = 'restructuredtext en' -from PyQt4.Qt import (QLabel, QVBoxLayout, QListWidget, QListWidgetItem, Qt) +from PyQt4.Qt import (QLabel, QVBoxLayout, QListWidget, QListWidgetItem, Qt, + QIcon) +from calibre.customize.ui import enable_plugin from calibre.gui2.preferences import ConfigWidgetBase, test_widget class ConfigWidget(ConfigWidgetBase): @@ -31,6 +33,18 @@ class ConfigWidget(ConfigWidgetBase): f.itemChanged.connect(self.changed_signal) f.itemDoubleClicked.connect(self.toggle_item) + self.la2 = la = QLabel(_( + 'The list of device plugins you have disabled. Uncheck an entry ' + 'to enable the plugin. calibre cannot detect devices that are ' + 'managed by disabled plugins.')) + la.setWordWrap(True) + l.addWidget(la) + + self.device_plugins = f = QListWidget(f) + l.addWidget(f) + f.itemChanged.connect(self.changed_signal) + f.itemDoubleClicked.connect(self.toggle_item) + def toggle_item(self, item): item.setCheckState(Qt.Checked if item.checkState() == Qt.Unchecked else Qt.Unchecked) @@ -46,6 +60,17 @@ class ConfigWidget(ConfigWidgetBase): item.setCheckState(Qt.Checked) self.devices.blockSignals(False) + self.device_plugins.blockSignals(True) + for dev in self.gui.device_manager.disabled_device_plugins: + n = dev.get_gui_name() + item = QListWidgetItem(n, self.device_plugins) + item.setData(Qt.UserRole, dev) + item.setFlags(Qt.ItemIsEnabled|Qt.ItemIsUserCheckable|Qt.ItemIsSelectable) + item.setCheckState(Qt.Checked) + item.setIcon(QIcon(I('plugins.png'))) + self.device_plugins.sortItems() + self.device_plugins.blockSignals(False) + def restore_defaults(self): if self.devices.count() > 0: self.devices.clear() @@ -63,6 +88,12 @@ class ConfigWidget(ConfigWidgetBase): for dev, bl in devs.iteritems(): dev.set_user_blacklisted_devices(bl) + for i in xrange(self.device_plugins.count()): + e = self.device_plugins.item(i) + dev = e.data(Qt.UserRole).toPyObject() + if e.checkState() == Qt.Unchecked: + enable_plugin(dev) + return True # Restart required if __name__ == '__main__': diff --git a/src/calibre/gui2/preferences/server.ui b/src/calibre/gui2/preferences/server.ui index a229da594f..163221594f 100644 --- a/src/calibre/gui2/preferences/server.ui +++ b/src/calibre/gui2/preferences/server.ui @@ -273,7 +273,7 @@ <p>Remember to leave calibre running as the server only runs as long as calibre is running. -<p>To connect to the calibre server from your device you should use a URL of the form <b>http://myhostname:8080</b> as a new catalog in the Stanza reader on your iPhone. Here myhostname should be either the fully qualified hostname or the IP address of the computer calibre is running on. +<p>To connect to the calibre server from your device you should use a URL of the form <b>http://myhostname:8080</b>. Here myhostname should be either the fully qualified hostname or the IP address of the computer calibre is running on. If you want to access the server from anywhere in the world, you will have to setup port forwarding for it on your router. true diff --git a/src/calibre/gui2/store/__init__.py b/src/calibre/gui2/store/__init__.py index ae42d82032..3af0a14cda 100644 --- a/src/calibre/gui2/store/__init__.py +++ b/src/calibre/gui2/store/__init__.py @@ -49,13 +49,16 @@ class StorePlugin(object): # {{{ See declined.txt for a list of stores that do not want to be included. ''' - def __init__(self, gui, name): - from calibre.gui2 import JSONConfig + minimum_calibre_version = (0, 9, 14) + def __init__(self, gui, name, config=None, base_plugin=None): self.gui = gui self.name = name - self.base_plugin = None - self.config = JSONConfig('store/stores/' + ascii_filename(self.name)) + self.base_plugin = base_plugin + if config is None: + from calibre.gui2 import JSONConfig + config = JSONConfig('store/stores/' + ascii_filename(self.name)) + self.config = config def open(self, gui, parent=None, detail_item=None, external=False): ''' diff --git a/src/calibre/gui2/store/loader.py b/src/calibre/gui2/store/loader.py new file mode 100644 index 0000000000..45c258a915 --- /dev/null +++ b/src/calibre/gui2/store/loader.py @@ -0,0 +1,197 @@ +#!/usr/bin/env python +# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai +from __future__ import (unicode_literals, division, absolute_import, + print_function) + +__license__ = 'GPL v3' +__copyright__ = '2013, Kovid Goyal ' +__docformat__ = 'restructuredtext en' + +import sys, time, io, re +from zlib import decompressobj +from collections import OrderedDict +from threading import Thread +from urllib import urlencode + +from calibre import prints, browser +from calibre.constants import numeric_version, DEBUG +from calibre.gui2.store import StorePlugin +from calibre.utils.config import JSONConfig + +class VersionMismatch(ValueError): + def __init__(self, ver): + ValueError.__init__(self, 'calibre too old') + self.ver = ver + +def download_updates(ver_map={}, server='http://status.calibre-ebook.com'): + data = {k:type(u'')(v) for k, v in ver_map.iteritems()} + data['ver'] = '1' + url = '%s/stores?%s'%(server, urlencode(data)) + br = browser() + # We use a timeout here to ensure the non-daemonic update thread does not + # cause calibre to hang indefinitely during shutdown + raw = br.open(url, timeout=4.0).read() + + while raw: + name, raw = raw.partition(b'\0')[0::2] + name = name.decode('utf-8') + d = decompressobj() + src = d.decompress(raw) + src = src.decode('utf-8') + # Python complains if there is a coding declaration in a unicode string + src = re.sub(r'^#.*coding\s*[:=]\s*([-\w.]+)', '#', src, flags=re.MULTILINE) + # Translate newlines to \n + src = io.StringIO(src, newline=None).getvalue() + yield name, src + raw = d.unused_data + +class Stores(OrderedDict): + + CHECK_INTERVAL = 24 * 60 * 60 + + def builtins_loaded(self): + self.last_check_time = 0 + self.version_map = {} + self.cached_version_map = {} + self.name_rmap = {} + for key, val in self.iteritems(): + prefix, name = val.__module__.rpartition('.')[0::2] + if prefix == 'calibre.gui2.store.stores' and name.endswith('_plugin'): + module = sys.modules[val.__module__] + sv = getattr(module, 'store_version', None) + if sv is not None: + name = name.rpartition('_')[0] + self.version_map[name] = sv + self.name_rmap[name] = key + self.cache_file = JSONConfig('store/plugin_cache') + self.load_cache() + + def load_cache(self): + # Load plugins from on disk cache + remove = set() + pat = re.compile(r'^store_version\s*=\s*(\d+)', re.M) + for name, src in self.cache_file.iteritems(): + try: + key = self.name_rmap[name] + except KeyError: + # Plugin has been disabled + m = pat.search(src[:512]) + if m is not None: + try: + self.cached_version_map[name] = int(m.group(1)) + except (TypeError, ValueError): + pass + continue + + try: + obj, ver = self.load_object(src, key) + except VersionMismatch as e: + self.cached_version_map[name] = e.ver + continue + except: + import traceback + prints('Failed to load cached store:', name) + traceback.print_exc() + else: + if not self.replace_plugin(ver, name, obj, 'cached'): + # Builtin plugin is newer than cached + remove.add(name) + + if remove: + with self.cache_file: + for name in remove: + del self.cache_file[name] + + def check_for_updates(self): + if hasattr(self, 'update_thread') and self.update_thread.is_alive(): + return + if time.time() - self.last_check_time < self.CHECK_INTERVAL: + return + self.last_check_time = time.time() + try: + self.update_thread.start() + except (RuntimeError, AttributeError): + self.update_thread = Thread(target=self.do_update) + self.update_thread.start() + + def join(self, timeout=None): + hasattr(self, 'update_thread') and self.update_thread.join(timeout) + + def download_updates(self): + ver_map = {name:max(ver, self.cached_version_map.get(name, -1)) + for name, ver in self.version_map.iteritems()} + try: + updates = download_updates(ver_map) + except: + import traceback + traceback.print_exc() + else: + for name, code in updates: + yield name, code + + def do_update(self): + replacements = {} + + for name, src in self.download_updates(): + try: + key = self.name_rmap[name] + except KeyError: + # Plugin has been disabled + replacements[name] = src + continue + try: + obj, ver = self.load_object(src, key) + except VersionMismatch as e: + self.cached_version_map[name] = e.ver + replacements[name] = src + continue + except: + import traceback + prints('Failed to load downloaded store:', name) + traceback.print_exc() + else: + if self.replace_plugin(ver, name, obj, 'downloaded'): + replacements[name] = src + + if replacements: + with self.cache_file: + for name, src in replacements.iteritems(): + self.cache_file[name] = src + + def replace_plugin(self, ver, name, obj, source): + if ver > self.version_map[name]: + if DEBUG: + prints('Loaded', source, 'store plugin for:', + self.name_rmap[name], 'at version:', ver) + self[self.name_rmap[name]] = obj + self.version_map[name] = ver + return True + return False + + def load_object(self, src, key): + namespace = {} + builtin = self[key] + exec src in namespace + ver = namespace['store_version'] + cls = None + for x in namespace.itervalues(): + if (isinstance(x, type) and issubclass(x, StorePlugin) and x is not + StorePlugin): + cls = x + break + if cls is None: + raise ValueError('No store plugin found') + if cls.minimum_calibre_version > numeric_version: + raise VersionMismatch(ver) + return cls(builtin.gui, builtin.name, config=builtin.config, + base_plugin=builtin.base_plugin), ver + +if __name__ == '__main__': + st = time.time() + for name, code in download_updates(): + print(name) + print(code) + print('\n', '_'*80, '\n', sep='') + print ('Time to download all plugins: %.2f'%( time.time() - st)) + + diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index b4ae0bc943..20c6c09a03 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -194,6 +194,7 @@ class SearchDialog(QDialog, Ui_Dialog): query = self.clean_query(query) shuffle(store_names) # Add plugins that the user has checked to the search pool's work queue. + self.gui.istores.join(4.0) # Wait for updated plugins to load for n in store_names: if self.store_checks[n].isChecked(): self.search_pool.add_task(query, n, self.gui.istores[n], self.max_results, self.timeout) diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index 3ccbef0b6e..58c67122e1 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index 131f77c7e9..427927a5a6 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -21,4 +22,4 @@ class AmazonESKindleStore(AmazonUKKindleStore): '&linkCode=ur2&camp=3626&creative=24790') search_url = 'http://www.amazon.es/s/?url=search-alias%3Ddigital-text&field-keywords=' - author_article = 'de ' \ No newline at end of file + author_article = 'de ' diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py index cd59be0313..e3eff50450 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index ad028bf963..669831f89d 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -21,4 +22,4 @@ class AmazonITKindleStore(AmazonUKKindleStore): 'linkCode=ur2&camp=3370&creative=23322') search_url = 'http://www.amazon.it/s/?url=search-alias%3Ddigital-text&field-keywords=' - author_article = 'di ' \ No newline at end of file + author_article = 'di ' diff --git a/src/calibre/gui2/store/stores/amazon_plugin.py b/src/calibre/gui2/store/stores/amazon_plugin.py index 4bd1a42c9d..c2b4a05cca 100644 --- a/src/calibre/gui2/store/stores/amazon_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -135,11 +136,11 @@ class AmazonKindleStore(StorePlugin): title_xpath = './/h3[@class="newaps"]/a//text()' author_xpath = './/h3[@class="newaps"]//span[contains(@class, "reg")]/text()' price_xpath = './/ul[contains(@class, "rsltL")]//span[contains(@class, "lrg") and contains(@class, "bld")]/text()' - + for data in doc.xpath(data_xpath): if counter <= 0: break - + # Even though we are searching digital-text only Amazon will still # put in results for non Kindle books (author pages). Se we need # to explicitly check if the item is a Kindle book and ignore it @@ -147,7 +148,7 @@ class AmazonKindleStore(StorePlugin): format = ''.join(data.xpath(format_xpath)) if 'kindle' not in format.lower(): continue - + # We must have an asin otherwise we can't easily reference the # book later. asin_href = None @@ -161,7 +162,7 @@ class AmazonKindleStore(StorePlugin): continue else: continue - + cover_url = ''.join(data.xpath(cover_xpath)) title = ''.join(data.xpath(title_xpath)) @@ -172,9 +173,9 @@ class AmazonKindleStore(StorePlugin): pass price = ''.join(data.xpath(price_xpath)) - + counter -= 1 - + s = SearchResult() s.cover_url = cover_url.strip() s.title = title.strip() diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py index 0f9caf8f3e..43f50fe6b0 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/archive_org_plugin.py b/src/calibre/gui2/store/stores/archive_org_plugin.py index 7439056baa..ed83b1c433 100644 --- a/src/calibre/gui2/store/stores/archive_org_plugin.py +++ b/src/calibre/gui2/store/stores/archive_org_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/baen_webscription_plugin.py b/src/calibre/gui2/store/stores/baen_webscription_plugin.py index a2a4e63d74..63203693a5 100644 --- a/src/calibre/gui2/store/stores/baen_webscription_plugin.py +++ b/src/calibre/gui2/store/stores/baen_webscription_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -22,7 +23,7 @@ from calibre.gui2.store.search_result import SearchResult from calibre.gui2.store.web_store_dialog import WebStoreDialog class BaenWebScriptionStore(BasicStoreConfig, StorePlugin): - + def open(self, parent=None, detail_item=None, external=False): url = 'http://www.baenebooks.com/' @@ -41,26 +42,26 @@ class BaenWebScriptionStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://www.baenebooks.com/searchadv.aspx?IsSubmit=true&SearchTerm=' + urllib2.quote(query) - + br = browser() - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) for data in doc.xpath('//table//table//table//table//tr'): if counter <= 0: break - + id = ''.join(data.xpath('./td[1]/a/@href')) if not id or not id.startswith('p-'): continue - + title = ''.join(data.xpath('./td[1]/a/text()')) - + author = '' cover_url = '' price = '' - + with closing(br.open('http://www.baenebooks.com/' + id.strip(), timeout=timeout/4)) as nf: idata = html.fromstring(nf.read()) author = ''.join(idata.xpath('//span[@class="ProductNameText"]/../b/text()')) @@ -68,16 +69,16 @@ class BaenWebScriptionStore(BasicStoreConfig, StorePlugin): price = ''.join(idata.xpath('//span[@class="variantprice"]/text()')) a, b, price = price.partition('$') price = b + price - + pnum = '' mo = re.search(r'p-(?P\d+)-', id.strip()) if mo: pnum = mo.group('num') if pnum: cover_url = 'http://www.baenebooks.com/' + ''.join(idata.xpath('//img[@id="ProductPic%s"]/@src' % pnum)) - + counter -= 1 - + s = SearchResult() s.cover_url = cover_url s.title = title.strip() @@ -86,5 +87,5 @@ class BaenWebScriptionStore(BasicStoreConfig, StorePlugin): s.detail_item = id.strip() s.drm = SearchResult.DRM_UNLOCKED s.formats = 'RB, MOBI, EPUB, LIT, LRF, RTF, HTML' - + yield s diff --git a/src/calibre/gui2/store/stores/bewrite_plugin.py b/src/calibre/gui2/store/stores/bewrite_plugin.py index b702f15623..3ccd28d976 100644 --- a/src/calibre/gui2/store/stores/bewrite_plugin.py +++ b/src/calibre/gui2/store/stores/bewrite_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -71,7 +72,7 @@ class BeWriteStore(BasicStoreConfig, StorePlugin): with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) - + price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "ePub")]/text()')) if not price: price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "MOBI")]/text()')) @@ -79,7 +80,7 @@ class BeWriteStore(BasicStoreConfig, StorePlugin): price = ''.join(idata.xpath('//div[@id="content"]//td[contains(text(), "PDF")]/text()')) price = '$' + price.split('$')[-1] search_result.price = price.strip() - + cover_img = idata.xpath('//div[@id="content"]//img/@src') if cover_img: for i in cover_img: @@ -87,7 +88,7 @@ class BeWriteStore(BasicStoreConfig, StorePlugin): cover_url = 'http://www.bewrite.net/mm5/' + i search_result.cover_url = cover_url.strip() break - + formats = set([]) if idata.xpath('boolean(//div[@id="content"]//td[contains(text(), "ePub")])'): formats.add('EPUB') diff --git a/src/calibre/gui2/store/stores/biblio_plugin.py b/src/calibre/gui2/store/stores/biblio_plugin.py index 5a40ec57cc..db7d909b3b 100644 --- a/src/calibre/gui2/store/stores/biblio_plugin.py +++ b/src/calibre/gui2/store/stores/biblio_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2012, Alex Stanev ' @@ -26,7 +27,7 @@ class BiblioStore(BasicStoreConfig, OpenSearchOPDSStore): for s in OpenSearchOPDSStore.search(self, query, max_results, timeout): yield s - + def get_details(self, search_result, timeout): # get format and DRM status from calibre import browser @@ -39,13 +40,13 @@ class BiblioStore(BasicStoreConfig, OpenSearchOPDSStore): search_result.formats = '' if idata.xpath('.//span[@class="format epub"]'): search_result.formats = 'EPUB' - + if idata.xpath('.//span[@class="format pdf"]'): if search_result.formats == '': search_result.formats = 'PDF' else: search_result.formats.join(', PDF') - + if idata.xpath('.//span[@class="format nodrm-icon"]'): search_result.drm = SearchResult.DRM_UNLOCKED else: diff --git a/src/calibre/gui2/store/stores/bn_plugin.py b/src/calibre/gui2/store/stores/bn_plugin.py index 8f2f988974..6138181fde 100644 --- a/src/calibre/gui2/store/stores/bn_plugin.py +++ b/src/calibre/gui2/store/stores/bn_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/bookoteka_plugin.py b/src/calibre/gui2/store/stores/bookoteka_plugin.py index 4df22060ed..7c3b2e8242 100644 --- a/src/calibre/gui2/store/stores/bookoteka_plugin.py +++ b/src/calibre/gui2/store/stores/bookoteka_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/chitanka_plugin.py b/src/calibre/gui2/store/stores/chitanka_plugin.py index 58ef109dba..30fc543849 100644 --- a/src/calibre/gui2/store/stores/chitanka_plugin.py +++ b/src/calibre/gui2/store/stores/chitanka_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Alex Stanev ' diff --git a/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py b/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py index 309ee98e4c..eebd1376ba 100644 --- a/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py +++ b/src/calibre/gui2/store/stores/diesel_ebooks_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/ebook_nl_plugin.py b/src/calibre/gui2/store/stores/ebook_nl_plugin.py index 0a79026dbb..6f895f1325 100644 --- a/src/calibre/gui2/store/stores/ebook_nl_plugin.py +++ b/src/calibre/gui2/store/stores/ebook_nl_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/ebookpoint_plugin.py b/src/calibre/gui2/store/stores/ebookpoint_plugin.py index 94e6cc73ca..d0306a45ee 100644 --- a/src/calibre/gui2/store/stores/ebookpoint_plugin.py +++ b/src/calibre/gui2/store/stores/ebookpoint_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011-2012, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/ebooks_com_plugin.py b/src/calibre/gui2/store/stores/ebooks_com_plugin.py index 826b59d41d..5c901bd65e 100644 --- a/src/calibre/gui2/store/stores/ebooks_com_plugin.py +++ b/src/calibre/gui2/store/stores/ebooks_com_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/ebooksgratuits_plugin.py b/src/calibre/gui2/store/stores/ebooksgratuits_plugin.py index add4bb2d40..2f13e0be86 100644 --- a/src/calibre/gui2/store/stores/ebooksgratuits_plugin.py +++ b/src/calibre/gui2/store/stores/ebooksgratuits_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2012, Florent FAYOLLE ' diff --git a/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py b/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py index 804279d3fd..77801d8584 100644 --- a/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py +++ b/src/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/eharlequin_plugin.py b/src/calibre/gui2/store/stores/eharlequin_plugin.py index ec85ccf1d3..5c863af856 100644 --- a/src/calibre/gui2/store/stores/eharlequin_plugin.py +++ b/src/calibre/gui2/store/stores/eharlequin_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -36,9 +37,9 @@ class EHarlequinStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://ebooks.eharlequin.com/BANGSearch.dll?Type=FullText&FullTextField=All&FullTextCriteria=' + urllib2.quote(query) - + br = browser() - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) @@ -64,19 +65,19 @@ class EHarlequinStore(BasicStoreConfig, StorePlugin): s.price = price.strip() s.detail_item = 'http://ebooks.eharlequin.com/' + id.strip() s.formats = 'EPUB' - + yield s - + def get_details(self, search_result, timeout): url = 'http://ebooks.eharlequin.com/en/ContentDetails.htm?ID=' - + mo = re.search(r'\?ID=(?P.+)', search_result.detail_item) if mo: id = mo.group('id') if not id: return - - + + br = browser() with closing(br.open(url + id, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) diff --git a/src/calibre/gui2/store/stores/eknigi_plugin.py b/src/calibre/gui2/store/stores/eknigi_plugin.py index 7d88465f62..7cafba421e 100644 --- a/src/calibre/gui2/store/stores/eknigi_plugin.py +++ b/src/calibre/gui2/store/stores/eknigi_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Alex Stanev ' diff --git a/src/calibre/gui2/store/stores/empik_plugin.py b/src/calibre/gui2/store/stores/empik_plugin.py index 16a7ee13e3..08b1cdcb64 100644 --- a/src/calibre/gui2/store/stores/empik_plugin.py +++ b/src/calibre/gui2/store/stores/empik_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011-2012, Tomasz Długosz ' @@ -68,7 +69,7 @@ class EmpikStore(BasicStoreConfig, StorePlugin): counter -= 1 s = SearchResult() - s.cover_url = cover_url + s.cover_url = cover_url s.title = title.strip() + ' ' + formats s.author = author.strip() s.price = price diff --git a/src/calibre/gui2/store/stores/escapemagazine_plugin.py b/src/calibre/gui2/store/stores/escapemagazine_plugin.py index 7f3f24e7d6..e3b1ef335a 100644 --- a/src/calibre/gui2/store/stores/escapemagazine_plugin.py +++ b/src/calibre/gui2/store/stores/escapemagazine_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/feedbooks_plugin.py b/src/calibre/gui2/store/stores/feedbooks_plugin.py index cac44fd8df..36521406bb 100644 --- a/src/calibre/gui2/store/stores/feedbooks_plugin.py +++ b/src/calibre/gui2/store/stores/feedbooks_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -11,10 +12,10 @@ from calibre.gui2.store.opensearch_store import OpenSearchOPDSStore from calibre.gui2.store.search_result import SearchResult class FeedbooksStore(BasicStoreConfig, OpenSearchOPDSStore): - + open_search_url = 'http://assets0.feedbooks.net/opensearch.xml?t=1253087147' web_url = 'http://feedbooks.com/' - + # http://www.feedbooks.com/catalog def search(self, query, max_results=10, timeout=60): diff --git a/src/calibre/gui2/store/stores/foyles_uk_plugin.py b/src/calibre/gui2/store/stores/foyles_uk_plugin.py index 819c412758..7c224f4f70 100644 --- a/src/calibre/gui2/store/stores/foyles_uk_plugin.py +++ b/src/calibre/gui2/store/stores/foyles_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/google_books_plugin.py b/src/calibre/gui2/store/stores/google_books_plugin.py index 6ffeab517c..f6f91fd81d 100644 --- a/src/calibre/gui2/store/stores/google_books_plugin.py +++ b/src/calibre/gui2/store/stores/google_books_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -38,7 +39,7 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin): 'ganpub': 'k352583', 'ganclk': 'GOOG_1335335464', } - + url = 'http://gan.doubleclick.net/gan_click?lid=%(lid)s&pubid=%(pubid)s' % aff_id if detail_item: detail_item += '&ganpub=%(ganpub)s&ganclk=%(ganclk)s' % aff_id @@ -53,9 +54,9 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://www.google.com/search?tbm=bks&q=' + urllib.quote_plus(query) - + br = browser() - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) @@ -76,22 +77,22 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin): author = ', '.join(authors) counter -= 1 - + s = SearchResult() s.title = title.strip() s.author = author.strip() s.detail_item = id.strip() s.drm = SearchResult.DRM_UNKNOWN - + yield s - + def get_details(self, search_result, timeout): br = browser() with closing(br.open(search_result.detail_item, timeout=timeout)) as nf: doc = html.fromstring(nf.read()) - + search_result.cover_url = ''.join(doc.xpath('//div[@class="sidebarcover"]//img/@src')) - + # Try to get the set price. price = ''.join(doc.xpath('//div[@id="gb-get-book-container"]//a/text()')) if 'read' in price.lower(): @@ -101,10 +102,10 @@ class GoogleBooksStore(BasicStoreConfig, StorePlugin): elif '-' in price: a, b, price = price.partition(' - ') search_result.price = price.strip() - + search_result.formats = ', '.join(doc.xpath('//div[contains(@class, "download-panel-div")]//a/text()')).upper() if not search_result.formats: search_result.formats = _('Unknown') - + return True diff --git a/src/calibre/gui2/store/stores/gutenberg_plugin.py b/src/calibre/gui2/store/stores/gutenberg_plugin.py index cbf3a2f565..422165f263 100644 --- a/src/calibre/gui2/store/stores/gutenberg_plugin.py +++ b/src/calibre/gui2/store/stores/gutenberg_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/kobo_plugin.py b/src/calibre/gui2/store/stores/kobo_plugin.py index 5a8b5618d5..44f4f4001c 100644 --- a/src/calibre/gui2/store/stores/kobo_plugin.py +++ b/src/calibre/gui2/store/stores/kobo_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/legimi_plugin.py b/src/calibre/gui2/store/stores/legimi_plugin.py index 509ca88104..85561c63f3 100644 --- a/src/calibre/gui2/store/stores/legimi_plugin.py +++ b/src/calibre/gui2/store/stores/legimi_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' @@ -24,7 +25,7 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog class LegimiStore(BasicStoreConfig, StorePlugin): def open(self, parent=None, detail_item=None, external=False): - + plain_url = 'http://www.legimi.com/pl/ebooki/' url = 'https://ssl.afiliant.com/affskrypt,,2f9de2,,11483,,,?u=(' + plain_url + ')' detail_url = None @@ -42,17 +43,17 @@ class LegimiStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://www.legimi.com/pl/ebooki/?szukaj=' + urllib.quote_plus(query) - + br = browser() drm_pattern = re.compile("zabezpieczona DRM") - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) for data in doc.xpath('//div[@id="listBooks"]/div'): if counter <= 0: break - + id = ''.join(data.xpath('.//a[@class="plainLink"]/@href')) if not id: continue @@ -73,7 +74,7 @@ class LegimiStore(BasicStoreConfig, StorePlugin): drm = drm_pattern.search(''.join(idata.xpath('.//div[@id="fullBookFormats"]/p/text()'))) counter -= 1 - + s = SearchResult() s.cover_url = 'http://www.legimi.com/' + cover_url s.title = title.strip() @@ -82,5 +83,5 @@ class LegimiStore(BasicStoreConfig, StorePlugin): s.detail_item = 'http://www.legimi.com/' + id.strip() s.formats = ', '.join(formats) s.drm = SearchResult.DRM_LOCKED if drm else SearchResult.DRM_UNLOCKED - + yield s diff --git a/src/calibre/gui2/store/stores/libri_de_plugin.py b/src/calibre/gui2/store/stores/libri_de_plugin.py index 60f7471272..d7d0807a99 100644 --- a/src/calibre/gui2/store/stores/libri_de_plugin.py +++ b/src/calibre/gui2/store/stores/libri_de_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/litres_plugin.py b/src/calibre/gui2/store/stores/litres_plugin.py index 6f4c386dda..5a1d2271fe 100644 --- a/src/calibre/gui2/store/stores/litres_plugin.py +++ b/src/calibre/gui2/store/stores/litres_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Roman Mukhin ' diff --git a/src/calibre/gui2/store/stores/manybooks_plugin.py b/src/calibre/gui2/store/stores/manybooks_plugin.py index 2b06798630..2344193b47 100644 --- a/src/calibre/gui2/store/stores/manybooks_plugin.py +++ b/src/calibre/gui2/store/stores/manybooks_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -26,7 +27,7 @@ class ManyBooksStore(BasicStoreConfig, OpenSearchOPDSStore): def search(self, query, max_results=10, timeout=60): ''' Manybooks uses a very strange opds feed. The opds - main feed is structured like a stanza feed. The + main feed is structured like a stanza feed. The search result entries give very little information and requires you to go to a detail link. The detail link has the wrong type specified (text/html instead @@ -45,7 +46,7 @@ class ManyBooksStore(BasicStoreConfig, OpenSearchOPDSStore): oquery.searchTerms = query oquery.count = max_results url = oquery.url() - + counter = max_results br = browser() with closing(br.open(url, timeout=timeout)) as f: @@ -55,11 +56,11 @@ class ManyBooksStore(BasicStoreConfig, OpenSearchOPDSStore): for data in doc.xpath('//*[local-name() = "entry"]'): if counter <= 0: break - + counter -= 1 - + s = SearchResult() - + detail_links = data.xpath('./*[local-name() = "link" and @type = "text/html"]') if not detail_links: continue @@ -73,7 +74,7 @@ class ManyBooksStore(BasicStoreConfig, OpenSearchOPDSStore): # just in case. s.title = ''.join(data.xpath('./*[local-name() = "title"]//text()')).strip() s.author = ', '.join(data.xpath('./*[local-name() = "author"]//text()')).strip() - + # Follow the detail link to get the rest of the info. with closing(br.open(detail_href, timeout=timeout/4)) as df: ddoc = etree.fromstring(df.read()) @@ -89,9 +90,9 @@ class ManyBooksStore(BasicStoreConfig, OpenSearchOPDSStore): s.author = s.author[1:] if s.author.endswith(','): s.author = s.author[:-1] - + s.cover_url = ''.join(ddata.xpath('./*[local-name() = "link" and @rel = "http://opds-spec.org/thumbnail"][1]/@href')).strip() - + for link in ddata.xpath('./*[local-name() = "link" and @rel = "http://opds-spec.org/acquisition"]'): type = link.get('type') href = link.get('href') diff --git a/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py b/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py index 6aa4b4b0b7..b8969beaed 100644 --- a/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/mills_boon_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/nexto_plugin.py b/src/calibre/gui2/store/stores/nexto_plugin.py index 79cb1be2f1..e5f9e31980 100644 --- a/src/calibre/gui2/store/stores/nexto_plugin.py +++ b/src/calibre/gui2/store/stores/nexto_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011-2012, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/nook_uk_plugin.py b/src/calibre/gui2/store/stores/nook_uk_plugin.py index 1ff8b688bb..cc97d5cf93 100644 --- a/src/calibre/gui2/store/stores/nook_uk_plugin.py +++ b/src/calibre/gui2/store/stores/nook_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2012, John Schember ' diff --git a/src/calibre/gui2/store/stores/open_books_plugin.py b/src/calibre/gui2/store/stores/open_books_plugin.py index 99b68656e9..66642ab679 100644 --- a/src/calibre/gui2/store/stores/open_books_plugin.py +++ b/src/calibre/gui2/store/stores/open_books_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/ozon_ru_plugin.py b/src/calibre/gui2/store/stores/ozon_ru_plugin.py index b54bf01daf..9a3c2dabaa 100644 --- a/src/calibre/gui2/store/stores/ozon_ru_plugin.py +++ b/src/calibre/gui2/store/stores/ozon_ru_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Roman Mukhin ' @@ -24,33 +25,33 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog class OzonRUStore(BasicStoreConfig, StorePlugin): shop_url = 'http://www.ozon.ru' - + def open(self, parent=None, detail_item=None, external=False): - + aff_id = '?partner=romuk' # Use Kovid's affiliate id 30% of the time. if random.randint(1, 10) in (1, 2, 3): aff_id = '?partner=kovidgoyal' - + url = self.shop_url + aff_id detail_url = None if detail_item: # http://www.ozon.ru/context/detail/id/3037277/ detail_url = self.shop_url + '/context/detail/id/' + urllib2.quote(detail_item) + aff_id - + if external or self.config.get('open_external', False): open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url))) else: d = WebStoreDialog(self.gui, url, parent, detail_url) d.setWindowTitle(self.name) d.set_tags(self.config.get('tags', '')) - d.exec_() - + d.exec_() + def search(self, query, max_results=15, timeout=60): search_url = self.shop_url + '/webservice/webservice.asmx/SearchWebService?'\ 'searchText=%s&searchContext=ebook' % urllib2.quote(query) search_urls = [ search_url ] - + ## add this as the fist try if it looks like ozon ID if re.match("^\d{6,9}$", query): ozon_detail = self.shop_url + '/webservices/OzonWebSvc.asmx/ItemDetail?ID=%s' % query @@ -59,7 +60,7 @@ class OzonRUStore(BasicStoreConfig, StorePlugin): xp_template = 'normalize-space(./*[local-name() = "{0}"]/text())' counter = max_results br = browser() - + for url in search_urls: with closing(br.open(url, timeout=timeout)) as f: raw = xml_to_unicode(f.read(), strip_encoding_pats=True, assume_utf8=True)[0] @@ -86,10 +87,10 @@ class OzonRUStore(BasicStoreConfig, StorePlugin): with closing(br.open(url, timeout=timeout)) as f: raw = xml_to_unicode(f.read(), verbose=True)[0] doc = html.fromstring(raw) - + # example where we are going to find formats #

- #

+ #

# Доступно: #

#
@@ -104,16 +105,16 @@ class OzonRUStore(BasicStoreConfig, StorePlugin): search_result.formats = ', '.join(_parse_ebook_formats(formats)) # unfortunately no direct links to download books (only buy link) # search_result.downloads['BF2'] = self.shop_url + '/order/digitalorder.aspx?id=' + + urllib2.quote(search_result.detail_item) - + #

21500 руб.

# # - + # if the price not in the search result (the ID search case) if not search_result.price: price = doc.xpath(u'normalize-space(//*[@itemprop="price"]/text())') search_result.price = format_price_in_RUR(price) - + return result def format_price_in_RUR(price): @@ -134,12 +135,12 @@ def format_price_in_RUR(price): def _parse_ebook_formats(formatsStr): ''' Creates a list with displayable names of the formats - - :param formatsStr: string with comma separated book formats + + :param formatsStr: string with comma separated book formats as it provided by ozon.ru :return: a list with displayable book formats ''' - + formatsUnstruct = formatsStr.lower() formats = [] if 'epub' in formatsUnstruct: diff --git a/src/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py b/src/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py index 99b94778bf..544fa06fe8 100644 --- a/src/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py +++ b/src/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -14,7 +15,7 @@ class PragmaticBookshelfStore(BasicStoreConfig, OpenSearchOPDSStore): open_search_url = 'http://pragprog.com/catalog/search-description' web_url = 'http://pragprog.com/' - + # http://pragprog.com/catalog.opds def search(self, query, max_results=10, timeout=60): diff --git a/src/calibre/gui2/store/stores/publio_plugin.py b/src/calibre/gui2/store/stores/publio_plugin.py index eb00f231ea..44f3267b35 100644 --- a/src/calibre/gui2/store/stores/publio_plugin.py +++ b/src/calibre/gui2/store/stores/publio_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2012, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/rw2010_plugin.py b/src/calibre/gui2/store/stores/rw2010_plugin.py index ed4d5a53f7..fc86ae4967 100644 --- a/src/calibre/gui2/store/stores/rw2010_plugin.py +++ b/src/calibre/gui2/store/stores/rw2010_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' @@ -73,5 +74,5 @@ class RW2010Store(BasicStoreConfig, StorePlugin): s.detail_item = re.sub(r'%3D', '=', id) s.drm = SearchResult.DRM_UNLOCKED s.formats = formats[0:-2].upper() - + yield s diff --git a/src/calibre/gui2/store/stores/smashwords_plugin.py b/src/calibre/gui2/store/stores/smashwords_plugin.py index 983067ab51..580e3c2907 100644 --- a/src/calibre/gui2/store/stores/smashwords_plugin.py +++ b/src/calibre/gui2/store/stores/smashwords_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -36,7 +37,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): if detail_item: detail_url = url + detail_item + aff_id url = url + aff_id - + if external or self.config.get('open_external', False): open_url(QUrl(url_slash_cleaner(detail_url if detail_url else url))) else: @@ -47,9 +48,9 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://www.smashwords.com/books/search?query=' + urllib2.quote(query) - + br = browser() - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) @@ -57,7 +58,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): if counter <= 0: break data = html.fromstring(html.tostring(data)) - + id = None id_a = data.xpath('//a[@class="bookTitle"]') if id_a: @@ -66,14 +67,14 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): id = id.split('/')[-1] if not id: continue - + cover_url = '' c_url = data.get('style', None) if c_url: mo = re.search(r'http://[^\'"]+', c_url) if mo: cover_url = mo.group() - + title = ''.join(data.xpath('//a[@class="bookTitle"]/text()')) subnote = ''.join(data.xpath('//span[@class="subnote"]/text()')) author = ''.join(data.xpath('//span[@class="subnote"]//a[1]//text()')) @@ -85,7 +86,7 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): price = '$0.00' counter -= 1 - + s = SearchResult() s.cover_url = cover_url s.title = title.strip() @@ -93,12 +94,12 @@ class SmashwordsStore(BasicStoreConfig, StorePlugin): s.price = price.strip() s.detail_item = '/books/view/' + id.strip() s.drm = SearchResult.DRM_UNLOCKED - + yield s def get_details(self, search_result, timeout): url = 'http://www.smashwords.com/' - + br = browser() with closing(br.open(url + search_result.detail_item, timeout=timeout)) as nf: idata = html.fromstring(nf.read()) diff --git a/src/calibre/gui2/store/stores/sony_plugin.py b/src/calibre/gui2/store/stores/sony_plugin.py index aa0c65bcde..030919c925 100644 --- a/src/calibre/gui2/store/stores/sony_plugin.py +++ b/src/calibre/gui2/store/stores/sony_plugin.py @@ -2,6 +2,7 @@ # vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL v3' __copyright__ = '2012, Kovid Goyal ' diff --git a/src/calibre/gui2/store/stores/virtualo_plugin.py b/src/calibre/gui2/store/stores/virtualo_plugin.py index e6b60fbe91..02396b7f19 100644 --- a/src/calibre/gui2/store/stores/virtualo_plugin.py +++ b/src/calibre/gui2/store/stores/virtualo_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/waterstones_uk_plugin.py b/src/calibre/gui2/store/stores/waterstones_uk_plugin.py index df17372d0a..397b8ee53f 100644 --- a/src/calibre/gui2/store/stores/waterstones_uk_plugin.py +++ b/src/calibre/gui2/store/stores/waterstones_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/weightless_books_plugin.py b/src/calibre/gui2/store/stores/weightless_books_plugin.py index 330f3fdf0f..cc18cf5807 100644 --- a/src/calibre/gui2/store/stores/weightless_books_plugin.py +++ b/src/calibre/gui2/store/stores/weightless_books_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -35,9 +36,9 @@ class WeightlessBooksStore(BasicStoreConfig, StorePlugin): def search(self, query, max_results=10, timeout=60): url = 'http://weightlessbooks.com/?s=' + urllib.quote_plus(query) - + br = browser() - + counter = max_results with closing(br.open(url, timeout=timeout)) as f: doc = html.fromstring(f.read()) @@ -50,20 +51,20 @@ class WeightlessBooksStore(BasicStoreConfig, StorePlugin): continue cover_url = ''.join(data.xpath('.//div[@class="cover"]/a/img/@src')) - + price = ''.join(data.xpath('.//div[@class="buy_buttons"]/b[1]/text()')) if not price: continue - + formats = ', '.join(data.xpath('.//select[@class="eStore_variation"]//option//text()')) formats = formats.upper() - + title = ''.join(data.xpath('.//h3/a/text()')) author = ''.join(data.xpath('.//h3//text()')) author = author.replace(title, '') counter -= 1 - + s = SearchResult() s.cover_url = cover_url s.title = title.strip() @@ -72,5 +73,5 @@ class WeightlessBooksStore(BasicStoreConfig, StorePlugin): s.detail_item = id.strip() s.drm = SearchResult.DRM_UNLOCKED s.formats = formats - + yield s diff --git a/src/calibre/gui2/store/stores/whsmith_uk_plugin.py b/src/calibre/gui2/store/stores/whsmith_uk_plugin.py index 5d78340517..6f2de93523 100644 --- a/src/calibre/gui2/store/stores/whsmith_uk_plugin.py +++ b/src/calibre/gui2/store/stores/whsmith_uk_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' diff --git a/src/calibre/gui2/store/stores/woblink_plugin.py b/src/calibre/gui2/store/stores/woblink_plugin.py index 37861766f7..63ec259dbf 100644 --- a/src/calibre/gui2/store/stores/woblink_plugin.py +++ b/src/calibre/gui2/store/stores/woblink_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011-2012, Tomasz Długosz ' diff --git a/src/calibre/gui2/store/stores/xinxii_plugin.py b/src/calibre/gui2/store/stores/xinxii_plugin.py index e8721a79b8..4be0a410be 100644 --- a/src/calibre/gui2/store/stores/xinxii_plugin.py +++ b/src/calibre/gui2/store/stores/xinxii_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -20,25 +21,25 @@ class XinXiiStore(BasicStoreConfig, OpenSearchOPDSStore): open_search_url = 'http://www.xinxii.com/catalog-search/' web_url = 'http://xinxii.com/' - + # http://www.xinxii.com/catalog/ def search(self, query, max_results=10, timeout=60): ''' XinXii's open search url is: http://www.xinxii.com/catalog-search/query/?keywords={searchTerms}&pw={startPage?}&doc_lang={docLang}&ff={docFormat},{docFormat},{docFormat} - + This url requires the docLang and docFormat. However, the search itself sent to XinXii does not require them. They can be ignored. We cannot push this into the stanard OpenSearchOPDSStore search because of the required attributes. - + XinXii doesn't return all info supported by OpenSearchOPDSStore search function so this one is modified to remove parts that are used. ''' - + url = 'http://www.xinxii.com/catalog-search/query/?keywords=' + urllib.quote_plus(query) - + counter = max_results br = browser() with closing(br.open(url, timeout=timeout)) as f: @@ -46,29 +47,29 @@ class XinXiiStore(BasicStoreConfig, OpenSearchOPDSStore): for data in doc.xpath('//*[local-name() = "entry"]'): if counter <= 0: break - + counter -= 1 - + s = SearchResult() - + s.detail_item = ''.join(data.xpath('./*[local-name() = "id"]/text()')).strip() for link in data.xpath('./*[local-name() = "link"]'): rel = link.get('rel') href = link.get('href') type = link.get('type') - + if rel and href and type: if rel in ('http://opds-spec.org/thumbnail', 'http://opds-spec.org/image/thumbnail'): s.cover_url = href if rel == 'alternate': s.detail_item = href - + s.formats = 'EPUB, PDF' - + s.title = ' '.join(data.xpath('./*[local-name() = "title"]//text()')).strip() s.author = ', '.join(data.xpath('./*[local-name() = "author"]//*[local-name() = "name"]//text()')).strip() - + price_e = data.xpath('.//*[local-name() = "price"][1]') if price_e: price_e = price_e[0] @@ -76,6 +77,6 @@ class XinXiiStore(BasicStoreConfig, OpenSearchOPDSStore): price = ''.join(price_e.xpath('.//text()')).strip() s.price = currency_code + ' ' + price s.price = s.price.strip() - + yield s diff --git a/src/calibre/gui2/store/stores/zixo_plugin.py b/src/calibre/gui2/store/stores/zixo_plugin.py index b4e54736c0..98bbdf3155 100644 --- a/src/calibre/gui2/store/stores/zixo_plugin.py +++ b/src/calibre/gui2/store/stores/zixo_plugin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) +store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, Tomasz Długosz ' diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py index f4ee92b565..98a59ccdd5 100644 --- a/src/calibre/gui2/tools.py +++ b/src/calibre/gui2/tools.py @@ -88,20 +88,35 @@ def convert_single_ebook(parent, db, book_ids, auto_conversion=False, # {{{ changed = True d.break_cycles() - except NoSupportedInputFormats: - bad.append(book_id) + except NoSupportedInputFormats as nsif: + bad.append((book_id, nsif.available_formats)) if bad and show_no_format_warning: - res = [] - for id in bad: - title = db.title(id, True) - res.append('%s'%title) + if len(bad) == 1 and not bad[0][1]: + title = db.title(bad[0][0], True) + warning_dialog(parent, _('Could not convert'), '

'+ + _('Could not convert %s as it has no ebook files. If you ' + 'think it should have files, but calibre is not finding ' + 'them, that is most likely because you moved the book\'s ' + 'files around outside of calibre. You will need to find those files ' + 'and re-add them to calibre.')%title, show=True) + else: + res = [] + for id, available_formats in bad: + title = db.title(id, True) + if available_formats: + msg = _('No supported formats (Available formats: %s)')%( + ', '.join(available_formats)) + else: + msg = _('This book has no actual ebook files') + res.append('%s - %s'%(title, msg)) - msg = '%s' % '\n'.join(res) - warning_dialog(parent, _('Could not convert some books'), - _('Could not convert %(num)d of %(tot)d books, because no suitable source' - ' format was found.') % dict(num=len(res), tot=total), - msg).exec_() + + msg = '%s' % '\n'.join(res) + warning_dialog(parent, _('Could not convert some books'), + _('Could not convert %(num)d of %(tot)d books, because no supported source' + ' formats were found.') % dict(num=len(res), tot=total), + msg).exec_() return jobs, changed, bad # }}} diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index db64969179..65993ff31c 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -155,7 +155,8 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ acmap[ac.name] = ac def load_store_plugins(self): - self.istores = OrderedDict() + from calibre.gui2.store.loader import Stores + self.istores = Stores() for store in available_store_plugins(): if self.opts.ignore_plugins and store.plugin_path is not None: continue @@ -169,6 +170,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ if store.plugin_path is None: raise continue + self.istores.builtins_loaded() def init_istore(self, store): st = store.load_actual_plugin(self) @@ -790,6 +792,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{ except KeyboardInterrupt: pass time.sleep(2) + self.istores.join() self.hide_windows() # Do not report any errors that happen after the shutdown sys.excepthook = sys.__excepthook__ diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py index b5d71dd9aa..1cdcb85d4c 100644 --- a/src/calibre/gui2/wizard/__init__.py +++ b/src/calibre/gui2/wizard/__init__.py @@ -197,7 +197,7 @@ class NookColor(Nook): class NookTablet(NookColor): id = 'nook_tablet' - name = 'Nook Tablet' + name = 'Nook Tablet/HD' class CybookG3(Device): @@ -245,6 +245,13 @@ class PocketBook900(PocketBook): id = 'pocketbook900' output_profile = 'pocketbook_900' +class PocketBookPro912(PocketBook): + + name = 'PocketBook Pro 912' + id = 'pocketbookpro912' + output_profile = 'pocketbook_pro_912' + + class iPhone(Device): name = 'iPhone/iTouch' diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py index 0162258764..507305528d 100644 --- a/src/calibre/library/caches.py +++ b/src/calibre/library/caches.py @@ -1106,6 +1106,7 @@ class SortKeyGenerator(object): self.library_order = tweaks['title_series_sorting'] == 'library_order' self.data = data self.string_sort_key = sort_key + self.lang_idx = field_metadata['languages']['rec_index'] def __call__(self, record): values = tuple(self.itervals(self.data[record])) @@ -1159,7 +1160,12 @@ class SortKeyGenerator(object): val = ('', 1) else: if self.library_order: - val = title_sort(val) + try: + lang = record[self.lang_idx].partition(u',')[0] + except (AttributeError, ValueError, KeyError, + IndexError, TypeError): + lang = None + val = title_sort(val, order='library_order', lang=lang) sidx_fm = self.field_metadata[name + '_index'] sidx = record[sidx_fm['rec_index']] val = (self.string_sort_key(val), sidx) diff --git a/src/calibre/library/catalogs/csv_xml.py b/src/calibre/library/catalogs/csv_xml.py index fd2bb5113b..c594a346d4 100644 --- a/src/calibre/library/catalogs/csv_xml.py +++ b/src/calibre/library/catalogs/csv_xml.py @@ -133,8 +133,8 @@ class CSV_XML(CatalogPlugin): elif field in ['authors', 'tags']: item = ', '.join(item) elif field == 'isbn': - # Could be 9, 10 or 13 digits - item = u'%s' % re.sub(r'[\D]', '', item) + # Could be 9, 10 or 13 digits, with hyphens, possibly ending in 'X' + item = u'%s' % re.sub(r'[^\dX-]', '', item) elif field in ['pubdate', 'timestamp']: item = isoformat(item) elif field == 'comments': diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py index 9a7e728220..96290601cd 100644 --- a/src/calibre/library/catalogs/epub_mobi.py +++ b/src/calibre/library/catalogs/epub_mobi.py @@ -17,7 +17,7 @@ from calibre.ebooks import calibre_cover from calibre.library import current_library_name from calibre.library.catalogs import AuthorSortMismatchException, EmptyCatalogException from calibre.ptempfile import PersistentTemporaryFile -from calibre.utils.localization import get_lang +from calibre.utils.localization import calibre_langcode_to_name, canonicalize_lang, get_lang Option = namedtuple('Option', 'option, default, dest, action, help') @@ -223,7 +223,8 @@ class EPUB_MOBI(CatalogPlugin): self.fmt, 'for %s ' % opts.output_profile if opts.output_profile else '', 'CLI' if opts.cli_environment else 'GUI', - get_lang())) + calibre_langcode_to_name(canonicalize_lang(get_lang()), localize=False)) + ) # If exclude_genre is blank, assume user wants all tags as genres if opts.exclude_genre.strip() == '': diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 65ed89da5c..8f27db61be 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -663,9 +663,9 @@ class CatalogBuilder(object): # Hack to force the cataloged leading letter to be # an unadorned character if the accented version sorts before the unaccented exceptions = { - u'Ä': u'A', - u'Ö': u'O', - u'Ü': u'U' + u'Ä': u'A', + u'Ö': u'O', + u'Ü': u'U' } if key is not None: @@ -3473,7 +3473,7 @@ class CatalogBuilder(object): self.play_order += 1 navLabelTag = Tag(ncx_soup, 'navLabel') textTag = Tag(ncx_soup, 'text') - if len(authors_by_letter[1]) > 1: + if authors_by_letter[1] == self.SYMBOLS: fmt_string = _(u"Authors beginning with %s") else: fmt_string = _(u"Authors beginning with '%s'") @@ -4422,12 +4422,12 @@ class CatalogBuilder(object): Generate a legal XHTML anchor from unicode character. Args: - c (unicode): character + c (unicode): character(s) Return: - (str): legal XHTML anchor string of unicode charactar name + (str): legal XHTML anchor string of unicode character name """ - fullname = unicodedata.name(unicode(c)) + fullname = u''.join(unicodedata.name(unicode(cc)) for cc in c) terms = fullname.split() return "_".join(terms) diff --git a/src/calibre/library/custom_columns.py b/src/calibre/library/custom_columns.py index 2401ef3026..d65eaa8ecc 100644 --- a/src/calibre/library/custom_columns.py +++ b/src/calibre/library/custom_columns.py @@ -532,6 +532,8 @@ class CustomColumns(object): if data['datatype'] == 'series' and extra is None: (val, extra) = self._get_series_values(val) + if extra is None: + extra = 1.0 books_to_refresh = set([]) if data['normalized']: diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index a7789e5035..e315bb6f3e 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -239,6 +239,8 @@ class BrowseServer(object): self.browse_details) connect('browse_book', base_href+'/book/{id}', self.browse_book) + connect('browse_random', base_href+'/random', + self.browse_random) connect('browse_category_icon', base_href+'/icon/{name}', self.browse_icon) @@ -351,6 +353,7 @@ class BrowseServer(object): cats = [ (_('Newest'), 'newest', 'forward.png'), (_('All books'), 'allbooks', 'book.png'), + (_('Random book'), 'randombook', 'random.png'), ] def getter(x): @@ -441,7 +444,11 @@ class BrowseServer(object): cat_len = len(category) if not (len(ucat) > cat_len and ucat.startswith(category+'.')): continue - icon = category_icon_map['user:'] + + if ucat in self.icon_map: + icon = '_'+quote(self.icon_map[ucat]) + else: + icon = category_icon_map['user:'] # we have a subcategory. Find any further dots (further subcats) cat_len += 1 cat = ucat[cat_len:] @@ -595,6 +602,9 @@ class BrowseServer(object): elif category == 'allbooks': raise cherrypy.InternalRedirect(prefix + '/browse/matches/allbooks/dummy') + elif category == 'randombook': + raise cherrypy.InternalRedirect(prefix + + '/browse/random') else: ans = self.browse_category(category, category_sort) @@ -881,6 +891,13 @@ class BrowseServer(object): return json.dumps(ans, ensure_ascii=False) + @Endpoint() + def browse_random(self, *args, **kwargs): + import random + book_id = random.choice(tuple(self.db.all_ids())) + ans = self.browse_render_details(book_id) + return self.browse_template('').format( + title='', script='book();', main=ans) @Endpoint() def browse_book(self, id=None, category_sort=None): diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py index 5b723d078e..6953deff5f 100644 --- a/src/calibre/library/server/content.py +++ b/src/calibre/library/server/content.py @@ -236,7 +236,7 @@ class ContentServer(object): newmi = mi.deepcopy_metadata() newmi.template_to_attribute(mi, cpb) - if format in ('MOBI', 'EPUB'): + if format in {'MOBI', 'EPUB', 'AZW3'}: # Write the updated file from calibre.ebooks.metadata.meta import set_metadata set_metadata(fmt, newmi, format.lower()) diff --git a/src/calibre/translations/af.po b/src/calibre/translations/af.po index fdb8a349bf..a7768351ce 100644 --- a/src/calibre/translations/af.po +++ b/src/calibre/translations/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: calibre\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 05:12+0000\n" +"POT-Creation-Date: 2013-01-04 05:12+0000\n" "PO-Revision-Date: 2012-08-14 16:03+0000\n" "Last-Translator: Albé Theunissen \n" "Language-Team: Afrikaans \n" @@ -15,8 +15,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2012-12-22 04:36+0000\n" -"X-Generator: Launchpad (build 16378)\n" +"X-Launchpad-Export-Date: 2013-01-05 04:42+0000\n" +"X-Generator: Launchpad (build 16393)\n" #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56 msgid "Does absolutely nothing" @@ -26,10 +26,10 @@ msgstr "Doen absolute niks" #: /home/kovid/work/calibre/src/calibre/db/cache.py:106 #: /home/kovid/work/calibre/src/calibre/db/cache.py:109 #: /home/kovid/work/calibre/src/calibre/db/cache.py:120 -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:376 -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:377 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:101 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:378 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:379 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:114 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:115 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:77 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:667 @@ -53,6 +53,8 @@ msgstr "Doen absolute niks" #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/html_input.py:121 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/lrf_output.py:29 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdb_input.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:31 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/rtf_input.py:289 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/rtf_input.py:291 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/periodical.py:140 @@ -131,11 +133,10 @@ msgstr "Doen absolute niks" #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/palmdoc/writer.py:29 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ztxt/writer.py:27 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:108 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:109 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/render/links.py:119 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:447 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:455 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:411 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:414 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167 @@ -147,24 +148,24 @@ msgstr "Doen absolute niks" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:145 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1416 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1419 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:825 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:380 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:193 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:208 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:440 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1106 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:439 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1103 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1319 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1322 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1325 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1328 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1416 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1413 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:85 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:250 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:261 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:402 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:407 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:178 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:182 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:202 @@ -237,7 +238,7 @@ msgstr "Gebruikerskoppelvlakaksie" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:197 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:311 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:228 msgid "Preferences" msgstr "Voorkeure" @@ -981,23 +982,23 @@ msgstr "Ontfoutlogboek" msgid "Communicate with Android phones." msgstr "Kommunikeer met Android-fone" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:198 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:199 msgid "" "Comma separated list of directories to send e-books to on the device's " "main memory. The first one that exists will be used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:201 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:202 msgid "" "Comma separated list of directories to send e-books to on the device's " "storage cards. The first one that exists will be used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:316 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:318 msgid "Communicate with S60 phones." msgstr "Kommunikeer met S60-fone" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:335 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:337 msgid "Communicate with WebOS tablets." msgstr "Kommunikeer met WebOS-tablette." @@ -1248,8 +1249,8 @@ msgstr "Voeg boeke toe tot toestel se metadatalys…" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:352 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:354 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:115 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:126 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:129 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:140 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:440 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:472 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:615 @@ -1393,27 +1394,31 @@ msgstr "" msgid "Communicate with the Hanvon N520 eBook reader." msgstr "Kommunikeer met die Hanvon N520 eBoek-leser." -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:47 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:48 +msgid "Communicate with the Kibano eBook reader." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:61 msgid "Communicate with The Book reader." msgstr "Kommunikeer met The Book-leser." -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:59 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:73 msgid "Communicate with the Libre Air reader." msgstr "Kommunikeer met die Libre Air-leser." -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:72 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:86 msgid "Communicate with the SpringDesign Alex eBook reader." msgstr "Kommunikeer met die SpringDesign Alex eBoek-leser" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:132 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:146 msgid "Communicate with the Azbooka" msgstr "Kommunikeer met die Azbooka" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:151 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:165 msgid "Communicate with the Elonex EB 511 eBook reader." msgstr "Kommunikeer met die Elonex EB 511 eBoek-leser." -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:171 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:185 msgid "Communicate with the Cybook Odyssey eBook reader." msgstr "Kommunikeer met die Cybook Odyssey eBoek-leser." @@ -1647,7 +1652,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:646 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:404 msgid "Not Implemented" msgstr "Nie geïmplementeer nie" @@ -2200,35 +2205,35 @@ msgstr "Kommunikeer met die Samsung SNE eBoek-leser." msgid "Communicate with the Teclast K3/K5 reader." msgstr "Kommunikeer met die Teclast K3/K5-leser." -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:38 msgid "Communicate with the Newsmy reader." msgstr "Kommunikeer met die Newsmy-leser." -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:48 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49 msgid "Communicate with the Archos reader." msgstr "Kommunikeer met die Archos-leser." -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:58 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:59 msgid "Communicate with the Pico reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:70 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:71 msgid "Communicate with the iPapyrus reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:81 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:82 msgid "Communicate with the Sovos reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:91 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:92 msgid "Communicate with the Sunstech EB700 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:102 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:103 msgid "Communicate with the Stash W950 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:114 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:115 msgid "Communicate with the Wexler reader." msgstr "" @@ -2427,6 +2432,7 @@ msgid "There is insufficient free space on the storage card" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:210 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/render/from_html.py:230 #, python-format msgid "Rendered %s" msgstr "" @@ -2964,58 +2970,74 @@ msgstr "" msgid "Use the new PDF conversion engine." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:71 -#, python-format +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:54 msgid "" -"The unit of measure. Default is inch. Choices are %s Note: This does not " -"override the unit for margins!" +"Normally, the PDF page size is set by the output profile chosen under page " +"options. This option will cause the page size settings under PDF Output to " +"override the size specified by the output profile." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:76 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:60 +#, python-format +msgid "" +"The unit of measure for page sizes. Default is inch. Choices are %s Note: " +"This does not override the unit for margins!" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:65 #, python-format msgid "" "The size of the paper. This size will be overridden when a non default " "output profile is used. Default is letter. Choices are %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:80 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:69 msgid "" "Custom size of the document. Use the form widthxheight EG. `123x321` to " "specify the width and height. This overrides any specified paper-size." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:85 -#, python-format -msgid "The orientation of the page. Default is portrait. Choices are %s" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:89 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:74 msgid "" "Preserve the aspect ratio of the cover, instead of stretching it to fill the " "full first page of the generated pdf." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:94 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:79 msgid "The font family used to render serif fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:82 msgid "The font family used to render sans-serif fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:100 -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:104 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:85 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:89 msgid "The font family used to render monospaced fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:107 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:92 msgid "The default font size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:110 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:95 msgid "The default font size for monospaced text" msgstr "" +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:97 +msgid "Surround all links with a red box, useful for debugging." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:99 +msgid "Use the old, less capable engine to generate the PDF" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:102 +msgid "" +"Generate an uncompressed PDF, useful for debugging, only works with the new " +"PDF engine." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pml_output.py:22 msgid "" "Specify the character encoding of the output document. The default is cp1252." @@ -4041,8 +4063,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/quickview.py:85 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:222 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:84 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:150 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:162 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:39 @@ -4054,14 +4076,14 @@ msgid "Title" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:770 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:86 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1112 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1109 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/models.py:23 msgid "Author(s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:771 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:90 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:159 msgid "Publisher" msgstr "" @@ -4071,7 +4093,7 @@ msgid "Producer" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:773 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:957 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:963 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:157 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:245 msgid "Comments" @@ -4094,13 +4116,13 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:535 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:842 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:91 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:161 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:982 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:1228 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:201 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:780 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:796 msgid "Tags" msgstr "" @@ -4109,7 +4131,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/quickview.py:89 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:224 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:92 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:163 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:307 @@ -4121,7 +4143,7 @@ msgstr[0] "" msgstr[1] "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:778 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:94 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:164 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:127 msgid "Languages" @@ -4133,7 +4155,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:782 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:183 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:88 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:150 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:305 msgid "Published" @@ -4248,53 +4270,57 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1487 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1279 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:969 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:975 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:39 msgid "Cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:491 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:508 msgid "Downloads metadata and covers from Amazon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:501 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:518 msgid "US" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:502 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:519 msgid "France" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:503 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:520 msgid "Germany" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:504 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:521 msgid "UK" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:505 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:522 msgid "Italy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:506 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:523 msgid "Japan" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:507 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:524 msgid "Spain" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:511 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:525 +msgid "Brazil" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:529 msgid "Amazon website to use:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:512 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:530 msgid "" "Metadata from Amazon will be fetched using this country's Amazon website." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:753 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:775 msgid "Amazon timed out. Try again later." msgstr "" @@ -4403,7 +4429,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer8/toc.py:15 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1281 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:221 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/toc.py:217 msgid "Table of Contents" msgstr "" @@ -4485,11 +4511,11 @@ msgid "HTML TOC generation options." msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:185 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:89 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:160 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:176 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:778 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:794 msgid "Rating" msgstr "" @@ -4808,7 +4834,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:120 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:38 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:107 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:228 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:75 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:192 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:256 @@ -4838,32 +4864,32 @@ msgstr "" msgid "Select book files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:189 msgid "Adding" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:190 msgid "Creating book records from ISBNs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:270 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:319 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:281 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:330 msgid "Uploading books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:290 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:301 msgid "Supported books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:304 msgid "Select books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:331 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:342 msgid "Merged some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:332 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:343 #, python-format msgid "" "The following %d duplicate books were found and incoming book formats were " @@ -4871,21 +4897,21 @@ msgid "" "settings:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:354 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:365 msgid "Failed to read metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:355 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:366 msgid "Failed to read metadata from the following" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:376 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:381 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:400 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:392 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:411 msgid "Add to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:381 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:392 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:137 #: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:87 #: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:106 @@ -4896,32 +4922,32 @@ msgstr "" msgid "No book selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:394 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:405 msgid "" "The following books are virtual and cannot be added to the calibre library:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:400 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:411 msgid "No book files found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:406 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:417 msgid "Downloading books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:407 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:418 msgid "Downloading books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:426 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:437 msgid "Could not download files from the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:429 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:440 msgid "Could not download some files from the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:433 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:444 msgid "Could not download files" msgstr "" @@ -5038,6 +5064,7 @@ msgid "No existing calibre library found at %s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:160 msgid "Choose Library" msgstr "" @@ -5208,7 +5235,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:423 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:250 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:975 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1007 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:114 @@ -5236,7 +5263,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:534 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:539 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:278 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:91 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:1016 msgid "Not allowed" @@ -5286,7 +5313,7 @@ msgstr "" msgid "Empty output file, probably the conversion process crashed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:86 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:401 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:405 #: /home/kovid/work/calibre/src/calibre/gui2/auto_add.py:221 @@ -5294,57 +5321,83 @@ msgstr "" msgid "%(title)s by %(author)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:59 +msgid "Choose library" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 +msgid "Library &path:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:146 +msgid "Browse for library" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:149 +msgid "&Delete after copy" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:172 msgid "Copy to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:173 msgid "Copy selected books to the specified library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:206 msgid "(delete after copy)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:210 +msgid "Choose library by path..." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:227 msgid "Cannot copy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:221 +msgid "Cannot copy to current library." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:232 msgid "No library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:233 #, python-format msgid "No library found at %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:182 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:239 msgid "Copying" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:250 msgid "Could not copy books: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:254 #, python-format msgid "Copied %(num)d books to %(loc)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:258 msgid "Auto merged" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:259 msgid "" "Some books were automatically merged into existing records in the target " "library. Click Show details to see which ones. This behavior is controlled " "by the Auto merge option in Preferences->Adding books." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:279 msgid "" "You cannot use other libraries while using the environment variable " "CALIBRE_OVERRIDE_DATABASE_PATH." @@ -5803,7 +5856,7 @@ msgid "Move to next match" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:226 msgid "F3" msgstr "" @@ -5829,7 +5882,7 @@ msgid "Shift+N" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:235 msgid "Shift+F3" msgstr "" @@ -5949,7 +6002,7 @@ msgid "Click the show details button to see which ones." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:16 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:785 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:801 msgid "Show book details" msgstr "" @@ -6491,9 +6544,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:140 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:280 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:286 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:166 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:167 @@ -6513,7 +6566,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:174 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:181 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/store_dialog_ui.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213 msgid "..." msgstr "" @@ -6554,7 +6607,7 @@ msgid "Click to open" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:180 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:834 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:850 msgid "Ids" msgstr "" @@ -6564,7 +6617,7 @@ msgid "Book %(sidx)s of %(series)s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:233 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1115 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1112 msgid "Collections" msgstr "" @@ -6675,7 +6728,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:43 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:114 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pmlz_output_ui.py:46 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:33 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:145 @@ -6695,7 +6748,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:246 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:125 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:74 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:108 @@ -6833,7 +6886,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:342 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:21 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:90 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:258 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:260 msgid "Name" msgstr "" @@ -7803,7 +7856,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:222 msgid "Metadata" msgstr "" @@ -7906,7 +7959,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:561 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1101 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1104 msgid "" "Tags categorize the book. This is particularly useful while searching. " "

They can be any words or phrases, separated by commas." @@ -8046,48 +8099,59 @@ msgstr "" msgid "PDF Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:115 +msgid "" +"Note: The paper size settings below only take effect if you enable " +"the \"Override\" checkbox below. Otherwise the size from the output profile " +"will be used." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:116 +msgid "&Override paper size set in output profile" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:117 msgid "&Paper Size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:102 -msgid "&Orientation:" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:118 msgid "&Custom size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:119 +msgid "&Unit:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:120 msgid "Preserve &aspect ratio of cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:121 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:374 msgid "Se&rif family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:375 msgid "&Sans family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:123 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:376 msgid "&Monospace family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:124 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:381 msgid "S&tandard font:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:125 msgid "Default font si&ze:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:110 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:378 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:380 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:395 @@ -8097,18 +8161,11 @@ msgstr "" msgid " px" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:127 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:379 msgid "Monospace &font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:113 -msgid "" -"Note: The paper size settings below only take effect if you have set " -"the output profile to the default output profile. Otherwise the output " -"profile will override these settings." -msgstr "" - #: /home/kovid/work/calibre/src/calibre/gui2/convert/pml_output.py:14 msgid "PMLZ Output" msgstr "" @@ -8344,7 +8401,7 @@ msgid "" "Add button to add it to the list of expressions." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:187 msgid "Convert" msgstr "" @@ -8697,7 +8754,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:233 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:290 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:294 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1413 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1416 msgid "Undefined" msgstr "" @@ -9175,7 +9232,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:141 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:885 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:344 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:227 msgid "Copy to clipboard" msgstr "" @@ -9245,6 +9302,14 @@ msgstr "" msgid "Reset author to Unknown" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:48 +msgid "Set the series of the new books to:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:60 +msgid "Reset series" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn.py:72 msgid "Some invalid ISBNs" msgstr "" @@ -9304,7 +9369,7 @@ msgid "No help available for this output format." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:333 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:348 msgid "Generate catalog" msgstr "" @@ -9706,8 +9771,8 @@ msgid "Location" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:77 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:88 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1113 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1110 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:35 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:76 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:365 @@ -10011,7 +10076,7 @@ msgid "Standard metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:939 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:945 msgid "Custom metadata" msgstr "" @@ -10197,7 +10262,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:562 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:563 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:193 msgid "Open Tag Editor" msgstr "" @@ -10250,7 +10315,7 @@ msgid "&Force numbers to start with:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:582 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1395 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1398 msgid "&Date:" msgstr "" @@ -10272,7 +10337,7 @@ msgid "Clear published date" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:591 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1164 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1167 msgid "&Languages:" msgstr "" @@ -10342,13 +10407,13 @@ msgid "Set from &ebook file(s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:613 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:575 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:741 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:580 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:747 msgid "&Basic metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:614 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:582 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:587 msgid "&Custom metadata" msgstr "" @@ -10896,7 +10961,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/store_dialog_ui.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:282 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:284 msgid "Search" msgstr "" @@ -11234,7 +11299,7 @@ msgid "never delete" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 msgid " days" msgstr "" @@ -11372,7 +11437,7 @@ msgid "&Author:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:199 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1100 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1103 msgid "Ta&gs:" msgstr "" @@ -11819,7 +11884,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:169 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271 msgid "Switch to Advanced mode" msgstr "" @@ -11893,39 +11958,39 @@ msgid "" "Add/Update recipe button. Continue?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263 msgid "Add custom news source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:258 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264 msgid "Available user recipes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 msgid "Add/Update &recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 msgid "&Remove recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267 msgid "&Share recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268 msgid "S&how recipe files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269 msgid "Customize &builtin recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270 msgid "&Load recipe from file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272 msgid "" "\n" "

Alap szintű " -"hírösszeállítás létrehozása hírforrások hozzáadásával.
Legtöbb esetben " -"a „Haladó mód”-ot is használnia kell a letöltés " -"testreszabásához.

" +"right:0px; -qt-block-indent:0; text-indent:0px;\">Alapszintű hírösszeállítás " +"létrehozása hírcsatornák hozzáadásával.
Legtöbb esetben a „Haladó mód”-" +"ot is használnia kell a letöltés testreszabásához.

" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276 msgid "Recipe &title:" msgstr "A hírösszeállí&tás címe:" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277 msgid "&Oldest article:" msgstr "Leg&régebbi cikk:" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:278 msgid "The oldest article to download" msgstr "A legrégebbi letöltendő cikk" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:274 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:280 msgid "&Max. number of articles per feed:" -msgstr "A hírforrásban szereplő cikkek &maximális száma:" - -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:275 -msgid "Maximum number of articles to download per feed." -msgstr "A hírforrásban letöltendő cikkek maximális száma:" - -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:276 -msgid "Feeds in recipe" -msgstr "Hírforrások a hírösszeállításban" - -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:278 -msgid "Remove feed from recipe" -msgstr "Hírforrás eltávolítása a hírösszeállításból" +msgstr "A hírcsatorna cikkeinek &maximális száma:" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:281 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:284 -msgid "Add feed to recipe" -msgstr "Hírforrás hozzáadása a hírösszeállításhoz" +msgid "Maximum number of articles to download per feed." +msgstr "A hírcsatornából letöltendő cikkek maximális száma:" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:282 +msgid "Feeds in recipe" +msgstr "Hírcsatornák a hírösszeállításban" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:284 +msgid "Remove feed from recipe" +msgstr "Hírcsatorna eltávolítása a hírösszeállításból" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:290 +msgid "Add feed to recipe" +msgstr "Hírcsatorna hozzáadása a hírösszeállításhoz" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:288 msgid "&Feed title:" -msgstr "&Hírforrás címe:" +msgstr "&Hírcsatorna címe:" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:289 msgid "Feed &URL:" -msgstr "Hírforrás URL-je:" +msgstr "Hírcsatorna URL-je:" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:291 msgid "&Add feed" -msgstr "Hírforrás hozzácadása" +msgstr "&Hírcsatorna hozzácadása" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:286 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:292 msgid "" "For help with writing advanced news recipes, please visit User Recipes" @@ -13219,7 +13314,7 @@ msgstr "" "ebook.com/news.html\">Felhasználói Hírösszeállítások oldalon kaphat " "további információkat." -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:287 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:293 msgid "Recipe source code (python)" msgstr "Hírösszeállítás forráskódja (python)" @@ -13263,7 +13358,7 @@ msgstr "Az e-book letöltése nem sikerült" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:125 #, python-format msgid "Email %(name)s to %(to)s" -msgstr "%(name)s elküldése e-mailben ide: %(to)s" +msgstr "%(name)s elküldése emailben ide: %(to)s" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:144 msgid "News:" @@ -13294,24 +13389,24 @@ msgstr "%s formátumban." #: /home/kovid/work/calibre/src/calibre/gui2/email.py:225 msgid "Sending email to" -msgstr "E-mail küldése ide:" +msgstr "Email küldése ide:" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:256 msgid "Auto convert the following books before sending via email?" msgstr "" -"Az e-mailben történő küldés előtt kívánja automatikusan konvertálni a " -"kijelölt könyveket?" +"Az eailben történő küldés előtt kívánja automatikusan konvertálni a kijelölt " +"könyveket?" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:263 msgid "" "Could not email the following books as no suitable formats were found:" msgstr "" -"Nem lehet elküldeni e-mailben a következő könyveket, mert nem léteznek a " +"Nem lehet elküldeni emailben a következő könyveket, mert nem léteznek a " "megadott formátumokban:" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:269 msgid "Failed to email book" -msgstr "A könyv e-mailben történő elküldése meghiúsult" +msgstr "A könyv emailben történő elküldése meghiúsult" #: /home/kovid/work/calibre/src/calibre/gui2/email.py:272 msgid "sent" @@ -13400,7 +13495,7 @@ msgid "Regular expression (?P)" msgstr "Sorozaton belüli sorszám. Reguláris kifejezés (?P)" #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:149 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1297 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1300 msgid "ISBN:" msgstr "ISBN:" @@ -13426,7 +13521,7 @@ msgstr "Reguláris kifejezés (?P)" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:123 msgid "Choose a font family" -msgstr "" +msgstr "Betűtípus kiválasztása" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:136 #, python-format @@ -13439,7 +13534,7 @@ msgstr "Betűtípus kiválasztása" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:195 msgid "Add &fonts" -msgstr "" +msgstr "&Hozzáadás" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:199 msgid "Choose a font family from the list below:" @@ -13447,11 +13542,11 @@ msgstr "Válasszon betűtípust az alábbi listából:" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:205 msgid "Find Next" -msgstr "" +msgstr "Következő találat" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:208 msgid "Find Previous" -msgstr "" +msgstr "Előző találat" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:258 #: /home/kovid/work/calibre/src/calibre/gui2/keyboard.py:377 @@ -13470,15 +13565,15 @@ msgstr "Nincs" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:264 msgid "Select font files" -msgstr "" +msgstr "Betűfájlok kiválasztása" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:264 msgid "TrueType/OpenType Fonts" -msgstr "" +msgstr "TrueType/OpenType betűtípusok" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:274 msgid "Corrupt font" -msgstr "" +msgstr "Hibás betűkészlet" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:275 #, python-format @@ -13487,12 +13582,12 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:294 msgid "Added fonts" -msgstr "" +msgstr "Hozzáadott betűtípusok" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:295 #, python-format msgid "Added font families: %s" -msgstr "" +msgstr "Hozzáadott betűtípusok: %s" #: /home/kovid/work/calibre/src/calibre/gui2/font_family_chooser.py:320 msgid "Choose &font family" @@ -13794,75 +13889,75 @@ msgstr "csillag" msgid "Y" msgstr "Y" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:84 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:285 msgid "On Device" msgstr "Eszközön" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:86 msgid "Size (MB)" msgstr "Méret (MB)" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:94 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:93 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:275 msgid "Modified" msgstr "Módosítva" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:822 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1454 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:819 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1455 #: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/model.py:335 msgid "The lookup/search name is \"{0}\"" msgstr "Keresési/rendezési feltétel: „{0}”" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:828 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1456 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:825 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1457 msgid "This book's UUID is \"{0}\"" msgstr "A könyv UUID-je: „{0}”" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:915 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:912 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:108 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:280 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:324 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:454 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:329 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:459 msgid "Permission denied" msgstr "Hozzáférés megtagadva" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:916 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:913 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:109 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:281 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:455 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:460 msgid "" "Could not change the on disk location of this book. Is it open in another " "program?" msgstr "" "A könyv helyét nem sikerült megváltoztatni. Esetleg más program is használja?" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:920 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:926 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:917 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:923 msgid "Failed to set data" msgstr "Sikertelen adatbeállítás" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:921 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:927 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:918 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:924 msgid "Could not set data, click Show Details to see why." msgstr "" "Nem sikerült az adatokat beállítani, további információkért kattintson a " "Részletek megjelenítésére." -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1110 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1107 msgid "In Library" msgstr "Könyvtárban" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1114 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:355 msgid "Size" msgstr "Méret" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1436 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1437 msgid "Marked for deletion" msgstr "Megjelölve törlése" -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1439 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1440 msgid "Double click to edit me

" msgstr "Dupla-kattintás a szerkesztéshez

" @@ -13971,12 +14066,12 @@ msgstr "Előző oldal" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:947 #: /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:208 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:215 msgid "Back" msgstr "Vissza" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:209 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:216 msgid "Forward" msgstr "Előre" @@ -13985,7 +14080,7 @@ msgid "Next match" msgstr "Következő találat" #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:216 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:223 msgid "Open ebook" msgstr "eBook megnyitása" @@ -14015,7 +14110,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/main.py:75 msgid "Path too long" -msgstr "" +msgstr "Elérési út túl hosszú" #: /home/kovid/work/calibre/src/calibre/gui2/main.py:76 #, python-format @@ -14320,11 +14415,11 @@ msgstr "Érvénytelen borító" msgid "Could not change cover as the image is invalid." msgstr "Nem lehet megváltoztatni a borítót, mert a képfájl érvénytelen." -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1136 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1139 msgid "Tags changed" msgstr "Címke megváltoztatva" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1137 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1140 msgid "" "You have changed the tags. In order to use the tags editor, you must either " "discard or apply these changes. Apply changes?" @@ -14333,26 +14428,26 @@ msgstr "" "vetnie a változásokat, vagy pedig alkalmaznia kell azokat. Alkalmazza a " "változásokat?" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1165 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1168 msgid "A comma separated list of languages for this book" msgstr "A könyvben használt nyelvek vesszővel elválasztott listája" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1188 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1191 msgid "Unknown language" msgstr "Ismeretlen nyelv" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1189 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1192 #, python-format msgid "The language %s is not recognized" msgid_plural "The languages %s are not recognized" msgstr[0] "Ismeretlen nyelv: %s" msgstr[1] "Ismeretlen nyelvek: %s" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1201 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1204 msgid "I&ds:" msgstr "&Azonosítók:" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1202 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1205 #, python-format msgid "" "Edit the identifiers for this book. For example: \n" @@ -14363,38 +14458,38 @@ msgstr "" "\n" "%s" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1266 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1328 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1269 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1331 msgid "This ISBN number is valid" msgstr "Az ISBN szám érvényes" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1269 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1331 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1272 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1334 msgid "This ISBN number is invalid" msgstr "Nem érvényes ISBN szám" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1294 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1316 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1297 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1319 msgid "Invalid ISBN" msgstr "Érvénytelen ISBN szám" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1295 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1298 msgid "Enter an ISBN" msgstr "ISBN szám megadása" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1317 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1320 msgid "The ISBN you entered is not valid. Try again." msgstr "A megadott ISBN szám érvénytelen. Próbálja újra." -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1341 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1344 msgid "&Publisher:" msgstr "Kiadó:" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1416 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1419 msgid "Clear date" msgstr "Dátum törlése" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1450 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1453 msgid "Publishe&d:" msgstr "Kiadva:" @@ -14466,9 +14561,9 @@ msgid "Processed %s" msgstr "%s feldolgozva" #: /home/kovid/work/calibre/src/calibre/gui2/metadata/config.py:61 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:124 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:131 msgid "Downloaded metadata fields" -msgstr "Letöltendő metaadat mezők" +msgstr "Letöltött metaadat mezők" #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:31 msgid "Edit Metadata" @@ -14545,15 +14640,19 @@ msgstr "" msgid "Clear series" msgstr "Sorozatok törlése" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:192 -msgid "Clear all tags" +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:185 +msgid "Clear rating" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:197 +msgid "Clear all tags" +msgstr "Minden címke törlése" + +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:206 msgid "Clear Ids" msgstr "Azonosítók törlése" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:210 msgid "" "Paste the contents of the clipboard into the identifiers box prefixed with " "isbn:" @@ -14561,76 +14660,76 @@ msgstr "" "A vágólap tartalmának beillesztése azonosítóként a szövegmezőbe „isbn:” " "előtaggal" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:223 msgid "&Download metadata" msgstr "Metaa&datok letöltése" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:235 msgid "Configure download metadata" msgstr "Metaadatok letöltésének beállítása" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:234 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:239 msgid "Change how calibre downloads metadata" msgstr "A metaadatok letöltésének beállítása" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:296 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:301 #, python-format msgid " [%(num)d of %(tot)d]" msgstr " [%(num)d/%(tot)d]" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:325 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:330 #, python-format msgid "Could not open %s. Is it being used by another program?" msgstr "Nem lehet megnyitni: %s. Esetleg másik program használja?" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:338 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:345 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:343 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:350 msgid "Could not read cover" msgstr "Nem lehet olvasni a borítót" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:339 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:344 #, python-format msgid "Could not read cover from %s format" msgstr "Nem lehet kiolvasni a borítót a %s formátumból" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:346 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:351 #, python-format msgid "The cover in the %s format is invalid" msgstr "A %s formátumban lévő borító érvénytelen" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:522 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:527 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:532 #, python-format msgid "Save changes and edit the metadata of %s" msgstr "Változtatások mentése és a következő metaadatainak szerkesztése: %s" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:625 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:831 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:630 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:837 msgid "Change cover" msgstr "Borítócsere" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:684 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:690 msgid "Co&mments" msgstr "&Megjegyzés" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:724 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:872 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:730 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:878 msgid "&Metadata" msgstr "&Metaadat" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:729 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:735 msgid "&Cover and formats" msgstr "&Borító és formátumok" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:801 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:807 msgid "C&ustom metadata" msgstr "&Egyéni metaadat" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:812 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:818 msgid "&Comments" msgstr "&Megjegyzések" -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:878 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:884 msgid "Basic metadata" msgstr "Alap metaadat" @@ -14899,6 +14998,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:159 msgid "Automatically &convert added books to the current output format" msgstr "" +"A hozzáadott &könyvek automatikus konvertálása a jelenlegi kimeneti " +"formátumba" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:160 msgid "The Add &Process" @@ -15065,11 +15166,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:165 msgid "Preferred &input format order:" -msgstr "&Bemeneti formátumok előnyberészesítési sorrendje:" +msgstr "&Bemeneti formátumok előnyben részesítési sorrendje:" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:168 msgid "Use internal &viewer for:" -msgstr "A beépített ol&vasó program használata a következőkhöz:" +msgstr "A beépített ol&vasóprogram használata a következőkhöz:" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:169 msgid "Reset all disabled &confirmation dialogs" @@ -15077,7 +15178,7 @@ msgstr "&Minden letiltott megerősítő párbeszédablak engedélyezése" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:26 msgid "All Columns" -msgstr "" +msgstr "Minden oszlop" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:32 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:37 @@ -15221,28 +15322,28 @@ msgstr "" "Egy feltételt úgy kapcsolhat ki, hogy a hozzá tartozó értékeket üresre " "állítja" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:338 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:339 msgid "Sample Text" msgstr "Mintaszöveg" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:380 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:381 msgid "Invalid condition" msgstr "Érvénytelen feltétel" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:381 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:382 #, python-format msgid "One of the conditions for this rule is invalid: %s" msgstr "A következő szabály egyik feltétele nem megfelelő: %s" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:386 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:387 msgid "No conditions" msgstr "Nincs feltétel megadva" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:388 msgid "You must specify at least one non-empty condition for this rule" msgstr "Legalább egy, nem üres feltételt meg kell adnia a szabályhoz" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:476 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:479 #, python-format msgid "" "\n" @@ -15255,7 +15356,7 @@ msgstr "" " 
%(rule)s
\n" " " -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:481 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:484 #, python-format msgid "" "

Set the color of %(col)s to %(color)s if the " @@ -15270,7 +15371,7 @@ msgstr "" "

    %(rule)s
\n" " " -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:496 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:500 #, python-format msgid "" "
  • If the %(col)s column %(action)s value: %(val)s" @@ -15278,7 +15379,7 @@ msgstr "" "
  • Ha a(z) %(col)s oszlop %(action)s értékű(kel/re..): " "%(val)s" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:512 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:516 msgid "" "You can control the color of columns in the book list by creating \"rules\" " "that tell calibre what color to use. Click the Add Rule button below to get " @@ -15288,36 +15389,36 @@ msgstr "" "kattintson a „Szabály hozzáadása” gombra.

    A szabályra történő dupla " "kattintással módosíthatja a már meglévőt." -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:520 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:524 msgid "Add Rule" msgstr "Sz&abály hozzáadása" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:523 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:527 msgid "Remove Rule" msgstr "Szabály &eltávolítása" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:540 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:544 msgid "Move the selected rule up" msgstr "A kiválasztott szabály mozgatása felfelé" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:545 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:549 msgid "Move the selected rule down" msgstr "A kiválasztott szabály mozgatása lefelé" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:553 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:557 msgid "Add Advanced Rule" msgstr "Össze&tett szabály hozzáadása" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:601 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:605 msgid "No rule selected" msgstr "Nincs kiválasztott szabály" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:602 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:606 #, python-format msgid "No rule selected for %s." msgstr "Nincs kiválasztott szabály a következőhöz: %s." -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:607 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:611 msgid "removal" msgstr "eltávolítás" @@ -15804,6 +15905,9 @@ msgid "" "A device (%s) is already detected by calibre. If you wish to debug the " "detection of another device, first disconnect this device." msgstr "" +"Egy (%s) eszközt már felismert a calibre. Ha szeretné egy másik eszköz " +"kapcsolódását ellenőrizni, ezt a felismert eszközt először le kell " +"választania." #: /home/kovid/work/calibre/src/calibre/gui2/preferences/device_debug.py:57 msgid "Debugging failed" @@ -15860,17 +15964,17 @@ msgid "" "automatically sent for downloaded news to all email addresses that have Auto-" "send checked." msgstr "" -"A calibre könyveket tud továbbítani Önnek e-mailen keresztül. Ha bejelöli az " -"Automatikus küldést, akkor az e-mailek a letöltött hírekkel együtt " +"A calibre könyveket tud továbbítani Önnek emaiben. Ha bejelöli az " +"Automatikus küldést, akkor az emailek a letöltött hírekkel együtt " "postázódnak az összes címre." #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:67 msgid "Add an email address to which to send books" -msgstr "E-mail cím hozzáadása könyvküldéshez" +msgstr "Email cím hozzáadása könyvküldéshez" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:68 msgid "&Add email" -msgstr "E-mail &hozzáadása" +msgstr "Email &hozzáadása" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:69 msgid "Make &default" @@ -15878,11 +15982,11 @@ msgstr "Legyen &alapértelmezett" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:70 msgid "&Remove email" -msgstr "E-mail &eltávolítása" +msgstr "Email &eltávolítása" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:28 msgid "Email" -msgstr "E-mail" +msgstr "Email" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:28 msgid "Subject" @@ -15890,7 +15994,7 @@ msgstr "Tárgy" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29 msgid "Alias" -msgstr "" +msgstr "Álnév" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:29 msgid "Auto send" @@ -15899,7 +16003,7 @@ msgstr "Auto küld" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:34 msgid "Formats to email. The first matching format will be sent." msgstr "" -"E-mailben elküldendő formátum. Az első létező formátum kerül elküldésre." +"Emailben elküldendő formátum. Az első létező formátum kerül elküldésre." #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:35 msgid "" @@ -15907,7 +16011,7 @@ msgid "" "used for the subject. Also, the same templates used for \"Save to disk\" " "such as {title} and {author_sort} can be used here." msgstr "" -"Az e-mail tárgya. Ha üres, akkor a cím lesz a tárgy. A „Mentés lemezre” " +"Az email tárgya. Ha üres, akkor a cím lesz a tárgy. A „Mentés lemezre” " "sablonjait, mint a {title} vagy az {author_sort} is használhatja." #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:39 @@ -15916,8 +16020,8 @@ msgid "" "address (provided it is in one of the listed formats)." msgstr "" "Ha be van jelölve, akkor a letöltött hírek automatikusan
    el lesznek " -"küldve e-mailben erre a címre (ha létezik a „Formátumok” oszlopban " -"beírtaknak megfelelő)" +"küldve emailben erre a címre (ha létezik a „Formátumok” oszlopban beírtaknak " +"megfelelő)" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:42 msgid "Friendly name to use for this email address" @@ -15925,14 +16029,20 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/emailp.py:128 msgid "new email address" -msgstr "új e-mail cím" +msgstr "új email cím" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/ignored_devices.py:24 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/ignored_devices.py:26 msgid "" "The list of devices that you have asked calibre to ignore. Uncheck a device " "to have calibre stop ignoring it." msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/ignored_devices.py:37 +msgid "" +"The list of device plugins you have disabled. Uncheck an entry to enable the " +"plugin. calibre cannot detect devices that are managed by disabled plugins." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel.py:103 msgid "Narrow" msgstr "Keskeny" @@ -16087,7 +16197,7 @@ msgstr "Mozgatás lefelé" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:267 msgid "Default author link template:" -msgstr "Alapértelmezett szerzőhivatkozás minta:" +msgstr "Alapértelmezett szerzőhivatkozás sablon:" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:268 msgid "" @@ -16100,15 +16210,15 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:273 msgid "Show &cover in the book details panel" -msgstr "" +msgstr "&Borító megjelenítése a könyv részletei panelen" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:274 msgid "Show the size of the book's cover in pixels" -msgstr "" +msgstr "A borítókép méretét mutatja meg képpontban" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:275 msgid "Show cover &size" -msgstr "" +msgstr "Borítóméret &mutatása" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:277 msgid "" @@ -16154,7 +16264,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:292 msgid "Categories not to partition:" -msgstr "" +msgstr "Csoportosítás nélküli kategóriák:" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:293 msgid "" @@ -16194,7 +16304,7 @@ msgstr "Ha a borítóböngésző külön ablakban van, az legyen &teljes képern #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:305 #, python-format msgid "You can press the %s keys to toggle full screen mode." -msgstr "A következő billentyűkkel válthat teljes képernyős üzemmódra: %s" +msgstr "A következő billentyűkkel válthat teljesképernyős üzemmódra: %s" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:231 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks_ui.py:123 @@ -16274,11 +16384,11 @@ msgstr "Nincs forrás kiválasztva" msgid "No source selected, cannot configure." msgstr "Nincs forrás kiválasztva, beállítás nem lehetséges." -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:119 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:126 msgid "Metadata sources" msgstr "Metaadat források" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:120 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:127 msgid "" "Disable any metadata sources you do not want by unchecking them. You can " "also set the cover priority. Covers from sources that have a higher " @@ -16288,41 +16398,41 @@ msgstr "" "prioritását is beállíthatja. A magasabb prioritású (kisebb számmal jelölt) " "források élveznek elsőbbséget csoportos metaadat letöltéskor.\n" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:122 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:129 msgid "" "Sources with a red X next to their names must be configured before they will " "be used. " msgstr "" "A piros X-szel jelölt források használat előtt beállítást igényelnek. " -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:123 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:130 msgid "Configure selected source" msgstr "Kiválasztott &forrás beállítása" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:125 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:132 msgid "" "If you uncheck any fields, metadata for those fields will not be downloaded" msgstr "A be nem jelölt mezőkhöz nem lesz letöltve metaadat" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:133 msgid "&Select all" msgstr "&Mindegyik kijelölése" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:127 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:134 msgid "&Clear all" msgstr "Egyik &sem" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:128 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:135 msgid "" "Restore your own subset of checked fields that you define using the 'Set as " "default' button" msgstr "A „Legyen alapértelmezett” gombbal beállított értékek visszaállítása" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:129 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:136 msgid "&Select default" msgstr "&Alapértelmezettek kijelölése" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:130 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:137 msgid "" "Store the currently checked fields as a default you can restore using the " "'Select default' button" @@ -16330,37 +16440,37 @@ msgstr "" "A jelenleg kijelölt mezők legyenek azok az alapértelmezettek, melyek az " "„Alapértelmezettek kijelölése” gombbal visszaállíthatók." -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:138 msgid "&Set as default" msgstr "&Legyen alapértelmezett" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:139 msgid "Convert all downloaded comments to plain &text" msgstr "Megjegyzések konver&tálása egyszerű, formázatlan szöveggé" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:133 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:140 msgid "Swap author names from FN LN to LN, FN" msgstr "Szer&ző keresztnév(KN) vezetéknév(VN) cseréje VN, KN-re" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:134 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:141 msgid "Max. number of &tags to download:" msgstr "Letölthető címkék ma&ximális száma:" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:135 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:142 msgid "Max. &time to wait after first match is found:" msgstr "Az első találat utáni maximális &várakozási idő:" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:136 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:138 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:143 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:145 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:421 msgid " secs" msgstr " másodperc" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:144 msgid "Max. time to wait after first &cover is found:" msgstr "Az első &borítótalálat utáni maximális várakozási idő:" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:139 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:146 msgid "" "

    Different metadata sources have different sets of tags for the same book. " "If this option is checked, then calibre will use the smaller tag sets. These " @@ -16380,11 +16490,11 @@ msgstr "" "címkekészlettel. A valóságban a legtöbb forrás bővített címkekészlettel " "rendelkezik." -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:141 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:148 msgid "Prefer &fewer tags" msgstr "Kevesebb &címke letöltése" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:142 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:149 msgid "Use published date of \"first edition\" (from worldcat.org)" msgstr "" @@ -16435,7 +16545,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:77 msgid "Debug &device detection" -msgstr "Eszközkapcsolódás ellenőrzése" +msgstr "Eszközkapcsolódás &ellenőrzése" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:78 msgid "Get information to setup the &user defined device" @@ -16665,7 +16775,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:368 #, python-format msgid "Are you sure you want to remove the plugin: %s?" -msgstr "" +msgstr "Biztosan törli a következő bővítményt: %s?" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins.py:373 msgid "Plugin {0} successfully removed" @@ -16740,7 +16850,7 @@ msgid "" "particular book does not have some metadata, the variable will be replaced " "by the empty string." msgstr "" -"A lenti mintát pontosítva be tudja állítani a lemezre történő mentés mappa " +"A lenti sablont pontosítva be tudja állítani a lemezre történő mentés mappa " "és fájlneveit. A „/” karakter jeleni az almappákat. A használható metaadat-" "változókat a listamezőben láthatja. Ha az adott könyv nem tartalmazza a " "megadott metaadatot, akkor az egy üres karakterlánccal lesz helyettesítve." @@ -16893,7 +17003,7 @@ msgstr "A keresés elkezdődik, ahogy beírja a szöveget" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:169 msgid "Unaccented characters match accented characters" -msgstr "" +msgstr "Ékezetes karakterek megfeleltetése ékezet nélkülivel" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/search_ui.py:170 msgid "" @@ -17444,10 +17554,6 @@ msgstr "Váltás az eszköz és a könyvtár nézet között" msgid "Separator" msgstr "Elválasztó" -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:59 -msgid "Choose library" -msgstr "Könyvtár kiválasztása" - #: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:220 msgid "The main toolbar" msgstr "A fő eszköztár" @@ -18008,7 +18114,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:178 msgid "You must enter a title, author or keyword to search for." -msgstr "" +msgstr "Meg kell adnia egy címet, szerzőt vagy kulcsszót a kereséshez." #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search.py:300 msgid "Customize get books search" @@ -18032,19 +18138,19 @@ msgstr "Könyv letöltése" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:171 msgid "Search by title" -msgstr "" +msgstr "Keresés cím alapjáán" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:173 msgid "Search by author" -msgstr "" +msgstr "Keresés szerző alapján" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:175 msgid "&Keyword:" -msgstr "" +msgstr "&Kulcsszó:" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:176 msgid "Search by any keyword" -msgstr "" +msgstr "Keresés bármilyen kulcsszó alapján" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:182 msgid "Open a selected book in the system's web browser" @@ -18315,7 +18421,7 @@ msgid "Alter Tag Browser" msgstr "Címkeböngésző megváltoztatása" #: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/ui.py:397 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:277 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:279 msgid "Sort by" msgstr "Rendezés" @@ -18447,11 +18553,11 @@ msgstr "A(z) %s kezelése" #: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/view.py:566 msgid "Change category icon" -msgstr "" +msgstr "Kategória ikon megváltoztatása" #: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/view.py:568 msgid "Restore default icon" -msgstr "" +msgstr "Alapértelmezett ikon visszaállítása" #: /home/kovid/work/calibre/src/calibre/gui2/tag_browser/view.py:586 msgid "Show all categories" @@ -18478,13 +18584,54 @@ msgstr "Az első betű csak a névre rendezéskor használható" msgid "Convert book %(num)d of %(total)d (%(title)s)" msgstr "Könyvek konvertálása: %(num)d/%(total)d (%(title)s)" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:101 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:97 +msgid "Could not convert" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:98 +#, python-format +msgid "" +"Could not convert %s as it has no ebook files. If you think it should " +"have files, but calibre is not finding them, that is most likely because you " +"moved the book's files around outside of calibre. You will need to find " +"those files and re-add them to calibre." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:108 +#, python-format +msgid "No supported formats (Available formats: %s)" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:111 +msgid "This book has no actual ebook files" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:116 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:242 msgid "Could not convert some books" msgstr "Néhány könyvet nem sikerült konvertálni" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:102 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:117 +#, python-format +msgid "" +"Could not convert %(num)d of %(tot)d books, because no supported source " +"formats were found." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:151 +msgid "Queueing books for bulk conversion" +msgstr "Könyvek sorba állítása csoportos konvertáláshoz" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:216 +msgid "Queueing " +msgstr "Sorbaállás " + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:217 +#, python-format +msgid "Convert book %(num)d of %(tot)d (%(title)s)" +msgstr "Könyvek konvertálása: %(num)d/%(tot)d (%(title)s)" + +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:243 #, python-format msgid "" "Could not convert %(num)d of %(tot)d books, because no suitable source " @@ -18493,28 +18640,15 @@ msgstr "" "Nem sikerült %(num)d konvertálása %(tot)d könyvből, mert nem található " "megfelelő forrásformátum." -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:136 -msgid "Queueing books for bulk conversion" -msgstr "Könyvek sorba állítása csoportos konvertáláshoz" - -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:201 -msgid "Queueing " -msgstr "Sorbaállás " - -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:202 -#, python-format -msgid "Convert book %(num)d of %(tot)d (%(title)s)" -msgstr "Könyvek konvertálása: %(num)d/%(tot)d (%(title)s)" - -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:288 msgid "Fetch news from " msgstr "Hírek letöltése a következő helyről: " -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:346 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:361 msgid "Convert existing" msgstr "Létező átalakítása" -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:347 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:362 #, python-format msgid "" "The following books have already been converted to %s format. Do you wish to " @@ -18545,7 +18679,7 @@ msgstr "Az aktuális keresés törlése" #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:368 msgid "Debug mode" -msgstr "Hibakövetési mód" +msgstr "Hibakeresési mód" #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:369 #, python-format @@ -18640,7 +18774,7 @@ msgid "" msgstr "" " kommunikál az eszközzel!
    \n" " A kilépés adatvesztést okozhat az eszközön.
    \n" -" Biztos, hogy ki akarsz lépni??" +" Biztos, hogy ki akar lépni??" #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:745 msgid "Active jobs" @@ -18688,7 +18822,7 @@ msgstr "Új verzió" #: /home/kovid/work/calibre/src/calibre/gui2/update.py:168 msgid "updated plugins" -msgstr "Frissített bővítmények" +msgstr "frissített bővítmény" #: /home/kovid/work/calibre/src/calibre/gui2/update.py:196 #: /home/kovid/work/calibre/src/calibre/gui2/update.py:201 @@ -18834,11 +18968,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config.py:63 msgid "Start viewer in full screen mode" -msgstr "" +msgstr "Olvasóprogram indítása teljesképernyős módban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config.py:65 msgid "Show full screen usage help" -msgstr "" +msgstr "Teljesképernyő súgó mutatása" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config.py:74 msgid "Font options" @@ -18913,7 +19047,7 @@ msgstr "E-book olvasó beállítása" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:377 msgid "&Default font size:" -msgstr "&Alap betűméret:" +msgstr "Alapértelmezett &betűméret:" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:382 msgid "Serif" @@ -18988,7 +19122,7 @@ msgstr "Teljesképernyős módban a szöveg maximális szélessége:" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:404 msgid "Show &clock in full screen mode" -msgstr "&Óra megjelenítése teljes képernyős módban" +msgstr "&Óra megjelenítése teljesképernyős módban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:405 msgid "Show reading &position in full screen mode" @@ -18996,19 +19130,19 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:406 msgid "Show &scrollbar in full screen mode" -msgstr "" +msgstr "Gördítősáv mutatása teljesképernyős módban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:407 msgid "&Start viewer in full screen mode" -msgstr "" +msgstr "Olvasóprogram &indítása teljesképernyős módban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:408 msgid "Show &help message when starting full screen mode" -msgstr "" +msgstr "&Súgóüzenet megjelenítése teljesképernyős üzemmódban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:409 msgid "F&ull screen options" -msgstr "&Teljes képernyős beállítások" +msgstr "&Teljesképernyős beállítások" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:410 msgid "Background color:" @@ -19126,7 +19260,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:442 msgid "Delete a saved theme:" -msgstr "" +msgstr "Mentett téma törlése:" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:444 msgid "&Theming" @@ -19142,11 +19276,11 @@ msgstr "Keresés szótárban" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:507 msgid "View &image..." -msgstr "" +msgstr "Kép megtek&intése..." #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:509 msgid "View &table..." -msgstr "" +msgstr "&Táblázat megtekintése..." #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:512 msgid "&Search for next occurrence" @@ -19182,8 +19316,8 @@ msgid "Section End" msgstr "Szakasz vége" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:547 -msgid "Normal font size" -msgstr "" +msgid "Default font size" +msgstr "Alpértelmezett betűméret" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:614 #, python-format @@ -19206,7 +19340,7 @@ msgstr "&Mentés másként" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/image_popup.py:41 msgid "&Rotate" -msgstr "" +msgstr "Fo&rgatás" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/image_popup.py:67 msgid "Choose a file to save to" @@ -19303,7 +19437,7 @@ msgstr "Szöveg keresése a könyvben" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:246 #, python-format msgid "Toggle full screen (%s)" -msgstr "Teljesképernyős mód be/ki (%s)" +msgstr "Teljesképernyős be/ki (%s)" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:286 msgid "Full screen mode" @@ -19357,19 +19491,19 @@ msgstr "E-bookok" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:700 #, python-format msgid "" -"Make font size %(which)s\n" +"%(which)s font size\n" "Current magnification: %(mag).1f" msgstr "" -"Betűméret változtatása %(which)s\n" -"Jelenlegi nagyítás mértéke: %(mag).1f" +"%(which)s betű méret\n" +"Jelenlegi nagyítás: %(mag).1f" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:702 -msgid "larger" -msgstr "nagyobbra" +msgid "Increase" +msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:704 -msgid "smaller" -msgstr "kisebbre" +msgid "Decrease" +msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:722 #, python-format @@ -19412,7 +19546,7 @@ msgstr "Nem lehet megnyitni a könyvet" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:988 msgid "Unknown error" -msgstr "" +msgstr "Ismeretlen hiba" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1103 msgid "Options to control the ebook viewer" @@ -19429,7 +19563,7 @@ msgstr "" msgid "" "If specified, viewer window will try to open full screen when started." msgstr "" -"Ha be van állítva, akkor az olvasóprogram megpróbál teljes képernyősként " +"Ha be van állítva, akkor az olvasóprogram megpróbál teljesképernyősként " "indulni" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:1118 @@ -19452,77 +19586,77 @@ msgstr "" "\n" "E-book olvasása.\n" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:204 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:211 msgid "E-book Viewer" msgstr "E-book olvasó" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:212 msgid "Close dictionary" msgstr "Szótár bezárása" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:207 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:214 msgid "toolBar" msgstr "eszközTár" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:210 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:217 msgid "Next page" msgstr "Következő oldal" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:211 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:218 msgid "Previous page" msgstr "Előző oldal" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:212 -msgid "Font size larger" -msgstr "Nagyobb betűméret" +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:219 +msgid "Increase font size" +msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213 -msgid "Font size smaller" -msgstr "Kisebb betűméret" +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:220 +msgid "Decrease font size" +msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:217 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:224 msgid "Find next" msgstr "Következő keresése" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:218 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:225 msgid "Find next occurrence" msgstr "Következő előfordulás keresése" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:222 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:229 msgid "Reference Mode" msgstr "Referencia Mód" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:223 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:230 msgid "Bookmark" msgstr "Könyvjelző" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:224 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:231 msgid "Toggle full screen" -msgstr "Teljes képernyő be/ki" +msgstr "Teljesképernyő be/ki" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:232 msgid "Print" msgstr "Nyomtatás" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:233 msgid "Find previous" msgstr "Előző keresése" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:227 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:234 msgid "Find previous occurrence" msgstr "Előző előfordulás keresése" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:229 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:236 msgid "Toggle Paged mode" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:230 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:237 msgid "Load theme" -msgstr "" +msgstr "Téma betöltése" -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:231 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:238 msgid "Load a theme" -msgstr "" +msgstr "Téma betöltése" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/printing.py:68 msgid "Failed to render" @@ -19535,7 +19669,7 @@ msgstr "Nem sikerült a következő dokumentum renderelése: %s" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/table_popup.py:57 msgid "View Table" -msgstr "" +msgstr "Táblázat" #: /home/kovid/work/calibre/src/calibre/gui2/viewer/table_popup.py:72 msgid "No table found" @@ -19709,15 +19843,15 @@ msgid "" "button below. You will also have to register your gmail address in your " "Amazon account." msgstr "" -"

    A calibre e-mailben automatikusan tud könyveket küldeni Kindle " -"olvasójára. Ehhez alul be kell állítania az e-mail küldést. A legegyszerűbb, " -"ha létrehoz egy ingyenes gmail fiókot és a " -"„Gmail használata” gombra kattint. Ezt a Gmail címet természetesen az Ön " -"Amazon fiókjában is regisztrálni kell." +"

    A calibre emailben automatikusan tud könyveket küldeni Kindle olvasójára. " +"Ehhez alul be kell állítania az email küldést. A legegyszerűbb, ha létrehoz " +"egy ingyenes gmail fiókot és a „Gmail " +"használata” gombra kattint. Ezt a Gmail címet természetesen az Ön Amazon " +"fiókjában is regisztrálni kell." #: /home/kovid/work/calibre/src/calibre/gui2/wizard/kindle_ui.py:50 msgid "&Kindle email:" -msgstr "&Kindle e-mail:" +msgstr "&Kindle email:" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/library_ui.py:57 msgid "Choose your &language:" @@ -19757,25 +19891,25 @@ msgstr "A levél elküldése sikerült." #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:59 msgid "Setup sending email using" -msgstr "Küldésre szolgáló e-mail beállítása a következővel:" +msgstr "Küldésre szolgáló email beállítása a következővel:" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:61 msgid "" "If you don't have an account, you can sign up for a free {name} email " "account at http://{url}. {extra}" msgstr "" -"Ha még nincs fiókja, regisztrálhat egy ingyenes {name} e-mail címet a http://{url} oldalon. {extra}" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:68 #, python-format msgid "Your %s &email address:" -msgstr "Az Ön %s &e-mail címe:" +msgstr "Az Ön %s &email címe:" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:69 #, python-format msgid "Your %s &username:" -msgstr "%s &felhasználóneve:" +msgstr "Az Ön %s &felhasználóneve:" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:70 #, python-format @@ -19789,9 +19923,9 @@ msgid "" "your %s email address to the allowed email addresses in your Amazon.com " "Kindle management page." msgstr "" -"Ha tervezi, hogy Kindle eszközére e-mailen keresztül küld könyveket, akkor " -"a(z) %s e-mail címét hozzá kell adnia az Amazon.com-ra bejelentkezés után a " -"„Your Account > Manage Your Kindle > Personal Document Settings > Approved " +"Ha tervezi, hogy Kindle eszközére emailben küld könyveket, akkor a(z) %s e-" +"mail címét hozzá kell adnia az Amazon.com-ra bejelentkezés után a „Your " +"Account > Manage Your Kindle > Personal Document Settings > Approved " "Personal Document E-mail List” résznél az „Add a new approved e-mail " "address”-re kattintva." @@ -19806,7 +19940,7 @@ msgstr "Helytelen felhasználói név" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:103 #, python-format msgid "%s needs the full email address as your username" -msgstr "%s esetén a teljes e-mail cím használandó felhasználónévként" +msgstr "%s esetén a teljes email cím használandó felhasználónévként" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:154 msgid "OK to proceed?" @@ -19816,7 +19950,7 @@ msgstr "Kívánja folytatni?" msgid "" "This will display your email password on the screen. Is it OK to proceed?" msgstr "" -"Ennek hatására megjelenik az e-mail címéhez tartozó jelszó a képernyőn. " +"Ennek hatására megjelenik az email címéhez tartozó jelszó a képernyőn. " "Kívánja folytatni?" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:199 @@ -19826,7 +19960,7 @@ msgid "" "this case, I strongly suggest you setup a free gmail account instead." msgstr "" "Ha új Hotmail fiókot hoz létre, a Microsoft időnként felszólíthatja a " -"felhasználói fiók érvényesítésére mielőtt engedi, hogy a calibre e-mailt " +"felhasználói fiók érvényesítésére mielőtt engedi, hogy a calibre emailt " "küldjön. Javasoljuk, hogy ebben az esetben használjon GMail fiókot." #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email.py:221 @@ -19862,13 +19996,13 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:124 msgid "Send email &from:" -msgstr "&E-mail küldése a következőről:" +msgstr "&Email küldése a következőről:" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:125 msgid "" "

    This is what will be present in the From: field of emails sent by " "calibre.
    Set it to your email address" -msgstr "Ez fog megjelenni a Feladó mezőben.
    Írja be az e-mail címét." +msgstr "Ez fog megjelenni a Feladó mezőben.
    Írja be az email címét." #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:126 msgid "" @@ -19885,7 +20019,7 @@ msgstr "&Levelező kiszolgáló" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:128 msgid "calibre can optionally use a server to send mail" msgstr "" -"A calibre opcionálisan tud kiszolgálót is használni az e-mailek " +"A calibre opcionálisan tud kiszolgálót is használni az emailek " "küldéséhez" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:129 @@ -19907,7 +20041,7 @@ msgstr "Kimenő levek kiszolgálójának portja. Alapbeállítás: 25" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:134 msgid "Your username on the mail server" -msgstr "Az Ön Felhasználóneve a levelező kiszolgálón" +msgstr "Az Ön felhasználóneve a levelező kiszolgálón" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:136 msgid "Your password on the mail server" @@ -19960,7 +20094,7 @@ msgstr "Hotmail használata" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:147 msgid "&Test email" -msgstr "Tes&zt e-mail küldése" +msgstr "Tes&zt email küldése" #: /home/kovid/work/calibre/src/calibre/gui2/wizard/stanza_ui.py:49 msgid "" @@ -20375,21 +20509,21 @@ msgstr "Nincs elérhető könyv a katalógus készítéséhez" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:305 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2477 msgid "Titles" -msgstr "" +msgstr "Címek" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:309 msgid "Genres" -msgstr "" +msgstr "Műfajok" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:311 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:1780 msgid "Recently Added" -msgstr "" +msgstr "Utoljára hozzáadva" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:313 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:1979 msgid "Recently Read" -msgstr "" +msgstr "Utoljára olvasva" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:315 msgid "Descriptions" @@ -20405,11 +20539,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:744 msgid "Sorting database" -msgstr "" +msgstr "Adatbázis rendezése" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:846 msgid "Sorting titles" -msgstr "" +msgstr "Címek rendezése" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:858 msgid "" @@ -20423,11 +20557,11 @@ msgstr "Nincs elérhető könyv a katalógusba illesztéshez" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2060 msgid "Genres HTML" -msgstr "" +msgstr "Műfajok HTML" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2457 msgid "Titles HTML" -msgstr "" +msgstr "Címek HTML" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2654 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2656 @@ -20445,7 +20579,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:2932 msgid "NCX header" -msgstr "" +msgstr "NCX fejléc" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3009 msgid "NCX for Descriptions" @@ -20453,7 +20587,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3136 msgid "NCX for Series" -msgstr "" +msgstr "Sorozatok NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3221 #, python-format @@ -20467,59 +20601,59 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3267 msgid "NCX for Titles" -msgstr "" +msgstr "Címek NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3354 #, python-format msgid "Titles beginning with %s" -msgstr "" +msgstr "Ezzel kezdődő címek: %s" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3356 #, python-format msgid "Titles beginning with '%s'" -msgstr "" +msgstr "Ezzel kezdődő címek: %s" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3398 msgid "NCX for Authors" -msgstr "" +msgstr "Szerzők NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3477 #, python-format msgid "Authors beginning with %s" -msgstr "" +msgstr "Szerzők ezzel kezdődően: %s" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3479 #, python-format msgid "Authors beginning with '%s'" -msgstr "" +msgstr "Szerzők ezzel kezdődően: %s" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3520 msgid "NCX for Recently Added" -msgstr "" +msgstr "Utoljára hozzáadva NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3713 msgid "NCX for Recently Read" -msgstr "" +msgstr "Utoljára olvasva NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3855 msgid "NCX for Genres" -msgstr "" +msgstr "Műfajok NCX" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:3980 msgid "Generating OPF" -msgstr "" +msgstr "OPF generálása" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:4357 msgid "Thumbnails" -msgstr "" +msgstr "Miniatűrök" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:4363 msgid "Thumbnail" -msgstr "" +msgstr "Miniatűr" #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:4897 msgid "Saving NCX" -msgstr "" +msgstr "NCX mentése" #: /home/kovid/work/calibre/src/calibre/library/check_library.py:26 msgid "Invalid titles" @@ -21393,6 +21527,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/restore.py:125 msgid "Cannot restore preferences. Backup file not found." msgstr "" +"A beállításokat nem lehet visszaállítani. Biztonsági mentés nem található." #: /home/kovid/work/calibre/src/calibre/library/restore.py:136 msgid "Finished restoring preferences and column metadata" @@ -21574,7 +21709,7 @@ msgid "" "Failed to calculate path for save to disk. Template: %(templ)s\n" "Error: %(err)s" msgstr "" -"A lemezre mentés útvonalát nem sikerült meghatározni. sablon: %(templ)s\n" +"A lemezre mentés útvonalát nem sikerült meghatározni. Sablon: %(templ)s\n" "Hiba: %(err)s" #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:316 @@ -21652,20 +21787,20 @@ msgstr "" "szerverekről kell ehhez a szerverhez a visszautat megadni." #: /home/kovid/work/calibre/src/calibre/library/server/ajax.py:317 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:343 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:627 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:353 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:643 msgid "All books" msgstr "Minden könyv" #: /home/kovid/work/calibre/src/calibre/library/server/ajax.py:318 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:342 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:626 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:352 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:642 #: /home/kovid/work/calibre/src/calibre/library/server/opds.py:584 msgid "Newest" msgstr "Legújabb" #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:65 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:499 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:515 msgid "Loading, please wait" msgstr "Betöltés, kérjük várjon" @@ -21688,7 +21823,7 @@ msgid "Browsing %d books" msgstr "%d könyv böngészése" #: /home/kovid/work/calibre/src/calibre/library/server/browse.py:127 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:257 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:259 msgid "Average rating" msgstr "Átlagos értékelés" @@ -21702,77 +21837,77 @@ msgstr "%(prefix)s: %(rating).1f csillag" msgid "%d stars" msgstr "%d csillag" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:258 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:260 msgid "Popularity" msgstr "Gyakoriság" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:280 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:282 msgid "library" msgstr "könyvtár" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:281 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:283 msgid "home" msgstr "Kezdőlap" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:388 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:453 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:400 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:469 msgid "Browse books by" msgstr "Könyvek böngészése e szerint:" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:393 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:405 msgid "Choose a category to browse by:" msgstr "Válassza ki, mely kategória szerint kíván böngészni:" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:524 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:540 msgid "Browsing by" msgstr "Böngészés e szerint:" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:525 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:541 msgid "Up" msgstr "Fel" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:662 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:678 msgid "in" msgstr "ebben" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:665 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:681 msgid "Books in" msgstr "Könyvek:" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:759 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:775 msgid "Other formats" msgstr "Egyéb formátumok" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:766 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:782 #, python-format msgid "Read %(title)s in the %(fmt)s format" msgstr "%(title)s olvasása %(fmt)s formátumban" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:771 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:787 msgid "Get" msgstr "Letöltés" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:784 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:800 msgid "Details" msgstr "Részletek" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:786 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:802 msgid "Permalink" msgstr "Permalink" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:787 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:803 msgid "A permanent link to this book" msgstr "A könyvhöz tartozó permalink" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:799 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:815 msgid "This book has been deleted" msgstr "Ezt a könyvet törölték" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:897 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:913 msgid "in search" msgstr "a keresésben" -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:899 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:915 msgid "Matching books" msgstr "Egyező könyvek" @@ -21929,7 +22064,7 @@ msgstr "Az e-book konvertálás alapértelmezett kimeneti formátuma." #: /home/kovid/work/calibre/src/calibre/utils/config_base.py:393 msgid "Ordered list of formats to prefer for input." -msgstr "Rendezett lista az előnyberészesített formátumokról." +msgstr "Rendezett lista az előnyben részesített formátumokról." #: /home/kovid/work/calibre/src/calibre/utils/config_base.py:395 msgid "Read metadata from files" @@ -21998,7 +22133,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/utils/filenames.py:295 msgid "File is open in another process" -msgstr "" +msgstr "A fájlt egy másik művelet is használja" #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:31 #: /home/kovid/work/calibre/src/calibre/utils/formatter.py:182 @@ -23133,7 +23268,7 @@ msgstr "A hitelesítés sikertelen a következő kiszolgálóval: %s" #: /home/kovid/work/calibre/src/calibre/utils/smtp.py:258 msgid "Control email delivery" -msgstr "E-mail küldés beállításai" +msgstr "Email küldés beállításai" #: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:121 msgid "Unknown section" @@ -23161,7 +23296,8 @@ msgstr "A következő letöltése nem sikerült: %s" #, python-format msgid "The \"%s\" recipe needs a username and password." msgstr "" -"A következő recepthez felhasználónévre és jelszóra van szüksége: „%s”." +"A következő hírösszeállításhoz felhasználónévre és jelszóra van szüksége: " +"„%s”." #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:892 msgid "Download finished" @@ -23255,7 +23391,7 @@ msgstr "A következő cikk letöltése nem sikerült: %s" #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1489 msgid "Fetching feed" -msgstr "Hír letöltése" +msgstr "Hírek letöltése" #: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:1633 msgid "" @@ -23275,7 +23411,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/collection.py:45 msgid "You" -msgstr "Te" +msgstr "Ön" #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:75 #: /home/kovid/work/calibre/src/calibre/web/feeds/recipes/model.py:84 @@ -24383,7 +24519,7 @@ msgstr "" #: /home/kovid/work/calibre/resources/default_tweaks.py:428 msgid "The number of seconds to wait before sending emails" -msgstr "Az e-mailek küldése előtti várakozás másodpercben" +msgstr "Az emailek küldése előtti várakozás másodpercben" #: /home/kovid/work/calibre/resources/default_tweaks.py:429 msgid "" @@ -24393,7 +24529,7 @@ msgid "" "making email sending fail. Changes will take effect only after a restart of\n" "calibre." msgstr "" -"Nyilvános e-mail szerverek, mint a gmail vagy a hotmail, használata estén " +"Nyilvános email szerverek, mint a gmail vagy a hotmail, használata estén " "ennyi másodpercet\n" "vár a levél elküldése előtt. Alapérték: 5 perc.\n" "Ennél alacsonyabb érték esetén a szerverek SPAM ellenőrzése kidobhatja a " @@ -24535,7 +24671,7 @@ msgstr "" #: /home/kovid/work/calibre/resources/default_tweaks.py:484 msgid "Compile General Program Mode templates to Python" -msgstr "Általános Program Mód sablonok lefordítása" +msgstr "Általános Program Mód sablonok lefordítása Pythonnal" #: /home/kovid/work/calibre/resources/default_tweaks.py:485 msgid "" @@ -24560,7 +24696,7 @@ msgstr "" #: /home/kovid/work/calibre/resources/default_tweaks.py:494 msgid "What format to default to when using the Tweak feature" -msgstr "" +msgstr "A Finomhangolásnál használt alapértelmezett formátum" #: /home/kovid/work/calibre/resources/default_tweaks.py:495 msgid "" diff --git a/src/calibre/translations/id.po b/src/calibre/translations/id.po index 11efca6e9e..fe8b9232a3 100644 --- a/src/calibre/translations/id.po +++ b/src/calibre/translations/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: calibre\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-21 05:12+0000\n" +"POT-Creation-Date: 2013-01-04 05:12+0000\n" "PO-Revision-Date: 2012-01-18 11:51+0000\n" "Last-Translator: Amri Ristadi \n" "Language-Team: Indonesian \n" @@ -15,8 +15,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2012-12-22 04:45+0000\n" -"X-Generator: Launchpad (build 16378)\n" +"X-Launchpad-Export-Date: 2013-01-05 04:50+0000\n" +"X-Generator: Launchpad (build 16393)\n" #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56 msgid "Does absolutely nothing" @@ -26,10 +26,10 @@ msgstr "Tidak ada apa-apanya" #: /home/kovid/work/calibre/src/calibre/db/cache.py:106 #: /home/kovid/work/calibre/src/calibre/db/cache.py:109 #: /home/kovid/work/calibre/src/calibre/db/cache.py:120 -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:376 -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:377 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:101 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:378 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:379 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:114 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:115 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:77 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:667 @@ -53,6 +53,8 @@ msgstr "Tidak ada apa-apanya" #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/html_input.py:121 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/lrf_output.py:29 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdb_input.py:27 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:30 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:31 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/rtf_input.py:289 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/rtf_input.py:291 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/periodical.py:140 @@ -131,11 +133,10 @@ msgstr "Tidak ada apa-apanya" #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ereader/writer.py:174 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/palmdoc/writer.py:29 #: /home/kovid/work/calibre/src/calibre/ebooks/pdb/ztxt/writer.py:27 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:108 -#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/writer.py:109 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/render/links.py:119 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:447 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:455 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:166 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:411 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:414 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:167 @@ -147,24 +148,24 @@ msgstr "Tidak ada apa-apanya" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:145 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1416 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:1419 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:55 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:60 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:71 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:79 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:825 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:380 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:193 #: /home/kovid/work/calibre/src/calibre/gui2/email.py:208 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:440 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1106 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:439 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1103 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1319 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1322 #: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1325 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1328 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1416 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1413 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:85 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:250 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:261 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:402 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:407 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:178 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:182 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:202 @@ -237,7 +238,7 @@ msgstr "Aksi antarmuka pengguna" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:197 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:288 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/main.py:311 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:221 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:228 msgid "Preferences" msgstr "Pengaturan" @@ -993,23 +994,23 @@ msgstr "" msgid "Communicate with Android phones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:198 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:199 msgid "" "Comma separated list of directories to send e-books to on the device's " "main memory. The first one that exists will be used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:201 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:202 msgid "" "Comma separated list of directories to send e-books to on the device's " "storage cards. The first one that exists will be used" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:316 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:318 msgid "Communicate with S60 phones." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:335 +#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:337 msgid "Communicate with WebOS tablets." msgstr "" @@ -1243,8 +1244,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:352 #: /home/kovid/work/calibre/src/calibre/devices/bambook/driver.py:354 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:115 -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:126 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:129 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:140 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:440 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:472 #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:615 @@ -1388,27 +1389,31 @@ msgstr "" msgid "Communicate with the Hanvon N520 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:47 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:48 +msgid "Communicate with the Kibano eBook reader." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:61 msgid "Communicate with The Book reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:59 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:73 msgid "Communicate with the Libre Air reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:72 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:86 msgid "Communicate with the SpringDesign Alex eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:132 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:146 msgid "Communicate with the Azbooka" msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:151 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:165 msgid "Communicate with the Elonex EB 511 eBook reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:171 +#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:185 msgid "Communicate with the Cybook Odyssey eBook reader." msgstr "" @@ -1638,7 +1643,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/devices/kobo/driver.py:646 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:393 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:404 msgid "Not Implemented" msgstr "" @@ -2191,35 +2196,35 @@ msgstr "" msgid "Communicate with the Teclast K3/K5 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:37 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:38 msgid "Communicate with the Newsmy reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:48 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:49 msgid "Communicate with the Archos reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:58 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:59 msgid "Communicate with the Pico reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:70 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:71 msgid "Communicate with the iPapyrus reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:81 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:82 msgid "Communicate with the Sovos reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:91 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:92 msgid "Communicate with the Sunstech EB700 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:102 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:103 msgid "Communicate with the Stash W950 reader." msgstr "" -#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:114 +#: /home/kovid/work/calibre/src/calibre/devices/teclast/driver.py:115 msgid "Communicate with the Wexler reader." msgstr "" @@ -2418,6 +2423,7 @@ msgid "There is insufficient free space on the storage card" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:210 +#: /home/kovid/work/calibre/src/calibre/ebooks/pdf/render/from_html.py:230 #, python-format msgid "Rendered %s" msgstr "" @@ -2955,58 +2961,74 @@ msgstr "" msgid "Use the new PDF conversion engine." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:71 -#, python-format +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:54 msgid "" -"The unit of measure. Default is inch. Choices are %s Note: This does not " -"override the unit for margins!" +"Normally, the PDF page size is set by the output profile chosen under page " +"options. This option will cause the page size settings under PDF Output to " +"override the size specified by the output profile." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:76 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:60 +#, python-format +msgid "" +"The unit of measure for page sizes. Default is inch. Choices are %s Note: " +"This does not override the unit for margins!" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:65 #, python-format msgid "" "The size of the paper. This size will be overridden when a non default " "output profile is used. Default is letter. Choices are %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:80 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:69 msgid "" "Custom size of the document. Use the form widthxheight EG. `123x321` to " "specify the width and height. This overrides any specified paper-size." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:85 -#, python-format -msgid "The orientation of the page. Default is portrait. Choices are %s" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:89 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:74 msgid "" "Preserve the aspect ratio of the cover, instead of stretching it to fill the " "full first page of the generated pdf." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:94 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:79 msgid "The font family used to render serif fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:97 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:82 msgid "The font family used to render sans-serif fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:100 -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:104 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:85 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:89 msgid "The font family used to render monospaced fonts" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:107 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:92 msgid "The default font size" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:110 +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:95 msgid "The default font size for monospaced text" msgstr "" +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:97 +msgid "Surround all links with a red box, useful for debugging." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:99 +msgid "Use the old, less capable engine to generate the PDF" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pdf_output.py:102 +msgid "" +"Generate an uncompressed PDF, useful for debugging, only works with the new " +"PDF engine." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plugins/pml_output.py:22 msgid "" "Specify the character encoding of the output document. The default is cp1252." @@ -4032,8 +4054,8 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/quickview.py:85 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:222 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:84 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1111 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:83 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1108 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:150 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:162 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:39 @@ -4045,14 +4067,14 @@ msgid "Title" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:770 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:86 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1112 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:85 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1109 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/models.py:23 msgid "Author(s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:771 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:91 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:90 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:159 msgid "Publisher" msgstr "" @@ -4062,7 +4084,7 @@ msgid "Producer" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:773 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:957 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:963 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:157 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:245 msgid "Comments" @@ -4085,13 +4107,13 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:535 #: /home/kovid/work/calibre/src/calibre/gui2/catalog/catalog_epub_mobi.py:842 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:92 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:91 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:161 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:982 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:1228 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:201 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:780 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:796 msgid "Tags" msgstr "" @@ -4100,7 +4122,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/quickview.py:89 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_categories.py:60 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/template_dialog.py:224 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:93 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:92 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:70 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:163 #: /home/kovid/work/calibre/src/calibre/library/catalogs/epub_mobi_builder.py:307 @@ -4112,7 +4134,7 @@ msgstr[0] "" msgstr[1] "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:778 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:95 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:94 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:164 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:127 msgid "Languages" @@ -4124,7 +4146,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:782 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:183 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:89 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:88 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:150 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:305 msgid "Published" @@ -4239,53 +4261,57 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1487 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1279 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:969 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:975 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/models.py:39 msgid "Cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:491 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:508 msgid "Downloads metadata and covers from Amazon" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:501 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:518 msgid "US" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:502 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:519 msgid "France" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:503 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:520 msgid "Germany" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:504 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:521 msgid "UK" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:505 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:522 msgid "Italy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:506 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:523 msgid "Japan" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:507 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:524 msgid "Spain" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:511 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:525 +msgid "Brazil" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:529 msgid "Amazon website to use:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:512 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:530 msgid "" "Metadata from Amazon will be fetched using this country's Amazon website." msgstr "" -#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:753 +#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/sources/amazon.py:775 msgid "Amazon timed out. Try again later." msgstr "" @@ -4394,7 +4420,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/writer8/toc.py:15 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1281 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:214 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:221 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/toc.py:217 msgid "Table of Contents" msgstr "" @@ -4476,11 +4502,11 @@ msgid "HTML TOC generation options." msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:185 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:90 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:89 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:71 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources.py:160 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:176 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:778 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:794 msgid "Rating" msgstr "" @@ -4799,7 +4825,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/annotate.py:120 #: /home/kovid/work/calibre/src/calibre/gui2/actions/catalog.py:38 #: /home/kovid/work/calibre/src/calibre/gui2/actions/convert.py:107 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:175 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:228 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:75 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:192 #: /home/kovid/work/calibre/src/calibre/gui2/actions/edit_metadata.py:256 @@ -4829,32 +4855,32 @@ msgstr "" msgid "Select book files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:178 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:189 msgid "Adding" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:190 msgid "Creating book records from ISBNs" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:270 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:319 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:281 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:330 msgid "Uploading books to device." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:290 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:301 msgid "Supported books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:293 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:304 msgid "Select books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:331 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:342 msgid "Merged some books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:332 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:343 #, python-format msgid "" "The following %d duplicate books were found and incoming book formats were " @@ -4862,21 +4888,21 @@ msgid "" "settings:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:354 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:365 msgid "Failed to read metadata" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:355 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:366 msgid "Failed to read metadata from the following" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:376 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:381 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:400 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:387 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:392 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:411 msgid "Add to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:381 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:392 #: /home/kovid/work/calibre/src/calibre/gui2/actions/delete.py:137 #: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:87 #: /home/kovid/work/calibre/src/calibre/gui2/actions/store.py:106 @@ -4887,32 +4913,32 @@ msgstr "" msgid "No book selected" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:394 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:405 msgid "" "The following books are virtual and cannot be added to the calibre library:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:400 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:411 msgid "No book files found" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:406 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:417 msgid "Downloading books" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:407 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:418 msgid "Downloading books from device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:426 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:437 msgid "Could not download files from the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:429 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:440 msgid "Could not download some files from the device" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:433 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:444 msgid "Could not download files" msgstr "" @@ -5029,6 +5055,7 @@ msgid "No existing calibre library found at %s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:152 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:160 msgid "Choose Library" msgstr "" @@ -5199,7 +5226,7 @@ msgid "" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:423 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:250 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:975 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:1007 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/restore_library.py:114 @@ -5227,7 +5254,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:534 #: /home/kovid/work/calibre/src/calibre/gui2/actions/choose_library.py:539 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:225 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:278 #: /home/kovid/work/calibre/src/calibre/gui2/actions/save_to_disk.py:91 #: /home/kovid/work/calibre/src/calibre/gui2/library/views.py:1016 msgid "Not allowed" @@ -5277,7 +5304,7 @@ msgstr "" msgid "Empty output file, probably the conversion process crashed" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:84 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:86 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:401 #: /home/kovid/work/calibre/src/calibre/gui2/add.py:405 #: /home/kovid/work/calibre/src/calibre/gui2/auto_add.py:221 @@ -5285,57 +5312,83 @@ msgstr "" msgid "%(title)s by %(author)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:131 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:137 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/toolbar.py:59 +msgid "Choose library" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:138 +msgid "Library &path:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:146 +msgid "Browse for library" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:149 +msgid "&Delete after copy" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:172 msgid "Copy to library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:132 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:173 msgid "Copy selected books to the specified library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:165 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:206 msgid "(delete after copy)" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:174 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:210 +msgid "Choose library by path..." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:227 msgid "Cannot copy" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:179 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:221 +msgid "Cannot copy to current library." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:232 msgid "No library" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:180 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:233 #, python-format msgid "No library found at %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:182 -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:186 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:235 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:239 msgid "Copying" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:197 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:250 msgid "Could not copy books: " msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:201 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:254 #, python-format msgid "Copied %(num)d books to %(loc)s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:205 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:258 msgid "Auto merged" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:259 msgid "" "Some books were automatically merged into existing records in the target " "library. Click Show details to see which ones. This behavior is controlled " "by the Auto merge option in Preferences->Adding books." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:226 +#: /home/kovid/work/calibre/src/calibre/gui2/actions/copy_to_library.py:279 msgid "" "You cannot use other libraries while using the environment variable " "CALIBRE_OVERRIDE_DATABASE_PATH." @@ -5794,7 +5847,7 @@ msgid "Move to next match" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:13 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:219 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:226 msgid "F3" msgstr "" @@ -5820,7 +5873,7 @@ msgid "Shift+N" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/next_match.py:27 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:228 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:235 msgid "Shift+F3" msgstr "" @@ -5940,7 +5993,7 @@ msgid "Click the show details button to see which ones." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/actions/show_book_details.py:16 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:785 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:801 msgid "Show book details" msgstr "" @@ -6482,9 +6535,9 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:140 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:78 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_list_editor_ui.py:80 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:277 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:280 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:283 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:285 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:286 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/adding_ui.py:171 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:166 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/behavior_ui.py:167 @@ -6504,7 +6557,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:174 #: /home/kovid/work/calibre/src/calibre/gui2/store/search/search_ui.py:181 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/store_dialog_ui.py:75 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:206 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:213 msgid "..." msgstr "" @@ -6545,7 +6598,7 @@ msgid "Click to open" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:180 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:834 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:850 msgid "Ids" msgstr "" @@ -6555,7 +6608,7 @@ msgid "Book %(sidx)s of %(series)s" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/book_details.py:233 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1115 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1112 msgid "Collections" msgstr "" @@ -6666,7 +6719,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/page_setup_ui.py:124 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_output_ui.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_input_ui.py:43 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:100 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:114 #: /home/kovid/work/calibre/src/calibre/gui2/convert/pmlz_output_ui.py:46 #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:33 #: /home/kovid/work/calibre/src/calibre/gui2/convert/search_and_replace_ui.py:145 @@ -6686,7 +6739,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/preferences/conversion_ui.py:54 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/email_ui.py:65 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/look_feel_ui.py:246 -#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:118 +#: /home/kovid/work/calibre/src/calibre/gui2/preferences/metadata_sources_ui.py:125 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/misc_ui.py:74 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugboard_ui.py:113 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/plugins_ui.py:108 @@ -6824,7 +6877,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/check_library.py:342 #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/models.py:21 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/bookmarkmanager.py:90 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:258 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:260 msgid "Name" msgstr "" @@ -7794,7 +7847,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata.py:47 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:98 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:215 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:222 msgid "Metadata" msgstr "" @@ -7897,7 +7950,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:561 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1101 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1104 msgid "" "Tags categorize the book. This is particularly useful while searching. " "

    They can be any words or phrases, separated by commas." @@ -8037,48 +8090,59 @@ msgstr "" msgid "PDF Output" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:101 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:115 +msgid "" +"Note: The paper size settings below only take effect if you enable " +"the \"Override\" checkbox below. Otherwise the size from the output profile " +"will be used." +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:116 +msgid "&Override paper size set in output profile" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:117 msgid "&Paper Size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:102 -msgid "&Orientation:" -msgstr "" - -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:103 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:118 msgid "&Custom size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:104 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:119 +msgid "&Unit:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:120 msgid "Preserve &aspect ratio of cover" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:105 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:121 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:374 msgid "Se&rif family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:106 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:122 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:375 msgid "&Sans family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:107 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:123 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:376 msgid "&Monospace family:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:108 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:124 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:381 msgid "S&tandard font:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:109 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:125 msgid "Default font si&ze:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:110 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:112 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:126 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:128 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:378 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:380 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:395 @@ -8088,18 +8152,11 @@ msgstr "" msgid " px" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:111 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:127 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:379 msgid "Monospace &font size:" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/pdf_output_ui.py:113 -msgid "" -"Note: The paper size settings below only take effect if you have set " -"the output profile to the default output profile. Otherwise the output " -"profile will override these settings." -msgstr "" - #: /home/kovid/work/calibre/src/calibre/gui2/convert/pml_output.py:14 msgid "PMLZ Output" msgstr "" @@ -8335,7 +8392,7 @@ msgid "" "Add button to add it to the list of expressions." msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:184 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/single.py:187 msgid "Convert" msgstr "" @@ -8688,7 +8745,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:233 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:290 #: /home/kovid/work/calibre/src/calibre/gui2/library/delegates.py:294 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1413 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1416 msgid "Undefined" msgstr "" @@ -9166,7 +9223,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/message_box.py:141 #: /home/kovid/work/calibre/src/calibre/gui2/metadata/single_download.py:885 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/tweaks.py:344 -#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:220 +#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:227 msgid "Copy to clipboard" msgstr "" @@ -9236,6 +9293,14 @@ msgstr "" msgid "Reset author to Unknown" msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:48 +msgid "Set the series of the new books to:" +msgstr "" + +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_empty_book.py:60 +msgid "Reset series" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/add_from_isbn.py:72 msgid "Some invalid ISBNs" msgstr "" @@ -9295,7 +9360,7 @@ msgid "No help available for this output format." msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/catalog_ui.py:92 -#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:333 +#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:348 msgid "Generate catalog" msgstr "" @@ -9697,8 +9762,8 @@ msgid "Location" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/delete_matching_from_device.py:77 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:88 -#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1113 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:87 +#: /home/kovid/work/calibre/src/calibre/gui2/library/models.py:1110 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:35 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/create_custom_column.py:76 #: /home/kovid/work/calibre/src/calibre/library/field_metadata.py:365 @@ -10002,7 +10067,7 @@ msgid "Standard metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk.py:63 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:939 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:945 msgid "Custom metadata" msgstr "" @@ -10188,7 +10253,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:562 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:563 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:188 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:193 msgid "Open Tag Editor" msgstr "" @@ -10241,7 +10306,7 @@ msgid "&Force numbers to start with:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:582 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1395 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1398 msgid "&Date:" msgstr "" @@ -10263,7 +10328,7 @@ msgid "Clear published date" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:591 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1164 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1167 msgid "&Languages:" msgstr "" @@ -10333,13 +10398,13 @@ msgid "Set from &ebook file(s)" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:613 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:575 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:741 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:580 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:747 msgid "&Basic metadata" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:614 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:582 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/single.py:587 msgid "&Custom metadata" msgstr "" @@ -10887,7 +10952,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/store/config/chooser/chooser_widget_ui.py:80 #: /home/kovid/work/calibre/src/calibre/gui2/store/stores/mobileread/store_dialog_ui.py:76 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:652 -#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:282 +#: /home/kovid/work/calibre/src/calibre/library/server/browse.py:284 msgid "Search" msgstr "" @@ -11225,7 +11290,7 @@ msgid "never delete" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:230 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:273 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:279 msgid " days" msgstr "" @@ -11363,7 +11428,7 @@ msgid "&Author:" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:199 -#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1100 +#: /home/kovid/work/calibre/src/calibre/gui2/metadata/basic_widgets.py:1103 msgid "Ta&gs:" msgstr "" @@ -11810,7 +11875,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:169 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180 -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:271 msgid "Switch to Advanced mode" msgstr "" @@ -11884,39 +11949,39 @@ msgid "" "Add/Update recipe button. Continue?" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:257 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263 msgid "Add custom news source" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:258 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264 msgid "Available user recipes" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:259 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:265 msgid "Add/Update &recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:260 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 msgid "&Remove recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:261 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:267 msgid "&Share recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:262 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:268 msgid "S&how recipe files" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:263 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:269 msgid "Customize &builtin recipe" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:264 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:270 msgid "&Load recipe from file" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:266 +#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:272 msgid "" "