Sync to trunk.

2025-07-07 10:14:46 -04:00 · 2010-01-16 09:47:51 -05:00 · 2010-01-16 09:47:51 -05:00 · c0f9468240
commit c0f9468240
parent 00d9520e7a 9e30796443
53 changed files with 5141 additions and 3896 deletions
--- a/Changelog.yaml
+++ b/Changelog.yaml
@ -4,6 +4,84 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.

+- version: 0.6.34
+  date: 2010-01-15
+
+  new features:
+    - title: Prelimiary driver for The Google Nexus One smartphone. 
+
+    - title: Implement copy/paste of covers in the edit meta information dialog via a right click menu
+      tickets: [4564]
+
+    - title: "Autofit covers in available space when viewing book details (can be turned off)"
+      tickets: [4536]
+
+    - title: "Tips for recipe writers added to the wiki at http://bugs.calibre-ebook.com/wiki/RecipeTips"
+
+  bug fixes:
+    - title: "Switch to non WMI based method of detecting devices on windows"
+      type: major
+      desc: >
+        "Previously, on windows, calibre used something called Windows Management Instrumentation (WMI) to
+        query the operating system for connected devices. Unfortunately, WMI seems to be broken ona  number
+        of windows installs. calibre now uses the windows API to directly query the operating system for this 
+        information. This should fix device detection on most remaining systems."
+
+    - title: "Conversion pipeline: Automatically change case of upper cased CSS tag selectors to lower case, so that they match"
+
+    - title: "Fix regression taht broke using the Add bokos button to add books directly to a connected device"
+
+    - title: "EPUB Output: Remove <img> tags with empty src attributes as older versions of ADE choke on them"
+
+    - title: "When creating paths on the hard disk/device replace a trailing period in a path component as windows silently discards them, causing various bugs"
+      tickets: [4570]
+
+    - title: "Linux systray notifications: Ignore DBUS errors when sending notifications"
+
+    - title: "PRS Drivers: Don't error out if user sets collection generating metadata to None"
+
+    - title: "LRF Input: Handle malformed CharButtons"
+      tickets: [4552]
+
+    - title: "Cybook Driver: Remove aux files created for epubs."
+
+    - title: "When using Save to disk/Send to device templates, ignore index and attribute errors if the user incorrectly uses advanced formatting"
+
+    - title: "Linux install: remove broken symlinks when installing launchers, instead of erroring out"
+
+    - title: "Fix detection of CyBook Gen 3 with firmware 2 on OS X"
+      tickets: [4521]
+
+  new recipes:
+    - title: MSNBC
+      author: Darko Miletic 
+
+    - title: Norte Castilla
+      author: Lorenzo Vigentini
+
+    - title: El Universal (Venezuela)
+      author: Darko Miletic
+
+    - title: Think Progress
+      author: Xanthan Gum
+
+    - title: News and Observer
+      author: Krittika Goyal
+
+    - title: The Force
+      author: Krittika Goyal
+
+    - title: "l'Espresso, Quotidiano, La Gazzeta dello Sport and Panorama"
+      author: Lorenzo Vigentini
+
+  improved recipes:
+    - WSJ
+    - Globe and Mail
+    - New England Journal of Medicine
+    - New York Times
+    - Christian Science Monitor
+ 
+
 - version: 0.6.33
  date: 2010-01-10

@ -27,7 +105,10 @@

    - title: "Remember state of cover and tag browsing views on restart"

+    - title: "Support using Delte key to delete formats in edit meta information dialog"
+
  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]

--- a/resources/images/msnbc.png
+++ b/resources/images/msnbc.png
--- a/resources/recipes/corren2.recipe
+++ b/resources/recipes/corren2.recipe
@ -2,8 +2,9 @@ from calibre.web.feeds.news import BasicNewsRecipe

 class AdvancedUserRecipe1255797795(BasicNewsRecipe):
    title          = u'Corren'
+    language = 'sv'
    __author__ = 'Jonas Svensson'
-    simultaneous_downloads = 1 
+    simultaneous_downloads = 1
    no_stylesheets = True
    oldest_article = 7
    max_articles_per_feed = 100
@ -35,4 +36,4 @@ class AdvancedUserRecipe1255797795(BasicNewsRecipe):
        url = url.replace("ostergotland/mjolby/artikel.aspx", "Print.aspx")
        url = url.replace("ostergotland/motala/artikel.aspx", "Print.aspx")
        return url.replace("nyheter/artikel.aspx", "Print.aspx")
- 
+
--- a/resources/recipes/dominion.recipe
+++ b/resources/recipes/dominion.recipe
@ -0,0 +1,50 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+
+class stuffconz(BasicNewsRecipe):
+    title          = u'stuff.co.nz'
+    language       = 'en_NZ'
+    __author__     = 'Krittika Goyal'
+    oldest_article = 1 #days
+    max_articles_per_feed = 25
+    #encoding = 'latin1'
+
+    remove_stylesheets = True
+    #remove_tags_before = dict(name='h1', attrs={'class':'heading'})
+    remove_tags_after  = dict(name='div', attrs={'id':'related_box'})
+    remove_tags = [
+       dict(name='iframe'),
+       dict(name='div', attrs={'class':['story_feature_title']}),
+       dict(name='div', attrs={'id':['toolbox', 'related_box', 'adSTORYBODY']}),
+       dict(name='span', attrs={'class':['related_link', 'slideshowcontrols']}),
+       #dict(name='ul', attrs={'class':'articleTools'}),
+    ]
+
+    feeds          = [
+('Dominion Post',
+ 'http://www.stuff.co.nz/rss/dominion-post'),
+('National',
+ 'http://www.stuff.co.nz/rss/national'),
+('World',
+ 'http://www.stuff.co.nz/rss/world'),
+('Business',
+ 'http://www.stuff.co.nz/rss/business'),
+('Technology',
+ 'http://www.stuff.co.nz/rss/technology'),
+('Sport',
+ 'http://www.stuff.co.nz/rss/sport'),
+('Entertainment',
+ 'http://www.stuff.co.nz/rss/entertainment'),
+('Life and Style',
+ 'http://www.stuff.co.nz/rss/life-style'),
+
+]
+
+    def preprocess_html(self, soup):
+        story = soup.find(name='div', attrs={'id':'left_col'})
+        #td = heading.findParent(name='td')
+        #td.extract()
+        soup = BeautifulSoup('<html><head><title>t</title></head><body></body></html>')
+        body = soup.find(name='body')
+        body.insert(0, story)
+        return soup
--- a/resources/recipes/globe_and_mail.recipe
+++ b/resources/recipes/globe_and_mail.recipe
@ -29,7 +29,8 @@ class GlobeAndMail(BasicNewsRecipe):
    remove_tags_before = dict(id="article-top")
    remove_tags = [
 		{'id':['util', 'article-tabs', 'comments', 'article-relations',
-		'gallery-controls', 'video', 'galleryLoading','deck','header'] },
+		'gallery-controls', 'video', 'galleryLoading','deck','header',
+        'toolsBottom'] },
 		{'class':['credit','inline-img-caption','tab-pointer'] },
 		dict(name='div', attrs={'id':'lead-photo'}),
 		dict(name='div', attrs={'class':'right'}),
@ -43,7 +44,7 @@ class GlobeAndMail(BasicNewsRecipe):
 		dict(name='div', attrs={'id':'blog-header'}),
 		dict(name='div', attrs={'id':'right-rail'}),
 		dict(name='div', attrs={'id':'group-footer-container'}),
-		dict(name=['iframe','img'])
+		dict(name=['iframe'])
 		]
    remove_tags_after = [{'id':['article-content']},
 		{'class':['pull','inline-img'] },
@ -68,3 +69,8 @@ class GlobeAndMail(BasicNewsRecipe):
            (u'Auto', u'http://www.theglobeandmail.com/auto/?service=rss')
            ]

+    def get_article_url(self, article):
+        url = BasicNewsRecipe.get_article_url(self, article)
+        if '/video/' not in url:
+            return url
+
--- a/resources/recipes/houston_chronicle.recipe
+++ b/resources/recipes/houston_chronicle.recipe
@ -5,7 +5,7 @@ class HoustonChronicle(BasicNewsRecipe):
    title          = u'The Houston Chronicle'
    description    = 'News from Houston, Texas'
    __author__	   = 'Kovid Goyal'
-    language       = 'US'
+    language       = 'en'
    timefmt        = ' [%a, %d %b, %Y]'
    no_stylesheets = True

--- a/resources/recipes/le_temps.recipe
+++ b/resources/recipes/le_temps.recipe
@ -20,7 +20,7 @@ class LeTemps(BasicNewsRecipe):
     recursions = 1
     encoding = 'UTF-8'
     match_regexps = [r'http://www.letemps.ch/Page/Uuid/[-0-9a-f]+\|[1-9]']
-     lang = 'fr'
+     language = 'fr'

     keep_only_tags = [dict(name='div', attrs={'id':'content'}),
                        dict(name='div', attrs={'class':'story'})
--- a/resources/recipes/msnbc.recipe
+++ b/resources/recipes/msnbc.recipe
@ -0,0 +1,58 @@
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+msnbc.msn.com
+'''
+
+import re
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class MsNBC(BasicNewsRecipe):
+    title                  = 'msnbc.com'
+    __author__             = 'Darko Miletic'
+    description            = 'A Fuller Spectrum of News'
+    oldest_article         = 2
+    max_articles_per_feed  = 100
+    no_stylesheets         = True
+    use_embedded_content   = False
+    encoding               = 'utf8'
+    publisher              = 'msnbc.com'
+    category               = 'news, USA, world'
+    language               = 'en'
+    extra_css              = ' body{ font-family: sans-serif } .head{font-family: serif; font-size: xx-large; font-weight: bold; color: #CC0000} .abstract{font-weight: bold} .source{font-size: small} .updateTime{font-size: small} '
+
+    conversion_options = {
+                             'comments' : description
+                            ,'tags'     : category
+                            ,'language' : language
+                            ,'publisher': publisher
+                         }
+
+    preprocess_regexps = [
+        (re.compile(r'</style></head>', re.DOTALL|re.IGNORECASE),lambda match: '</style>')
+       ,(re.compile(r'<div class="head">', re.DOTALL|re.IGNORECASE),lambda match: '</head><body><div class="head">'),
+    ]
+
+    remove_tags_before = dict(name='div', attrs={'class':'head'})
+    remove_tags_after = dict(name='div', attrs={'class':'copyright'})
+    remove_tags      = [dict(name=['iframe','object','link','script','form'])]
+
+    feeds = [
+               (u'US News'       , u'http://rss.msnbc.msn.com/id/3032524/device/rss/rss.xml'      )
+              ,(u'World News'    , u'http://rss.msnbc.msn.com/id/3032506/device/rss/rss.xml'      )
+              ,(u'Politics'      , u'http://rss.msnbc.msn.com/id/3032552/device/rss/rss.xml'      )
+              ,(u'Business'      , u'http://rss.msnbc.msn.com/id/3032071/device/rss/rss.xml'      )
+              ,(u'Sports'        , u'http://rss.nbcsports.msnbc.com/id/3032112/device/rss/rss.xml')
+              ,(u'Entertainment' , u'http://rss.msnbc.msn.com/id/3032083/device/rss/rss.xml'      )
+              ,(u'Health'        , u'http://rss.msnbc.msn.com/id/3088327/device/rss/rss.xml'      )
+              ,(u'Tech & Science', u'http://rss.msnbc.msn.com/id/3032117/device/rss/rss.xml'      )
+            ]
+
+    def print_version(self, url):
+        return url + 'print/1/displaymode/1098/'
+
+    def preprocess_html(self, soup):
+        for item in soup.head.findAll('div'):
+            item.extract()
+        return soup
+
--- a/resources/recipes/national_post.recipe
+++ b/resources/recipes/national_post.recipe
@ -8,6 +8,7 @@ class NYTimes(BasicNewsRecipe):
    description = 'Canadian national newspaper'
    timefmt = ' [%d %b, %Y]'
    needs_subscription = False
+    language = 'en_CA'

    no_stylesheets = True
    #remove_tags_before = dict(name='h1', attrs={'class':'heading'})
--- a/resources/recipes/nejm.recipe
+++ b/resources/recipes/nejm.recipe
@ -8,6 +8,7 @@ class NYTimes(BasicNewsRecipe):
    description = 'Medical news'
    timefmt = ' [%d %b, %Y]'
    needs_subscription = True
+    language = 'en'

    no_stylesheets = True
    remove_tags_before = dict(name='div', attrs={'align':'center'})
--- a/resources/recipes/nortecastilla.recipe
+++ b/resources/recipes/nortecastilla.recipe
@ -0,0 +1,83 @@
+#!/usr/bin/env  python
+__license__    = 'GPL v3'
+__author__     = 'Lorenzo Vigentini'
+__copyright__   = '2009, Lorenzo Vigentini <l.vigentini at gmail.com>'
+__description__ = 'Daily newspaper from Spain'
+__version__     = 'v1.01'
+__date__        = '14, January 2010'
+
+'''
+http://www.nortecastilla.es/
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class norteCastilla(BasicNewsRecipe):
+    author        = 'Lorenzo Vigentini'
+    description   = 'Daily newspaper from Spain'
+
+    cover_url      = 'http://www.nortecastilla.es/img/rd.logo_nortecastilla.png'
+    title          = u'NorteCastilla '
+    publisher      = 'Vocento'
+    category       = 'News, politics, culture, economy, general interest'
+
+    language       = 'es'
+    timefmt        = '[%a, %d %b, %Y]'
+
+    oldest_article = 1
+    max_articles_per_feed = 25
+
+    use_embedded_content  = False
+    recursion             = 10
+
+    remove_javascript = True
+    no_stylesheets = True
+
+    keep_only_tags = [
+                        dict(name='div', attrs={'class':['articulo','photo']})
+                    ]
+
+    remove_tags    = [
+                        dict(name='div', attrs={'class':['contenido_form_articulo','colC_articulo','publiEspecial']}),
+                        dict(name='div', attrs={'class':['tags_relacionados','form_art form_opina','adds','comentarios']}),
+                        dict(name='span', attrs={'class':'contenido_form_articulo'}),
+                        dict(name='div', attrs={'id':'publi1_noxtrum'}),
+                        dict(name='a', attrs={'class':['nav_fgH_ant','nav_fgH_sig']})
+                    ]
+
+    feeds          = [
+                        (u'Ultima hora', u'http://www.nortecastilla.es/rss/feeds/ultima.xml'),
+                        (u'Portada', u'http://www.nortecastilla.es/portada.xml'),
+                        (u'Espana', u'http://www.nortecastilla.es/img/rss_descarga.gif'),
+                        (u'Mundo', u'http://www.nortecastilla.es/rss/feeds/mundo.xml'),
+                        (u'Economia', u'http://www.nortecastilla.es/rss/feeds/economia.xml'),
+                        (u'Deportes', u'http://www.nortecastilla.es/rss/feeds/deportes.xml'),
+                        (u'Vida y ocio', u'http://www.nortecastilla.es/rss/feeds/ocio.xml'),
+                        (u'Cultura', u'http://www.nortecastilla.es/rss/feeds/cultura.xml'),
+                        (u'Television', u'http://www.nortecastilla.es/rss/feeds/television.xml'),
+                        (u'Contraportada', u'http://www.nortecastilla.es/rss/feeds/contraportada.xml')
+                    ]
+
+
+    extra_css = '''
+                    .articulo{clear:both; padding:0 2px 0 6px}
+                    .art_head{clear:both;}
+                    .articulo .overhead{ color:#C00; font-size:10px; text-transform:uppercase;}
+                    .articulo .headline{ color:#036; font-size:36px; font-weight:normal;}
+                    .articulo .headline a,.articulo .headline a:hover{ color:#036; cursor:default; text-decoration:none;}
+                    .articulo .subhead{ color:#686868; font-size:16px; font-weight:normal; margin:0 0 5px 0}
+                    .articulo .date,.articulo .byline,.articulo .author,.articulo .name,.articulo .description{ display:inline; font-size:11px; color:#8E8E8E; font-weight:bold;}
+                    .articulo .byline a{ color:#8E8E8E;}
+                    .articulo .barhead{ font-size:14px;font-weight:normal; padding:0 0 15px 0}
+                    .articulo .text{ font-size:14px;font-weight:normal;}
+                    .articulo .text .p{ line-height:18px; padding:0 0 15px 0}
+                    .articulo .text .p a{ text-decoration:underline; color:#036}
+                    .articulo .text .p a:hover{ text-decoration:none; color:#cc0000}
+                    .articulo .pbox{text-align:left; margin:0 auto 0 10px; text-align:left;}
+                    .articulo .photo-alt1,.colC_articulo .photo{text-align:center; margin:0 auto; background-color:#F2F2F2;}
+                    .articulo .photo-alt1 img,.colC_articulo .photo img{text-align:center; margin:0 auto;}
+                    .articulo .photo-caption{ position:relative; z-index:5; display:block; background-color:#F2F2F2; font-size:11px; color:#666; padding:2px 5px; text-align:left;}
+                    .articulo .photo-caption a{ color:#666;}
+                    .fotogaleriasH .photo {background-color:#DCDCDC;margin:0 auto;padding:5px 0 0;text-align:center;}
+                    .fotogaleriasH .photo img {display: block; margin:0 auto;text-align:center;}
+                '''
--- a/resources/recipes/nzherald.recipe
+++ b/resources/recipes/nzherald.recipe
@ -6,6 +6,7 @@ class NewZealandHerald(BasicNewsRecipe):
    __author__  = 'Krittika Goyal'
    description = 'Daily news'
    timefmt = ' [%d %b, %Y]'
+    language = 'en_NZ'

    no_stylesheets = True
    remove_tags_before = dict(name='div', attrs={'class':'contentContainer left eight'})
--- a/resources/recipes/welt.recipe
+++ b/resources/recipes/welt.recipe
@ -12,6 +12,7 @@ class weltDe(BasicNewsRecipe):

    title = 'Weltonline'
    description = 'german newspaper'
+    language = 'de'
    __author__ = 'Oliver Niesner'
    use_embedded_content   = False
    timefmt = ' [%d %b %Y]'
--- a/resources/recipes/wsj.recipe
+++ b/resources/recipes/wsj.recipe
@ -16,7 +16,7 @@ class WallStreetJournal(BasicNewsRecipe):
        needs_subscription = True
        language = 'en'

-        max_articles_per_feed = 25
+        max_articles_per_feed = 1000
        timefmt  = ' [%a, %b %d, %Y]'
        no_stylesheets = True

--- a/resources/recipes/zeitde.recipe
+++ b/resources/recipes/zeitde.recipe
@ -42,7 +42,7 @@ class ZeitDe(BasicNewsRecipe):
                .headline iconportrait_inline{font-family:Arial,Helvetica,sans-serif;font-size:x-small}
                '''
    #filter_regexps = [r'ad.de.doubleclick.net/']
-    
+
    keep_only_tags = [
                        dict(name='div', attrs={'class':["article"]}) ,
                         ]
@ -52,32 +52,32 @@ class ZeitDe(BasicNewsRecipe):
                     dict(name='div', attrs={'id':["place_5","place_4"]})
                  ]

-    
+

    def get_article_url(self, article):
-         
+
        ans = article.get('guid',None)
-        
+
        try:
            self.log('Looking for full story link in', ans)
            soup = self.index_to_soup(ans)
            x = soup.find(text="Auf einer Seite lesen")
-            
+
            if x is not None:
-                
+
                a = x.parent
                if a and a.has_key('href'):
                    ans = a['href']
                    self.log('Found full story link', ans)
        except:
            pass
-        
+
        if 'video' in ans or 'quiz' in ans :

              ans = None
        return ans
-         
-    
+
+

    def preprocess_html(self, soup):
        soup.html['xml:lang'] = self.lang
@ -87,7 +87,7 @@ class ZeitDe(BasicNewsRecipe):

        return soup

-   
+
    #def print_version(self,url):
    #    return url.replace('http://www.zeit.de/', 'http://images.zeit.de/text/').replace('?from=rss', '')

--- a/src/calibre/init.py
+++ b/src/calibre/init.py
@ -92,6 +92,9 @@ def sanitize_file_name(name, substitute='_', as_unicode=False):
    if as_unicode:
        one = one.decode(filesystem_encoding)
    one = one.replace('..', substitute)
+    # Windows doesn't like path components that end with a period
+    if one.endswith('.'):
+        one = one[:-1]+'_'
    return one


@ -448,6 +451,8 @@ if isosx:
        traceback.print_exc()

 def ipython(user_ns=None):
+    old_argv = sys.argv
+    sys.argv = ['ipython']
    if user_ns is None:
        user_ns = locals()
    from calibre.utils.config import config_dir
@ -511,5 +516,6 @@ main()
    from IPython.Shell import IPShellEmbed
    ipshell = IPShellEmbed(user_ns=user_ns)
    ipshell()
+    sys.argv = old_argv


--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.33'
+__version__   = '0.6.34'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"

 import re
--- a/src/calibre/customize/init.py
+++ b/src/calibre/customize/init.py
@ -249,7 +249,7 @@ class CatalogPlugin(Plugin):

    cli_options = []

-    def search_sort_db_as_dict(self, db, opts):
+    def search_sort_db(self, db, opts):
        if opts.search_text:
            db.search(opts.search_text)
        if opts.sort_by:
--- a/src/calibre/customize/ui.py
+++ b/src/calibre/customize/ui.py
@ -354,21 +354,19 @@ def catalog_plugins():
    for plugin in _initialized_plugins:
        if isinstance(plugin, CatalogPlugin):
            yield plugin
-            
+
 def available_catalog_formats():
    formats = set([])
    for plugin in catalog_plugins():
        if not is_disabled(plugin):
            for format in plugin.file_types:
                formats.add(format)
-    return formats    
+    return formats

 def plugin_for_catalog_format(fmt):
    for plugin in catalog_plugins():
        if fmt.lower() in plugin.file_types:
            return plugin
-    else:
-        return None

 def device_plugins():
    for plugin in _initialized_plugins:
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@ -20,6 +20,7 @@ class ANDROID(USBMS):
    VENDOR_ID   = {
            0x0bb4 : { 0x0c02 : [0x100], 0x0c01 : [0x100]},
            0x22b8 : { 0x41d9 : [0x216]},
+            0x18d1 : { 0x4e11 : [0x0100]},
            }
    EBOOK_DIR_MAIN = ['wordplayer/calibretransfer', 'eBooks/import', 'Books']
    EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to '
@ -27,8 +28,8 @@ class ANDROID(USBMS):
            'be used')
    EXTRA_CUSTOMIZATION_DEFAULT = ', '.join(EBOOK_DIR_MAIN)

-    VENDOR_NAME      = ['HTC', 'MOTOROLA']
-    WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855']
+    VENDOR_NAME      = ['HTC', 'MOTOROLA', 'GOOGLE_']
+    WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'INC.NEXUS_ONE']

    OSX_MAIN_MEM = 'HTC Android Phone Media'

--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@ -60,7 +60,8 @@ class DevicePlugin(Plugin):
            import traceback
            traceback.print_exc()

-    def is_usb_connected_windows(self, devices_on_system, debug=False):
+    def is_usb_connected_windows(self, devices_on_system, debug=False,
+            only_presence=False):

        def id_iterator():
            if hasattr(self.VENDOR_ID, 'keys'):
@ -85,7 +86,7 @@ class DevicePlugin(Plugin):
                   self.test_bcd_windows(device_id, bcd):
                       if debug:
                           self.print_usb_device_info(device_id)
-                       if self.can_handle_windows(device_id, debug=debug):
+                       if only_presence or self.can_handle_windows(device_id, debug=debug):
                           return True
        return False

@ -97,7 +98,8 @@ class DevicePlugin(Plugin):
                return True
        return False

-    def is_usb_connected(self, devices_on_system, debug=False):
+    def is_usb_connected(self, devices_on_system, debug=False,
+            only_presence=False):
        '''
        Return True, device_info if a device handled by this plugin is currently connected.

@ -105,7 +107,7 @@ class DevicePlugin(Plugin):
        '''
        if iswindows:
            return self.is_usb_connected_windows(devices_on_system,
-                    debug=debug), None
+                    debug=debug, only_presence=only_presence), None

        vendors_on_system = set([x[0] for x in devices_on_system])
        vendors = self.VENDOR_ID if hasattr(self.VENDOR_ID, '__len__') else [self.VENDOR_ID]
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@ -36,8 +36,8 @@ class PRS505(CLI, Device):

    VENDOR_NAME        = 'SONY'
    WINDOWS_MAIN_MEM   = re.compile('PRS-(505|300|500)')
-    WINDOWS_CARD_A_MEM = re.compile(r'PRS-(505|500)/\S+:MS')
-    WINDOWS_CARD_B_MEM = re.compile(r'PRS-(505|500)/\S+:SD')
+    WINDOWS_CARD_A_MEM = re.compile(r'PRS-(505|500)[#/]\S+:MS')
+    WINDOWS_CARD_B_MEM = re.compile(r'PRS-(505|500)[#/]\S+:SD')

    OSX_MAIN_MEM   = re.compile(r'Sony PRS-(((505|300|500)/[^:]+)|(300)) Media')
    OSX_CARD_A_MEM = re.compile(r'Sony PRS-(505|500)/[^:]+:MS Media')
@ -165,7 +165,8 @@ class PRS505(CLI, Device):
                name = name[1:]

            opts = self.settings()
-            booklists[blist].add_book(info, name, opts.extra_customization.split(','), *location[1:-1])
+            collections = opts.extra_customization.split(',') if opts.extra_customization else []
+            booklists[blist].add_book(info, name, collections, *location[1:-1])
        fix_ids(*booklists)

    def delete_books(self, paths, end_session=True):
@ -218,9 +219,9 @@ class PRS700(PRS505):

    BCD          = [0x31a]

-    WINDOWS_MAIN_MEM = re.compile('PRS-((700/)|((6|9)00&))')
-    WINDOWS_CARD_A_MEM = re.compile(r'PRS-((700/\S+:)|((6|9)00_))MS')
-    WINDOWS_CARD_B_MEM = re.compile(r'PRS-((700/\S+:)|((6|9)00_))SD')
+    WINDOWS_MAIN_MEM = re.compile('PRS-((700[#/])|((6|9)00&))')
+    WINDOWS_CARD_A_MEM = re.compile(r'PRS-((700[/#]\S+:)|((6|9)00[#_]))MS')
+    WINDOWS_CARD_B_MEM = re.compile(r'PRS-((700[/#]\S+:)|((6|9)00[#_]))SD')

    OSX_MAIN_MEM   = re.compile(r'Sony PRS-((700/[^:]+)|((6|9)00)) Media')
    OSX_CARD_A_MEM = re.compile(r'Sony PRS-((700/[^:]+:)|((6|9)00 ))MS Media')
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@ -139,8 +139,11 @@ class DeviceScanner(object):
        '''Fetch list of connected USB devices from operating system'''
        self.devices = self.scanner()

-    def is_device_connected(self, device, debug=False):
-        return device.is_usb_connected(self.devices, debug=debug)
+    def is_device_connected(self, device, debug=False, only_presence=False):
+        ''' If only_presence is True don't perform any expensive checks (used
+        only in windows)'''
+        return device.is_usb_connected(self.devices, debug=debug,
+                only_presence=only_presence)


 def main(args=sys.argv):
--- a/src/calibre/ebooks/epub/output.py
+++ b/src/calibre/ebooks/epub/output.py
@ -264,13 +264,21 @@ class EPUBOutput(OutputFormatPlugin):
            if body:
                body = body[0]

-            # Add id attribute to <a> tags that have name
-            for x in XPath('//h:a[@name]')(body):
-                if not x.get('id', False):
-                    x.set('id', x.get('name'))
-
-            # Replace <br> that are children of <body> as ADE doesn't handle them
            if hasattr(body, 'xpath'):
+                # remove <img> tags with empty src elements
+                bad = []
+                for x in XPath('//h:img')(body):
+                    if not x.get('src', '').strip():
+                        bad.append(x)
+                for img in bad:
+                    img.getparent().remove(img)
+
+                # Add id attribute to <a> tags that have name
+                for x in XPath('//h:a[@name]')(body):
+                    if not x.get('id', False):
+                        x.set('id', x.get('name'))
+
+                # Replace <br> that are children of <body> as ADE doesn't handle them
                for br in XPath('./h:br')(body):
                    if br.getparent() is None:
                        continue
--- a/src/calibre/gui2/add.py
+++ b/src/calibre/gui2/add.py
@ -145,10 +145,7 @@ class DBAdder(Thread):
        else:
            self.names.append(name)
            self.paths.append(formats[0])
-            self.infos.append({'title':mi.title,
-                           'authors':', '.join(mi.authors),
-                           'cover':None,
-                           'tags':mi.tags if mi.tags else []})
+            self.infos.append(mi)
        return mi.title

    def add_formats(self, id, formats):
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@ -134,7 +134,8 @@ class DeviceManager(Thread):
        self.scanner.scan()
        if self.is_device_connected:
            connected, detected_device = \
-                self.scanner.is_device_connected(self.connected_device)
+                self.scanner.is_device_connected(self.connected_device,
+                        only_presence=True)
            if not connected:
                self.connected_device_removed()
        else:
--- a/src/calibre/gui2/dialogs/book_info.py
+++ b/src/calibre/gui2/dialogs/book_info.py
@ -29,7 +29,7 @@ class BookInfo(QDialog, Ui_BookInfo):
        self.view = view
        self.current_row = None
        self.fit_cover.setChecked(dynamic.get('book_info_dialog_fit_cover',
-            False))
+            True))
        self.refresh(row)
        self.connect(self.view.selectionModel(), SIGNAL('currentChanged(QModelIndex,QModelIndex)'), self.slave)
        self.connect(self.next_button, SIGNAL('clicked()'), self.next)
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@ -430,9 +430,9 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
        self.authors.setText(title)
        self.author_sort.setText('')

-    def cover_dropped(self, paths):
+    def cover_dropped(self, cover_data):
        self.cover_changed = True
-        self.cover_data = self.cover.cover_data
+        self.cover_data = cover_data

    def initialize_combos(self):
        self.initalize_authors()
--- a/src/calibre/gui2/notify.py
+++ b/src/calibre/gui2/notify.py
@ -50,9 +50,13 @@ class KDENotifier(DBUSNotifier):
            replaces_id = self.dbus.UInt32()
        event_id = ''
        timeout, body, summary = self.get_msg_parms(timeout, body, summary)
-        self._notify.Notify('calibre', replaces_id, event_id, self.ICON, summary, body,
+        try:
+            self._notify.Notify('calibre', replaces_id, event_id, self.ICON, summary, body,
                self.dbus.Array(signature='s'), self.dbus.Dictionary(signature='sv'),
                timeout)
+        except:
+            import traceback
+            traceback.print_exc()

 class FDONotifier(DBUSNotifier):

@ -64,9 +68,13 @@ class FDONotifier(DBUSNotifier):
        if replaces_id is None:
            replaces_id = self.dbus.UInt32()
        timeout, body, summary = self.get_msg_parms(timeout, body, summary)
-        self._notify.Notify('calibre', replaces_id, self.ICON, summary, body,
+        try:
+            self._notify.Notify('calibre', replaces_id, self.ICON, summary, body,
                self.dbus.Array(signature='s'), self.dbus.Dictionary(signature='sv'),
                timeout)
+        except:
+            import traceback
+            traceback.print_exc()

 class QtNotifier(Notifier):

--- a/src/calibre/gui2/ui.py
+++ b/src/calibre/gui2/ui.py
@ -1769,7 +1769,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                      '<a href="%s">DRM</a>ed book. You must first remove the '
                      'DRM using third party tools.')%\
                        (job.description.split(':')[-1],
-                            'http://wiki.mobileread.com/wiki/DRM'))
+                            'http://bugs.calibre-ebook.com/wiki/DRM'))
                d.setModal(False)
                d.show()
                self._modeless_dialogs.append(d)
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@ -14,7 +14,7 @@ from PyQt4.Qt import QListView, QIcon, QFont, QLabel, QListWidget, \
                        QMenu, QStringListModel, QCompleter, QStringList

 from calibre.gui2 import human_readable, NONE, TableView, \
-                         qstring_to_unicode, error_dialog
+                         qstring_to_unicode, error_dialog, pixmap_to_data
 from calibre.gui2.dialogs.job_view_ui import Ui_Dialog
 from calibre.gui2.filename_pattern_ui import Ui_Form
 from calibre import fit_image
@ -178,8 +178,8 @@ class ImageView(QLabel):
            if not pmap.isNull():
                self.setPixmap(pmap)
                event.accept()
-                self.cover_data = open(path, 'rb').read()
-                self.emit(SIGNAL('cover_changed(PyQt_PyObject)'), paths)
+                self.emit(SIGNAL('cover_changed(PyQt_PyObject)'), open(path,
+                    'rb').read())
                break

    def dragMoveEvent(self, event):
@ -191,6 +191,29 @@ class ImageView(QLabel):
        self.setMaximumWidth(width)
        self.setMaximumHeight(height)

+    def contextMenuEvent(self, ev):
+        cm = QMenu(self)
+        copy = cm.addAction(_('Copy Image'))
+        paste = cm.addAction(_('Paste Image'))
+        if not QApplication.instance().clipboard().mimeData().hasImage():
+            paste.setEnabled(False)
+        copy.triggered.connect(self.copy_to_clipboard)
+        paste.triggered.connect(self.paste_from_clipboard)
+        cm.exec_(ev.globalPos())
+
+    def copy_to_clipboard(self):
+        QApplication.instance().clipboard().setPixmap(self.pixmap())
+
+    def paste_from_clipboard(self):
+        cb = QApplication.instance().clipboard()
+        pmap = cb.pixmap()
+        if pmap.isNull() and cb.supportsSelection():
+            pmap = cb.pixmap(cb.Selection)
+        if not pmap.isNull():
+            self.setPixmap(pmap)
+            self.emit(SIGNAL('cover_changed(PyQt_PyObject)'),
+                    pixmap_to_data(pmap))
+

 class LocationModel(QAbstractListModel):

--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@ -55,7 +55,7 @@ class CSV_XML(CatalogPlugin):
                log("  %s: %s" % (key, opts_dict[key]))

        # Get the sorted, filtered database as a dictionary
-        data = self.search_sort_db_as_dict(db, opts)
+        data = self.search_sort_db(db, opts)

        if not len(data):
            log.error("\nNo matching database entries for search criteria '%s'" % opts.search_text)
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@ -591,14 +591,14 @@ def catalog_option_parser(args):
    from calibre.utils.logging import Log

    def add_plugin_parser_options(fmt, parser, log):
-    
+
        # Fetch the extension-specific CLI options from the plugin
        plugin = plugin_for_catalog_format(fmt)
        for option in plugin.cli_options:
-            parser.add_option(option.option, 
-                              default=option.default, 
-                              dest=option.dest, 
-                              help=option.help)            
+            parser.add_option(option.option,
+                              default=option.default,
+                              dest=option.dest,
+                              help=option.help)

        return plugin

@ -608,7 +608,7 @@ def catalog_option_parser(args):

    def validate_command_line(parser, args, log):
        # calibredb catalog path/to/destination.[epub|csv|xml|...] [options]
-        
+
        # Validate form
        if not len(args) or args[0].startswith('-'):
            print_help(parser, log)
@ -616,17 +616,17 @@ def catalog_option_parser(args):
            "To review options for an output format, type 'calibredb catalog <.extension> --help'\n"
            "For example, 'calibredb catalog .xml --help'\n")
            raise SystemExit(1)
-    
+
        # Validate plugin exists for specified output format
        output = os.path.abspath(args[0])
        file_extension = output[output.rfind('.') + 1:].lower()
-        
+
        if not file_extension in available_catalog_formats():
            print_help(parser, log)
            log.error("No catalog plugin available for extension '%s'.\n" % file_extension +
                      "Catalog plugins available for %s\n" % ', '.join(available_catalog_formats()) )
            raise SystemExit(1)
-        
+
        return output, file_extension

    # Entry point
@ -634,7 +634,7 @@ def catalog_option_parser(args):
    parser = get_parser(_(
    '''
    %prog catalog /path/to/destination.(csv|epub|mobi|xml ...) [options]
-    
+
    Export a catalog in format specified by path/to/destination extension.
    Options control how entries are displayed in the generated catalog ouput.
    '''))
@ -642,20 +642,21 @@ def catalog_option_parser(args):
    # Confirm that a plugin handler exists for specified output file extension
    # Will raise SystemExit(1) if no plugin matching file_extension
    output, fmt = validate_command_line(parser, args, log)
-    
+
    # Add options common to all catalog plugins
    parser.add_option('-s', '--search', default=None, dest='search_text',
                      help=_("Filter the results by the search query.  For the format of the search query, please see the search-related documentation in the User Manual.\n"+
                      "Default: no filtering"))
    parser.add_option('-v','--verbose', default=False, action='store_true',
-                      dest='verbose', 
+                      dest='verbose',
                      help=_('Show detailed output information. Useful for debugging'))

    # Add options specific to fmt plugin
    plugin = add_plugin_parser_options(fmt, parser, log)
-    
+
    # Merge options from GUI Preferences
    '''
+    # Placeholder sample code until we implement GUI preferences
    from calibre.library.save_to_disk import config
    c = config()
    for pref in ['asciiize', 'update_metadata', 'write_opf', 'save_cover']:
@ -677,7 +678,7 @@ def catalog_option_parser(args):
        parser.add_option(switch, default=False, action='store_true',
                help=opt.help)
    '''
-    
+
    return parser, plugin, log

 def command_catalog(args, dbpath):
@ -690,10 +691,11 @@ def command_catalog(args, dbpath):
        return 1
    if opts.verbose:
        log("library.cli:command_catalog dispatching to plugin %s" % plugin.name)
-    plugin.run(args[1], opts, get_db(dbpath, opts))
+    with plugin:
+        plugin.run(args[1], opts, get_db(dbpath, opts))
    return 0

-# end of GR additions    
+# end of GR additions

 COMMANDS = ('list', 'add', 'remove', 'add_format', 'remove_format',
                'show_metadata', 'set_metadata', 'export', 'catalog')
--- a/src/calibre/manual/custom.py
+++ b/src/calibre/manual/custom.py
@ -97,7 +97,12 @@ def generate_calibredb_help(preamble, info):

    lines, toc = [], []
    for cmd in COMMANDS:
-        parser = getattr(cli, cmd+'_option_parser')()
+        args = []
+        if cmd == 'catalog':
+            args = [['doc.xml', '-h']]
+        parser = getattr(cli, cmd+'_option_parser')(*args)
+        if cmd == 'catalog':
+            parser = parser[0]
        toc.append('  * :ref:`calibredb-%s`'%cmd)
        lines += ['.. _calibredb-'+cmd+':', '']
        lines += [cmd, '~'*20, '']
--- a/src/calibre/manual/develop.rst
+++ b/src/calibre/manual/develop.rst
@ -176,3 +176,32 @@ in your favorite editor and add the line::

 near the top of the file. Now run the command :command:`calibredb`. The very first line of output should be ``Hello, world!``.

+Debugging tips
+----------------
+
+Running calibre code in a python debugger is not easy, unless you install from source on linux. However, python is a
+dynamically typed language with excellent facilities for introspection. I wrote the core calibre code without once
+using a debugger. There are two main strategies to debug calibre code:
+
+Using an interactive python interpreter
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can insert the following two lines of code to start an interactive python session at that point::
+
+    from calibre import ipython
+    ipython(locals())
+
+When running from the command line, this will start an interactive python interpreter with access to all
+locally defined variables (variables in the local scope). The interactive prompt even has TAB completion
+for object properties and you can use the various python facilities for introspection, such as
+:function:`dir`, :function:`type`, :function:`repr`, etc.
+
+Using print statements
+^^^^^^^^^^^^^^^^^^^^^^^
+
+This is my favorite way to debug. Simply insert print statements at points of interest and run your program in the
+terminal. For example, you can start the GUI from the terminal as::
+
+    calibre-debug -g
+
+
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-08 23:39+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:13+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:46+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -548,7 +548,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -622,9 +622,9 @@ msgstr "لا توجد مساحة كافية في بطاقة التخزين"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "الأخبار"

@ -2225,6 +2225,10 @@ msgid ""
 "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' "
@ -2493,7 +2497,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
@ -3069,12 +3073,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 ""

@ -3287,17 +3291,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7167,27 +7175,27 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /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:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr ""

--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-08 23:55+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-11 19:42+0000\n"
+"Last-Translator: S. Dorscht <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"

@ -126,11 +126,11 @@ msgstr "Macht absolut gar nichts"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -468,7 +468,7 @@ msgstr "Kovid Goyal"

 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
-msgstr ""
+msgstr "Kommunikation mit dem Cybook Gen 3 / Opus eBook Reader."

 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:23
 msgid "Communicate with the EB600 eBook reader."
@ -577,8 +577,10 @@ msgstr "Kommunikation mit dem Sony PRS-300/505/500 eBook Reader."
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""
+"Mit Kommata getrennte Liste von Metadatenfeldern um Büchersammlungen auf dem "
+"Gerät zu erstellen. Möglichkeiten sind: "

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:141
@ -655,9 +657,9 @@ msgstr "Nicht genügend freier Speicherplatz auf der Speicherkarte"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Nachrichten"

@ -2606,6 +2608,10 @@ msgstr ""
 "Texteingabe durch die Markdown-Vorverarbeitung laufen lassen. Mehr über "
 "Markdown erfahren Sie unter"

+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+msgid "Do not insert a Table of Contents into the output text."
+msgstr "Kein Inhaltsverzeichnis in den Ausgabetext einfügen."
+
 #: /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' "
@ -2907,7 +2913,7 @@ msgstr "Eingabe"
 #: /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
@ -3517,12 +3523,12 @@ msgid "PDB Input"
 msgstr "PDB-Eingabe"

 #: /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 "Jede Zei&le als Absatz behandeln"

 #: /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 "Druck-Formatierung übernehmen"

@ -3746,11 +3752,11 @@ msgstr "&Filter für Inhaltsverzeichnis:"
 msgid "TXT Input"
 msgstr "TXT Input"

-#: /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 "Prozess verwendet Markdown"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3760,6 +3766,12 @@ msgstr ""
 "Formatierung unterstützt. Weitere Informationen gibt es auf der Seite <a "
 "href=\"http://daringfireball.net/projects/markdown\">Markdown</a>."

+#: /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 ""
+"Kein Inhaltsverzeichnis in den Ausgabetext bei der Verwendung von Markdown "
+"einfügen."
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
 msgstr "TXT-Ausgabe"
@ -4153,6 +4165,8 @@ msgid ""
 "\n"
 "Customization: "
 msgstr ""
+"\n"
+"Anpassung: "

 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
 msgid "Conversion"
@ -6214,7 +6228,7 @@ msgstr "Tastenkürzel anpassen für"

 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:215
 msgid "Keys"
-msgstr ""
+msgstr "Schlüssel"

 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:217
 msgid "Double click to change"
@ -6990,7 +7004,7 @@ msgstr "Tasten&kürzel"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
-msgstr ""
+msgstr "Kein Ergebnis gefunden für:"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:33
 msgid "Options to customize the ebook viewer"
@ -7052,7 +7066,7 @@ msgstr "Standardschriftart"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:404
 msgid "&Lookup in dictionary"
-msgstr ""
+msgstr "Im Wörterbuch nachsch&lagen"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
@ -7130,7 +7144,7 @@ msgstr "Druckvorschau"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:271
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
-msgstr ""
+msgstr "Verbinde mit dict.org zum Nachschlagen von: <b>%s</b>&hellip;"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:370
 msgid "Choose ebook"
@ -7211,7 +7225,7 @@ msgstr "eBook Viewer"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:179
 msgid "Close dictionary"
-msgstr ""
+msgstr "Wörterbuch schließen"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:181
 msgid "toolBar"
@ -8009,27 +8023,27 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr "Überprüfe SQL Vollständigkeit..."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832
 msgid "Checking for missing files."
 msgstr "Überprüfe fehlende Dateien."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "Überprüfte ID"

@ -8056,6 +8070,7 @@ msgstr "Die Reihen"
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series number. To get leading zeros use {series_index:0>3s}"
 msgstr ""
+"Reihennummerierung. Für vorangestellte Nullen {series_index:0>3s} verwenden"

 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30
 msgid "The rating"
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 00:17+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-13 22:43+0000\n"
+"Last-Translator: Pierre Slamich <pierre.slamich@gmail.com>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"

@ -125,11 +125,11 @@ msgstr "Ne fait strictement rien"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -574,7 +574,7 @@ msgstr "Communique avec le lecteur Sony PRS-300/505/500."
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -652,9 +652,9 @@ msgstr "Espace insuffisant sur la carte mémoire"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Informations"

@ -2590,6 +2590,10 @@ msgstr ""
 "Exécute le texte en entrée via le pré-processeur markdown. Pour en apprendre "
 "plus à propos de markdown voir"

+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+msgid "Do not insert a Table of Contents into the output text."
+msgstr "Ne pas insérer une table des matières dans le texte de sortie."
+
 #: /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' "
@ -2891,7 +2895,7 @@ msgstr "entrée"
 #: /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
@ -3479,12 +3483,12 @@ msgid "PDB Input"
 msgstr "Entrée PDB"

 #: /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 "Traiter chaque &ligne comme un paragraphe"

 #: /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 ""

@ -3707,11 +3711,11 @@ msgstr "&Filtre TDM:"
 msgid "TXT Input"
 msgstr "Entrée TXT"

-#: /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 "Traiter en utilisant 'markdown'"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3721,6 +3725,10 @@ msgstr ""
 "autorise un formatage avancée. Pour en apprendre plus visiter <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."

+#: /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 "Sortie TXT"
@ -7962,27 +7970,27 @@ msgstr ""
 "\n"
 "Pour une aide sur commande précise: %%prog commande --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migre l'ancienne base vers la librairie dans %s<br><center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Copie <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Compacte la base"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr "Vérifie l'intégrité SQL..."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832
 msgid "Checking for missing files."
 msgstr "Vérifie si des fichiers sont manquants."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "Id vérifié"

--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
--- a/src/calibre/translations/hu.po
+++ b/src/calibre/translations/hu.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-08 12:06+0000\n"
-"Last-Translator: Muszela Balázs <bazsi86@gmail.com>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:11+0000\n"
+"Last-Translator: Muszela Balázs <Unknown>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,11 @@ msgstr "Semmit nem csinál"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -569,7 +569,7 @@ msgstr "Kapcsolódás Sony PRS-300/505/500 eBook olvasóhoz"
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -646,9 +646,9 @@ msgstr "Nincs elég hely a memóriakártyán."
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Hírek (RSS)"

@ -2518,6 +2518,10 @@ msgstr ""
 "A szövegfájl átfuttatása a 'markdown' előfeldolgozón. Bővebb információk a "
 "'markdown'-ról:"

+#: /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' "
@ -2803,7 +2807,7 @@ msgstr "bemenet"
 #: /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
@ -3389,12 +3393,12 @@ msgid "PDB Input"
 msgstr "PDB bemenet"

 #: /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 "Minden sort külön bekezdésként kezeljen"

 #: /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 "Nyomtatási formátum értelmezése"

@ -3610,11 +3614,11 @@ msgstr "Tartalomjegyzék szűrő:"
 msgid "TXT Input"
 msgstr "TXT bemenet"

-#: /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 "Markdown feldolgozás"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3624,6 +3628,10 @@ msgstr ""
 "változatos formázását. Bővebb információ a 'markdown'-ról <a "
 "href=\"http://daringfireball.net/projects/markdown\">itt</a>."

+#: /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 "TXT kimenet"
@ -7728,27 +7736,27 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Régi adatbázis áthozatala a jelenlegibe: %s<br><center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Másolás: <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Adatbázis tömörítése"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr "SQL adatbázis ellenőrzése"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832
 msgid "Checking for missing files."
 msgstr "Hiányzó fájlok keresése"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "Ellenőrzött ID"

--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 00:33+0000\n"
-"Last-Translator: lorenzov <l.vigentini@ed.ac.uk>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-11 22:01+0000\n"
+"Last-Translator: usa_getta <Unknown>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,1105,-1,1312,-1,-1\n"
 "Generated-By: pygettext.py 1.5\n"
@ -128,11 +128,11 @@ msgstr "Non fa assolutamente niente"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -308,7 +308,7 @@ msgstr "Questo profilo è stato creato per l'Hanlin V3 ed i suoi cloni."
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:121
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:323
 msgid "This profile is intended for the Hanlin V5 and its clones."
-msgstr "Questo profilo è adatto per Hanlin V5 e i suoi modelli cloni."
+msgstr "Questo profilo è adatto per Hanlin V5 e i suoi cloni."

 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:131
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:331
@ -578,7 +578,7 @@ msgstr "Comunicazione in corso con il Sony PRS-300/505/500."
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -655,9 +655,9 @@ msgstr "Non c'è spazio sufficiente nella scheda di memoria"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Notizie"

@ -2610,6 +2610,10 @@ msgstr ""
 "Analizzare il testo sorgente utilizzando il pre-processore markdown. Per "
 "maggiori informazioni su markdown vedere"

+#: /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' "
@ -2911,7 +2915,7 @@ msgstr "input"
 #: /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
@ -3520,12 +3524,12 @@ msgid "PDB Input"
 msgstr "Input PDB"

 #: /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 "Considera ogni linea come un paragrafo"

 #: /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 "Inferire il formato di stampa"

@ -3748,11 +3752,11 @@ msgstr "Tavola dei contentuti (TOC) &Filter."
 msgid "TXT Input"
 msgstr "Input TXT"

-#: /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 "Analizzare utilizzando markdown"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3762,6 +3766,10 @@ msgstr ""
 "permette formattazione avanzata. Per maggiori informazioni andate su <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."

+#: /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 "Output TXT"
@ -6444,7 +6452,7 @@ msgstr "Converti in gruppo"

 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:372
 msgid "Run welcome wizard"
-msgstr "Fai partire l'assistenze di configurazione iniziale"
+msgstr "Fai partire l'assistente di configurazione iniziale"

 #: /home/kovid/work/calibre/src/calibre/gui2/ui.py:408
 msgid "Similar books..."
@ -8006,28 +8014,28 @@ msgstr ""
 "\n"
 "Per aiuto su un comando particolare: %%prog command --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 "<p>Sto migrando il vecchio database nella nuova biblioteca in %s<br><center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Sto copiando <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Compattazione database"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr "Controllo di integrita' SQL..."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832
 msgid "Checking for missing files."
 msgstr "Controllo per file mancanti"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "ID controllate"

--- a/src/calibre/translations/ja.po
+++ b/src/calibre/translations/ja.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-09 17:37+0000\n"
-"PO-Revision-Date: 2010-01-09 03:46+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:24+0000\n"
 "Last-Translator: vbk <vbkaisetsu@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-10 07:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,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
@ -621,7 +621,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 "ニュース"

@ -2197,6 +2197,10 @@ msgid ""
 "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' "
@ -2465,7 +2469,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
@ -3039,12 +3043,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 ""

@ -3257,17 +3261,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7143,27 +7151,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 "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1677
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 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 ""

--- a/src/calibre/translations/lv.po
+++ b/src/calibre/translations/lv.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 00:47+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:26+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Latvian <ivars_a@inbox.lv>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: LATVIA\n"
 "X-Poedit-Language: Latvian\n"
@ -127,11 +127,11 @@ msgstr "Pilnīgi neko nedara"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -545,7 +545,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -619,9 +619,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Ziņas"

@ -2203,6 +2203,10 @@ msgid ""
 "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' "
@ -2471,7 +2475,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
@ -3046,12 +3050,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 ""

@ -3266,17 +3270,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7160,27 +7168,27 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Kopē <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /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:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr ""

--- a/src/calibre/translations/nb.po
+++ b/src/calibre/translations/nb.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 00:57+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-13 18:59+0000\n"
+"Last-Translator: Øyvind Øritsland <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:47+0000\n"
+"X-Launchpad-Export-Date: 2010-01-14 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,11 @@ msgstr "Gjør absolutt ingenting"
 #: /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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -467,7 +467,7 @@ msgstr "Kovid Goyal"

 #: /home/kovid/work/calibre/src/calibre/devices/cybook/driver.py:22
 msgid "Communicate with the Cybook Gen 3 / Opus eBook reader."
-msgstr ""
+msgstr "Kommuniser med Cybook Gen3 / Opus eBook leser."

 #: /home/kovid/work/calibre/src/calibre/devices/eb600/driver.py:23
 msgid "Communicate with the EB600 eBook reader."
@ -576,8 +576,10 @@ msgstr "Kommuniser med Sony PRS-300/505/500 eBook leser"
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""
+"Komma-separert liste over felt for metadata for å endre til samling på "
+"enheten. Dette inkluderer: "

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:141
@ -652,9 +654,9 @@ msgstr "Det er ikke nok ledig plass på lagringskortet"
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Nyheter"

@ -2551,6 +2553,10 @@ msgid ""
 msgstr ""
 "Kjør tekst inndata via markdown-forprosessor. For å lære med om markdown, se"

+#: /home/kovid/work/calibre/src/calibre/ebooks/txt/input.py:35
+msgid "Do not insert a Table of Contents into the output text."
+msgstr "Legg aldri en liste over innhold til utdata-teksten."
+
 #: /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' "
@ -2837,7 +2843,7 @@ msgstr "Inndata"
 #: /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
@ -3442,12 +3448,12 @@ msgid "PDB Input"
 msgstr "PDB inndata"

 #: /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 "Behandle hver &linje som avsnitt"

 #: /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 "Forutsett utskriftsformatering"

@ -3663,11 +3669,11 @@ msgstr "TOC &Filter:"
 msgid "TXT Input"
 msgstr "TXT Inndata"

-#: /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 "Prosseser ved å benytte markdown"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3677,6 +3683,11 @@ msgstr ""
 "avansert formatering. For å lære mer, besøk <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."

+#: /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 ""
+"Legg aldri en liste over innhold til utdata-teksten når merking utføres"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output.py:16
 msgid "TXT Output"
 msgstr "TXT Utdata"
@ -4068,6 +4079,8 @@ msgid ""
 "\n"
 "Customization: "
 msgstr ""
+"\n"
+"Tilpasning: "

 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config/__init__.py:196
 msgid "Conversion"
@ -6095,7 +6108,7 @@ msgstr "Tilpass snarveier for"

 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:215
 msgid "Keys"
-msgstr ""
+msgstr "Nøkler"

 #: /home/kovid/work/calibre/src/calibre/gui2/shortcuts.py:217
 msgid "Double click to change"
@ -6861,7 +6874,7 @@ msgstr "&Tastatursnarveier"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/dictionary.py:53
 msgid "No results found for:"
-msgstr ""
+msgstr "Det ble ikke funnet noe resultat for:"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:33
 msgid "Options to customize the ebook viewer"
@ -6923,7 +6936,7 @@ msgstr "Standard tegnsetttype"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:404
 msgid "&Lookup in dictionary"
-msgstr ""
+msgstr "&Slå opp i ordboken"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/keys.py:12
 msgid "Scroll to the next page"
@ -7000,7 +7013,7 @@ msgstr "Forhåndsvisning av utskrift"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:271
 msgid "Connecting to dict.org to lookup: <b>%s</b>&hellip;"
-msgstr ""
+msgstr "Kobler til dict.org for å slå opp:<b>%s</b>&hellip;"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:370
 msgid "Choose ebook"
@ -7080,7 +7093,7 @@ msgstr "E-bokleser"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:179
 msgid "Close dictionary"
-msgstr ""
+msgstr "Steng ordboken"

 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:181
 msgid "toolBar"
@ -7851,27 +7864,27 @@ msgstr ""
 "\n"
 "For hjelp til en individuell kommando: %%prog kommando --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p> Migrerer gammel database til e-bokbiblioteket i %s<br><senter>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Kopierer <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Komprimerer databasen"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr "Sjekker for SQL integritet..."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1832
 msgid "Checking for missing files."
 msgstr "Sjekker etter savnede filer."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "Sjekker ID"

@ -7898,6 +7911,7 @@ msgstr "Seriene"
 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:29
 msgid "The series number. To get leading zeros use {series_index:0>3s}"
 msgstr ""
+"Serienummer. For å legge inn begynnende nuller, bruk {series_index:0>3s}"

 #: /home/kovid/work/calibre/src/calibre/library/save_to_disk.py:30
 msgid "The rating"
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
--- a/src/calibre/translations/pt_BR.po
+++ b/src/calibre/translations/pt_BR.po
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 01:19+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:39+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:48+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
@ -129,11 +129,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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -573,7 +573,7 @@ msgstr "Соединяться с Sony PRS-300/505/500."
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -649,9 +649,9 @@ msgstr "Не хватает свободного места на карте па
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Новости"

@ -2449,6 +2449,10 @@ msgid ""
 "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' "
@ -2717,7 +2721,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
@ -3294,12 +3298,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 ""

@ -3512,17 +3516,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7563,27 +7571,27 @@ msgstr ""
 "\n"
 "Для справки: %%prog команда --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Миграция старой базы данных в %s<br><center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Копирование <b>%s</b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Сжатие базы данных"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /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:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr ""

--- a/src/calibre/translations/sq.po
+++ b/src/calibre/translations/sq.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-08 22:57+0000\n"
-"PO-Revision-Date: 2010-01-09 01:46+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:40+0000\n"
 "Last-Translator: Besnik <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-09 07:46+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,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:1132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1169
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1503
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1505
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1616
+#: /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
@ -541,7 +541,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:58
 msgid ""
 "Comma separated list of metadata fields to turn into collections on the "
-"device. Posiibilities include: "
+"device. Possibilities include: "
 msgstr ""

 #: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:139
@ -615,9 +615,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:826
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:232
 #: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:132
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1065
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1069
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1403
+#: /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:1417
 msgid "News"
 msgstr "Lajme"

@ -2193,6 +2193,10 @@ msgid ""
 "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' "
@ -2461,7 +2465,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
@ -3035,12 +3039,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 ""

@ -3253,17 +3257,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7123,27 +7131,27 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1642
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1671
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1688
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1781
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1795
 msgid "Checking SQL integrity..."
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1818
+#: /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:1840
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr ""

--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-09 17:37+0000\n"
-"PO-Revision-Date: 2010-01-09 17:07+0000\n"
-"Last-Translator: Merarom <Unknown>\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:09+0000\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-10 07:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,11 @@ msgstr "Gör ingenting"
 #: /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
@ -653,7 +653,7 @@ msgstr "Det finns tillräckligt mycket ledigt utrymme på minneskortet"
 #: /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 "Nyheter"

@ -2521,6 +2521,10 @@ msgid ""
 "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' "
@ -2813,7 +2817,7 @@ msgstr "indata"
 #: /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
@ -3416,12 +3420,12 @@ msgid "PDB Input"
 msgstr "PDB indata"

 #: /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 "Behandla varje rad som ett stycke"

 #: /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 "Anta utskriftsformatering"

@ -3637,11 +3641,11 @@ msgstr "Innehållsförtecknings&filter"
 msgid "TXT Input"
 msgstr "TXT indata"

-#: /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 "Processen använder markdown"

-#: /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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
@ -3651,6 +3655,10 @@ msgstr ""
 "avancerad formatering. Om du vill veta mer besök <a "
 "href=\"http://daringfireball.net/projects/markdown\"> markdown </a>."

+#: /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 "TXT utdata"
@ -7762,8 +7770,8 @@ msgstr ""
 "\n"
 "Ange metadata lagrays i calibre databas för boken som identifieras med hjälp "
 "av id\n"
-"från OPf fil metadata.opf. ID är ett ID-nummer från listkommandot. Du\n"
-"kan få en snabb känsla för OPf format med hjälp av --as-opf växel till\n"
+"från OPF fil metadata.opf. ID är ett ID-nummer från listkommandot. Du\n"
+"kan få en snabb känsla för OPf format med hjälp av  --as-opf växel till\n"
 "show_metadata kommando.\n"

 #: /home/kovid/work/calibre/src/calibre/library/cli.py:517
@ -7827,27 +7835,27 @@ msgstr ""
 "\n"
 "For help on an individual command: %%prog command --help\n"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1648
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1656
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p> Migrera gamla databasen med e-bokbibliotek i%s <br> <center>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1677
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 msgstr "Kopiering <b>%s </ b>"

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1694
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1702
 msgid "Compacting database"
 msgstr "Komprimerande databas"

-#: /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 "Kontrollerar SQL integritet ..."

-#: /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 "Kontroll av saknade filer."

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1846
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1854
 msgid "Checked id"
 msgstr "Kontrollerad id"

@ -8376,8 +8384,8 @@ msgstr ""
 "Varje länk som matchar det reguljära uttrycket kommer att ignoreras. Detta "
 "alternativ kan anges flera gånger, i vilket fall så länge något regexp "
 "matchar en länk, blir det ignorat.Grundinställning är att inga länkar "
-"ignoreras. Om både --filter-regexp och --match-regexp anges så används "
-"--filter-regexp först."
+"ignoreras. Om både --filter-regexp och --match-regexp anges så används  --"
+"filter-regexp först."

 #: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:481
 msgid "Do not download CSS stylesheets."
--- a/src/calibre/translations/tr.po
+++ b/src/calibre/translations/tr.po
--- a/src/calibre/translations/zh_TW.po
+++ b/src/calibre/translations/zh_TW.po
@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-01-09 17:37+0000\n"
-"PO-Revision-Date: 2010-01-09 02:13+0000\n"
+"POT-Creation-Date: 2010-01-11 00:36+0000\n"
+"PO-Revision-Date: 2010-01-10 23:43+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Traditional Chinese <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-10 07:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-12 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"

 #: /home/kovid/work/calibre/src/calibre/customize/__init__.py:42
@ -125,11 +125,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
@ -617,7 +617,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 "新聞"

@ -2204,6 +2204,10 @@ msgid ""
 "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' "
@ -2472,7 +2476,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
@ -3046,12 +3050,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 ""

@ -3264,17 +3268,21 @@ 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 ""
 "<p>Markdown is a simple markup language for text files, that allows for "
 "advanced formatting. To learn more visit <a "
 "href=\"http://daringfireball.net/projects/markdown\">markdown</a>."
 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 ""
@ -7134,27 +7142,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 "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""

-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1677
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1685
 msgid "Copying <b>%s</b>"
 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 ""

--- a/src/calibre/utils/localization.py
+++ b/src/calibre/utils/localization.py
@ -97,6 +97,7 @@ _extra_lang_codes = {
        'zh_TW' : _('Traditional Chinese'),
        'en'    : _('English'),
        'en_AU' : _('English (Australia)'),
+        'en_NZ' : _('English (New Zealand)'),
        'en_CA' : _('English (Canada)'),
        'en_IN' : _('English (India)'),
        'en_TH' : _('English (Thailand)'),