diff --git a/Changelog.yaml b/Changelog.yaml index bfae063910..1c855d1032 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -4,6 +4,98 @@ # for important features/bug fixes. # Also, each release can have new and improved recipes. +- version: 0.6.33 + date: 2010-01-10 + + new features: + - title: "The e-book viewer now has built-in dictionary lookup" + type: major + description: > + "You can now right click on a word to lookup its meaning in an online dictionary. + calibre uses the public domain dictionaries available at dict.org" + + - title: "RTF Output: Add support for unicode characters" + + - title: "Allow the metadata that is used to create collections when sending books to SONY readers to be customized" + description: > + "By default collections are created on the SONY reader corresponding to series and tags. Now you can add other + metadata fields, like author, or remove ones you dislike, by going to Preferences->Plugins and customizing + the device interface plugin corresponding to your device." + + - title: "TXT Input: Add option to disable insertion of Table of Contents into output text." + tickets: [4506] + + - title: "Remember state of cover and tag browsing views on restart" + + bug fixes: + - title: "EPUB Output: Add id attributes to anchors that have only name, as Adobe Digital Editions apparently can't handle only name attributes" + tickets: [4474] + + - title: "Conversion pipeline: Handle the list-style shortcut CSS property correctly" + tickets: [4418] + + - title: "EPUB Output: Fix generation of comics with PNG images for the Nook" + tickets: [4492] + + - title: "Fix bug that could prevent loading of some custom plugins" + tickets: [4414] + + - title: "News download: Handle URLs with both commas and non-ASCII characters correctly" + + - title: "Ignore invalid metadata when adding books from command line instead of erroring out" + tickets: [4496] + + - title: Fix remove header/footer assistant when converting HTML files + tickets: [4484] + + - title: "Workaround for browsers like iPhone Safari that send extra arguments when downloading books from the content server" + + - title: "Content server: Recognize the HTC HD2 as a mobile browser and add series information to the mobile version of the web page." + tickets: [4488] + + - title: "FB2 Output: Properly escape metadata before inserting it into the file" + + - title: "Don't accept rich text in the comments fields of the edit meta information dialog" + + - title: "Fix device detection for Cybook gen 3 with firmware 2.0" + + - title: "Send to device: Use default save template when driver specific one is empty or unspecified" + + - title: "Fix framework for running post-process and preprocess file type plugins" + + - title: "Linux develop/install commands: Use bindir instead of staging bindir in the launchers" + tickets: [4437] + + - title: "E-book viewer: Sanitize file names when unzipping EPUB files" + tickets: [4426] + + + new recipes: + - title: The Escapist + author: Lorenzo Vigentini + + - title: Washington Post cartoons + author: kwetal + + - title: The Dallas Morning News + author: Krittika Goyal + + - title: sg.hu + author: davotibarna + + - title: The New Zealand Herald + author: Krittika Goyal + + - title: Nature News + author: Krittika Goyal + + improved recipes: + - El Pais + - The Economist + - The New York Times + - Entrepreneur Magazine + - CNN + - version: 0.6.32 date: 2010-01-03 diff --git a/resources/recipes/nzz_ger.recipe b/resources/recipes/nzz_ger.recipe index d5b21251eb..66e22f50ef 100644 --- a/resources/recipes/nzz_ger.recipe +++ b/resources/recipes/nzz_ger.recipe @@ -1,4 +1,3 @@ -#!/usr/bin/env python __license__ = 'GPL v3' __copyright__ = '2009, Darko Miletic ' @@ -20,29 +19,25 @@ class Nzz(BasicNewsRecipe): no_stylesheets = True encoding = 'utf-8' use_embedded_content = False - lang = 'de-CH' - language = 'de' + language = 'de' - - html2lrf_options = [ - '--comment', description - , '--category', category - , '--publisher', publisher - ] - - html2epub_options = 'publisher="' + publisher + '"\ncomments="' + description + '"\ntags="' + category + '"\noverride_css=" p {text-indent: 0em; margin-top: 0em; margin-bottom: 0.5em} img {margin-top: 0em; margin-bottom: 0.4em}"' + conversion_options = { + 'comments' : description + ,'tags' : category + ,'language' : language + ,'publisher' : publisher + } keep_only_tags = [dict(name='div', attrs={'class':'article'})] remove_tags = [ - dict(name=['object','link','base','script']) + dict(name=['object','link','base']) ,dict(name='div',attrs={'class':['more','teaser','advXertXoriXals','legal']}) ,dict(name='div',attrs={'id':['popup-src','readercomments','google-ad','advXertXoriXals']}) ] feeds = [ - (u'Neuste Artikel', u'http://www.nzz.ch/feeds/recent/' ) - ,(u'International' , u'http://www.nzz.ch/nachrichten/international?rss=true') + (u'International' , u'http://www.nzz.ch/nachrichten/international?rss=true') ,(u'Schweiz' , u'http://www.nzz.ch/nachrichten/schweiz?rss=true') ,(u'Wirtschaft' , u'http://www.nzz.ch/nachrichten/wirtschaft/aktuell?rss=true') ,(u'Finanzmaerkte' , u'http://www.nzz.ch/finanzen/nachrichten?rss=true') @@ -55,13 +50,7 @@ class Nzz(BasicNewsRecipe): ,(u'Reisen' , u'http://www.nzz.ch/magazin/reisen?rss=true') ] - def preprocess_html(self, soup): - soup.html['xml:lang'] = self.lang - soup.html['lang'] = self.lang - mtag = '' - soup.head.insert(0,mtag) - return soup - def print_version(self, url): return url + '?printview=true' + diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot index 16a94e7eeb..02ff48fec9 100644 --- a/src/calibre/translations/calibre.pot +++ b/src/calibre/translations/calibre.pot @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: calibre 0.6.32\n" -"POT-Creation-Date: 2010-01-09 10:18+MST\n" -"PO-Revision-Date: 2010-01-09 10:18+MST\n" +"Project-Id-Version: calibre 0.6.33\n" +"POT-Creation-Date: 2010-01-10 16:40+MST\n" +"PO-Revision-Date: 2010-01-10 16:40+MST\n" "Last-Translator: Automatically generated\n" "Language-Team: LANGUAGE\n" "MIME-Version: 1.0\n" @@ -123,11 +123,11 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/library/database.py:913 #: /home/kovid/work/calibre/src/calibre/library/database2.py:703 #: /home/kovid/work/calibre/src/calibre/library/database2.py:715 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1135 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1172 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1509 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1511 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1622 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1143 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1180 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1517 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1519 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1630 #: /home/kovid/work/calibre/src/calibre/library/server.py:645 #: /home/kovid/work/calibre/src/calibre/library/server.py:717 #: /home/kovid/work/calibre/src/calibre/library/server.py:764 @@ -585,7 +585,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1068 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1072 -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1409 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1417 msgid "News" msgstr "" @@ -1955,6 +1955,10 @@ msgstr "" msgid "Run the text input through the markdown pre-processor. To learn more about markdown see" msgstr "" +#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35 +msgid "Do not insert a Table of Contents into the output text." +msgstr "" + #: /home/kovid/work/calibre/src/calibre/ebooks/txt/output.py:24 msgid "Type of newline to use. Options are %s. Default is 'system'. Use 'old_mac' for compatibility with Mac OS 9 and earlier. For Mac OS X use 'unix'. 'system' will default to the newline type used by this OS." msgstr "" @@ -2203,7 +2207,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/rb_output_ui.py:28 #: /home/kovid/work/calibre/src/calibre/gui2/convert/structure_detection_ui.py:59 #: /home/kovid/work/calibre/src/calibre/gui2/convert/toc_ui.py:62 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:38 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:45 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xexp_edit_ui.py:49 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67 @@ -2752,12 +2756,12 @@ msgid "PDB Input" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:32 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:39 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:43 msgid "Treat each &line as a paragraph" msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/convert/pdb_input_ui.py:33 -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:42 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:44 msgid "Assume print formatting" msgstr "" @@ -2975,14 +2979,18 @@ msgstr "" msgid "TXT Input" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:40 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:45 msgid "Process using markdown" msgstr "" -#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:41 +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:46 msgid "

Markdown is a simple markup language for text files, that allows for advanced formatting. To learn more visit markdown." msgstr "" +#: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_input_ui.py:47 +msgid "Do not insert Table of Contents into output text when using markdown" +msgstr "" + #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16 msgid "TXT Output" msgstr "" @@ -6639,27 +6647,27 @@ msgid "" "For help on an individual command: %%prog command --help\n" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1648 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656 msgid "

Migrating old database to ebook library in %s

" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1677 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685 msgid "Copying %s" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702 msgid "Compacting database" msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1787 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795 msgid "Checking SQL integrity..." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1824 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832 msgid "Checking for missing files." msgstr "" -#: /home/kovid/work/calibre/src/calibre/library/database2.py:1846 +#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854 msgid "Checked id" msgstr ""