Sync to trunk.

Changelog.yaml

@@ -19,6 +19,97 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.8.21
+  date: 2011-09-30
+
+  new features:
+    - title: "A Tips and Tricks blog at http://blog.calibre-ebook.com to introduce less well known calibre features in a simple way"
+
+    - title: "News download: Add list of articles in the downloaded issue to the comments metadata of the generated ebook. Makes it possible to search for a particular article in the calibre library."
+      ticket: [851717]
+
+    - title: "Toolbar buttons: You can now also right click the buttons to bring the popup of extra actions, in addition to clicking the small arrow next to the button." 
+
+    - title: "Amazon metadata download plugin: Add option to download metadata from amazon.es"
+
+    - title: Driver for Vizio and iRobot A9 Android tablets
+      tickets: [854408,862175] 
+
+    - title: "When switching to/starting with a library with a corrupted database, offer the user the option of rebuilding the database instead of erroring out."
+
+    - title: "Template language: Add list_equals function"
+
+    - title: "Add a special output profile for the PocketBook 900 as it does not resize images correctly by itself"
+  
+  bug fixes:
+    - title: "Fix regression that cause PDF Output to generate very large files"
+
+    - title: Fix Title Sort field not being displayed in Book details panel
+
+    - title: Prevent renaming of languages in the Tag browser
+      tickets: [860943]
+
+    - title: "Get books: Fix getting price from Foyles"
+
+    - title: "Content server: When a search matches no queries, do not show an error message"
+
+    - title: "ODT Input: Add workaround for ADE to fix centering of block level images when converting to EPUB"
+      tickets: [859343]
+
+    - title: "Content server: When WSGI embedding fix handling of empty URL"
+
+    - title: "RTF Input: Fix spurious spaces inserted after some unicode characters"
+      tickets: [851215]
+
+    - title: "Fix regression that broke clicking on the first letter of author names in the Tag Browser when grouped"
+      tickets: [860615]
+
+    - title: "Fix reading metadata from filenames when the author regexp does not match anything"
+
+    - title: "Fix incorrect display of the month September in Finnish calibre"
+      tickets: [858737]
+
+    - title: "Do not delete the file when the user tries to add a format to a book from a file already in the books directory"
+      tickets: [856158]
+
+    - title: "Fix regression that broke customization of Kobo device plugin"
+
+    - title: "Allow user defined templates to be used in save to disk"
+
+  improved recipes:
+    - Read It Later
+    - American Spectator
+    - Sydney Morning Herald
+    - Chicago Tribune
+    - American Prospect
+    - DNA India
+    - Times of India
+    - Kurier
+    - xkcd
+    - Cnet
+
+  new recipes:
+    - title: Various Colombian news sources
+      author: BIGO-CAVA
+
+    - title: Gosc Niedzielny
+      author: Piotr Kontek
+
+    - title: Leipzer Volkszeitung 
+      author: a.peter
+
+    - title: Folha de Sao Paulo (full edition)
+      author: fluzao
+
+    - title: Den of Geek
+      author: Jaded
+
+    - title: Republica
+      author: Manish Bhattarai
+
+    - title: Sign on San Diego
+      author: Jay Kindle
+
 - version: 0.8.20
   date: 2011-09-23
 

recipes/amspec.recipe

@@ -18,6 +18,8 @@ class TheAmericanSpectator(BasicNewsRecipe):
     use_embedded_content  = False
     language              = 'en'
     INDEX                 = 'http://spectator.org'
+    auto_cleanup = True
+    encoding = 'utf-8'
 
     conversion_options = {
                              'comments'        : description
@@ -26,17 +28,6 @@ class TheAmericanSpectator(BasicNewsRecipe):
                             ,'publisher'       : publisher
                          }
 
-    keep_only_tags   = [
-                             dict(name='div', attrs={'class':'post inner'})
-                            ,dict(name='div', attrs={'class':'author-bio'})
-                         ]
-
-    remove_tags     = [
-                             dict(name='object')
-                            ,dict(name='div', attrs={'class':['col3','post-options','social']})
-                            ,dict(name='p'  , attrs={'class':['letter-editor','meta']})
-                        ]
-                         
     feeds = [ (u'Articles', u'http://feeds.feedburner.com/amspecarticles')]
 
     def get_cover_url(self):

recipes/diario_la_republica.recipe

@@ -0,0 +1,11 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1317341449(BasicNewsRecipe):
+    title          = u'Diario La Republica'
+    __author__ = 'CAVALENCIA'
+    oldest_article = 7
+    max_articles_per_feed = 100
+    auto_cleanup = True
+    language = 'es_CO'
+
+    feeds          = [(u'Diario La Republica', u'http://www.larepublica.com.co/rss/larepublica.xml')]

recipes/el_colombiano.recipe

@@ -2,12 +2,10 @@
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
-
-
 class AdvancedUserRecipe1311790237(BasicNewsRecipe):
     title          = u'Periódico El Colombiano'
-    language = 'es_CO'
     __author__  = 'BIGO-CAVA'
+    language = 'es_CO'
     cover_url     = 'http://www.elcolombiano.com/images/logoElColombiano348x46.gif'
     remove_tags_before = dict(id='contenidoArt')
     remove_tags_after  = dict(id='enviaTips')

recipes/el_espectador.recipe

@@ -0,0 +1,54 @@
+# coding=utf-8
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ColombiaElEspectador(BasicNewsRecipe):
+    title          = u'Periódico el Espectador'
+    __author__  = 'BIGO-CAVA'
+    cover_url     = 'http://www.elespectador.com/sites/elespectador.com/themes/elespectador/images/logo.gif'
+    #remove_tags_before = dict(id='fb-root')
+    remove_tags_before = dict(id='content')
+    remove_tags_after  = [dict(name='div', attrs={'class':'paginacion'})]
+    language = 'es_CO'
+    #keep_only_tags = [dict(name='div', id='content')]
+    remove_tags        = [dict(name='div', attrs={'class':'herramientas_nota'}),
+          dict(name='div', attrs={'class':'relpauta'}),
+                          dict(name='div', attrs={'class':'recursosrelacionados'}),
+                         dict(name='div', attrs={'class':'nav_negocios'})]
+   #                       dict(name='div', attrs={'class':'tags_playerrecurso'}),
+    #                      dict(name='div', attrs={'class':'ico-mail2'}),
+      #                    dict(name='div', attrs={'id':'caja-instapaper'}),
+       #                   dict(name='div', attrs={'class':'modulo herramientas'})]
+    oldest_article = 2
+    max_articles_per_feed = 100
+    remove_javascript = True
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_empty_feeds    = True
+    masthead_url          = 'http://www.elespectador.com/sites/elespectador.com/themes/elespectador/images/logo.gif'
+    publication_type      = 'newspaper'
+
+    extra_css             = """
+                               p{text-align: justify; font-size: 100%}
+                               body{ text-align: left; font-size:100% }
+                               h1{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
+                               h3{font-family: sans-serif; font-size:100%; font-style: italic; text-align: justify; }
+                                 """
+
+
+    feeds          = [(u'Política   ', u' http://www.elespectador.com/noticias/politica/feed'),
+                      (u'Judicial', u'http://www.elespectador.com/noticias/judicial/feed'),
+              (u'Paz', u'http://www.elespectador.com/noticias/paz/feed'),
+              (u'Economía', u'http://www.elespectador.com/economia/feed'),
+              (u'Soy Periodista', u'http://www.elespectador.com/noticias/soyperiodista/feed'),
+              (u'Investigación', u'http://www.elespectador.com/noticias/investigacion/feed'),
+              (u'Educación', u'http://www.elespectador.com/noticias/educacion/feed'),
+              (u'Salud', u'http://www.elespectador.com/noticias/salud/feed'),
+              (u'El Mundo', u'http://www.elespectador.com/noticias/elmundo/feed'),
+              (u'Nacional', u'http://www.elespectador.com/noticias/nacional/feed'),
+                                              (u'Bogotá', u'http://www.elespectador.com/noticias/bogota/feed'),
+                                              (u'Deportes', u'http://www.elespectador.com/deportes/feed'),
+                                              (u'Tecnología', u'http://www.elespectador.com/tecnologia/feed'),
+                                              (u'Actualidad', u'http://www.elespectador.com/noticias/actualidad/feed'),
+                                              (u'Opinión', u'http://www.elespectador.com/opinion/feed'),
+              (u'Editorial', u'http://www.elespectador.com/opinion/editorial/feed')]

recipes/el_mundo_co.recipe

@@ -0,0 +1,50 @@
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ColombiaElMundo02(BasicNewsRecipe):
+    title          = u'Periódico El Mundo'
+    __author__  = 'BIGO-CAVA'
+    language = 'es_CO'
+    cover_url     = 'http://www.elmundo.com/portal/img/logo_mundo2.png'
+    remove_tags_before = dict(id='miga_pan')
+    #remove_tags_before = [dict(name='div', attrs={'class':'contenido'})]
+    remove_tags_after  = [dict(name='div', attrs={'class':'cuadro_opciones_new1'})]
+    #keep_only_tags = [dict(name='div', id='miga_pan')]
+    remove_tags        = [dict(name='div', attrs={'class':'ruta'}),
+    dict(name='div', attrs={'class':'buscador'}),
+    dict(name='div', attrs={'class':'iconos'}),
+                          dict(name='div', attrs={'class':'otros_iconos'}),
+                         dict(name='div', attrs={'class':'cuadro_opciones_new1'}),
+                          dict(name='div', attrs={'class':'otras_noticias'}),
+                          dict(name='div', attrs={'class':'notas_relacionadas'}),
+                          dict(name='div', attrs={'id':'lateral_2'})]
+    oldest_article = 2
+    max_articles_per_feed = 100
+    remove_javascript = True
+    no_stylesheets        = True
+    use_embedded_content  = False
+    remove_empty_feeds    = True
+    masthead_url          = 'http://www.elmundo.com/portal/img/logo_mundo2.png'
+    publication_type      = 'newspaper'
+
+    extra_css             = """
+                               p{text-align: justify; font-size: 100%}
+                               body{ text-align: left; font-size:100% }
+                               h1{font-family: sans-serif; font-size:150%; font-weight:bold; text-align: justify; }
+                               h3{font-family: sans-serif; font-size:100%; font-style: italic; text-align: justify; }
+                                 """
+
+
+    feeds          = [(u'Opinión', u'http://www.elmundo.com/images/rss/opinion.xml'),
+              (u'Economía', u'http://www.elmundo.com/images/rss/noticias_economia.xml'),
+              (u'Deportes', u'http://www.elmundo.com/images/rss/deportes.xml'),
+              (u'Política   ', u'http://www.elmundo.com/images/rss/noticias_politica.xml'),
+              (u'Antioquia', u'http://www.elmundo.com/images/rss/noticias_antioquia.xml'),
+              (u'Nacional   ', u'http://www.elmundo.com/images/rss/noticias_nacional.xml'),
+              (u'Internacional', u'http://www.elmundo.com/images/rss/noticias_internacional.xml'),
+              (u'Servicios Públicos', u'http://www.elmundo.com/images/rss/noticias_servicios_publicos.xml'),
+              (u'Infraestructura', u'http://www.elmundo.com/images/rss/noticias_infraestructura.xml'),
+                                              (u'Mobilidad', u'http://www.elmundo.com/images/rss/noticias_movilidad.xml'),
+              (u'Derechos Humanos', u'http://www.elmundo.com/images/rss/noticias_derechos_humanos.xml'),
+                                              (u'Vida', u'http://www.elmundo.com/images/rss/vida.xml'),
+              (u'Cultura', u'http://www.elmundo.com/images/rss/cultura.xml')]

recipes/el_tiempo.recipe

@@ -2,18 +2,17 @@
 
 from calibre.web.feeds.news import BasicNewsRecipe
 
-
-
-
 class ColombiaElTiempo02(BasicNewsRecipe):
     title          = u'Periódico el Tiempo'
-    language = 'es_CO'
     __author__  = 'BIGO-CAVA'
+    language = 'es_CO'
     cover_url     = 'http://www.eltiempo.com/media/css/images/logo_footer.png'
-    remove_tags_before = dict(id='fb-root')
+    #remove_tags_before = dict(id='fb-root')
+    remove_tags_before = dict(id='contenidoArt')
     remove_tags_after  = [dict(name='div', attrs={'class':'modulo reporte'})]
     keep_only_tags = [dict(name='div', id='contenidoArt')]
     remove_tags        = [dict(name='div', attrs={'class':'social-media'}),
+          dict(name='div', attrs={'class':'recomend-art'}),
                           dict(name='div', attrs={'class':'caja-facebook'}),
                           dict(name='div', attrs={'class':'caja-twitter'}),
                           dict(name='div', attrs={'class':'caja-buzz'}),

recipes/gosc_niedzielny.recipe

@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2011, Piotr Kontek, piotr.kontek@gmail.com'
+
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.ptempfile import PersistentTemporaryFile
+import re
+
+class GN(BasicNewsRecipe):
+        EDITION = 0
+
+        __author__ = 'Piotr Kontek'
+        title = u'Gość niedzielny'
+        description = 'Weekly magazine'
+        encoding = 'utf-8'
+        no_stylesheets = True
+        language = 'pl'
+        remove_javascript = True
+        temp_files = []
+
+        articles_are_obfuscated = True
+
+        def get_obfuscated_article(self, url):
+            br = self.get_browser()
+            br.open(url)
+            source = br.response().read()
+            page = self.index_to_soup(source)
+
+            main_section = page.find('div',attrs={'class':'txt doc_prnt_prv'})
+
+            title = main_section.find('h2')
+            info = main_section.find('div', attrs={'class' : 'cf doc_info'})
+            authors = info.find(attrs={'class':'l'})
+            article = str(main_section.find('p', attrs={'class' : 'doc_lead'}))
+            first = True
+            for p in main_section.findAll('p', attrs={'class':None}, recursive=False):
+                if first and p.find('img') != None:
+                    article = article + '<p>'
+                    article = article + str(p.find('img')).replace('src="/files/','src="http://www.gosc.pl/files/')
+                    article = article + '<font size="-2">'
+                    for s in p.findAll('span'):
+                        article = article + self.tag_to_string(s)
+                    article = article + '</font></p>'
+                else:
+                    article = article + str(p).replace('src="/files/','src="http://www.gosc.pl/files/')
+                first = False
+
+            html =  unicode(title) + unicode(authors) + unicode(article)
+
+            self.temp_files.append(PersistentTemporaryFile('_temparse.html'))
+            self.temp_files[-1].write(html)
+            self.temp_files[-1].close()
+            return self.temp_files[-1].name
+
+        def find_last_issue(self):
+                soup = self.index_to_soup('http://gosc.pl/wyszukaj/wydania/3.Gosc-Niedzielny')
+                #szukam zdjęcia i linka do porzedniego pełnego numeru
+                first = True
+                for d in soup.findAll('div', attrs={'class':'l release_preview_l'}):
+                    img = d.find('img')
+                    if img != None:
+                        a = img.parent
+                        self.EDITION = a['href']
+                        self.title = img['alt']
+                        self.cover_url = 'http://www.gosc.pl' + img['src']
+                        if not first:
+                            break
+                        first = False
+
+        def parse_index(self):
+                self.find_last_issue()
+                soup = self.index_to_soup('http://www.gosc.pl' + self.EDITION)
+                feeds = []
+                #wstepniak
+                a = soup.find('div',attrs={'class':'release-wp-b'}).find('a')
+                articles = [
+                            {'title' : self.tag_to_string(a),
+                             'url'   : 'http://www.gosc.pl' + a['href'].replace('/doc/','/doc_pr/'),
+                             'date'  : '',
+                             'description' : ''}
+                            ]
+                feeds.append((u'Wstępniak',articles))
+                #kategorie
+                for addr in soup.findAll('a',attrs={'href':re.compile('kategoria')}):
+                        if addr.string != u'wszystkie artyku\u0142y z tej kategorii \xbb':
+                            main_block = self.index_to_soup('http://www.gosc.pl' + addr['href'])
+                            articles = list(self.find_articles(main_block))
+                            if len(articles) > 0:
+                                section = addr.string
+                                feeds.append((section, articles))
+                return feeds
+
+        def find_articles(self, main_block):
+                for a in main_block.findAll('div', attrs={'class':'prev_doc2'}):
+                        art = a.find('a')
+                        yield {
+                                'title' : self.tag_to_string(art),
+                                'url'   : 'http://www.gosc.pl' + art['href'].replace('/doc/','/doc_pr/'),
+                                'date'  : '',
+                                'description' : ''
+                                }
+                for a in main_block.findAll('div', attrs={'class':'sr-document'}):
+                        art = a.find('a')
+                        yield {
+                                'title' : self.tag_to_string(art),
+                                'url'   : 'http://www.gosc.pl' + art['href'].replace('/doc/','/doc_pr/'),
+                                'date'  : '',
+                                'description' : ''
+                                }
+

recipes/portafolio.recipe

@@ -4,13 +4,13 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class AdvancedUserRecipe1311799898(BasicNewsRecipe):
     title          = u'Periódico Portafolio Colombia'
-    language = 'es_CO'
     __author__  = 'BIGO-CAVA'
+    language = 'es_CO'
     cover_url     = 'http://www.portafolio.co/sites/portafolio.co/themes/portafolio_2011/logo.png'
     remove_tags_before = dict(id='contenidoArt')
     remove_tags_after  = [dict(name='div', attrs={'class':'articulo-mas'})]
     keep_only_tags = [dict(name='div', id='contenidoArt')]
-    oldest_article = 1
+    oldest_article = 2
     max_articles_per_feed = 100
     remove_javascript = True
     no_stylesheets        = True

recipes/readitlater.recipe

@@ -1,5 +1,8 @@
 __license__   = 'GPL v3'
-__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '''
+2010, Darko Miletic <darko.miletic at gmail.com>
+2011, Przemyslaw Kryger <pkryger at gmail.com>
+'''
 '''
 readitlaterlist.com
 '''
@@ -9,7 +12,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class Readitlater(BasicNewsRecipe):
     title                 = 'Read It Later'
-    __author__            = 'Darko Miletic'
+    __author__            = 'Darko Miletic, Przemyslaw Kryger'
     description           = '''Personalized news feeds. Go to readitlaterlist.com to
                                setup up your news. Fill in your account
                                username, and optionally you can add password.'''
@@ -23,9 +26,6 @@ class Readitlater(BasicNewsRecipe):
     INDEX                 = u'http://readitlaterlist.com'
     LOGIN                 = INDEX + u'/l'
 
-
-    feeds = [(u'Unread articles' , INDEX + u'/unread')]
-
     def get_browser(self):
         br = BasicNewsRecipe.get_browser()
         if self.username is not None:
@@ -37,12 +37,31 @@ class Readitlater(BasicNewsRecipe):
             br.submit()
         return br
 
+    def get_feeds(self):
+        self.report_progress(0, ('Fetching list of feeds...'))
+        lfeeds = []
+        i = 1
+        feedurl = self.INDEX + u'/unread/1'
+        while True:
+            title = u'Unread articles, page ' + str(i)
+            lfeeds.append((title, feedurl))
+            self.report_progress(0, ('Got ') + str(i) + (' feeds'))
+            i += 1
+            soup = self.index_to_soup(feedurl)
+            ritem = soup.find('a',attrs={'id':'next', 'class':'active'})
+            if ritem is None:
+                break
+            feedurl = self.INDEX + ritem['href']
+        if self.test:
+            return lfeeds[:2]
+        return lfeeds
+
     def parse_index(self):
         totalfeeds = []
         lfeeds = self.get_feeds()
         for feedobj in lfeeds:
             feedtitle, feedurl = feedobj
-            self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
+            self.report_progress(0, ('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
             articles = []
             soup = self.index_to_soup(feedurl)
             ritem = soup.find('ul',attrs={'id':'list'})

recipes/revista_semana.recipe

@@ -0,0 +1,11 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class AdvancedUserRecipe1317341570(BasicNewsRecipe):
+    title          = u'Revista Semana'
+    __author__ = 'BIGO-CAVA'
+    language = 'es_CO'
+    oldest_article = 7
+    max_articles_per_feed = 100
+
+    feeds          = [(u'Revista Semana', u'http://www.semana.com/rss/Semana_OnLine.xml')]

recipes/smh.recipe

@@ -35,16 +35,16 @@ class Smh_au(BasicNewsRecipe):
                         , 'language'  : language
                         }
 
-    remove_tags = [
-                     dict(name='div', attrs={'id':['googleAds','moreGoogleAds','comments']})
-                    ,dict(name='div', attrs={'class':'cT-imageMultimedia'})
-                    ,dict(name=['object','embed','iframe'])
-                  ]
     remove_tags_after = [dict(name='div',attrs={'class':'articleBody'})]
     keep_only_tags    = [dict(name='div',attrs={'id':'content'})]
     remove_tags       = [
-                          dict(attrs={'class':'hidden'}), 
+                        dict(name='div',
-                          dict(name=['link','meta','base','embed','object','iframe'])
+                            attrs={'id':['googleAds','moreGoogleAds','comments',
+                                'video-player-content']}),
+                        dict(name='div', attrs={'class':'cT-imageMultimedia'}),
+                        dict(name=['object','embed','iframe']),
+                        dict(attrs={'class':'hidden'}),
+                        dict(name=['link','meta','base','embed','object','iframe'])
                         ]
     remove_attributes = ['width','height','lang']
 

session.vim

@@ -27,4 +27,4 @@ vipy.session.add_content_browser('.r', ',r', 'Recipe',
     vipy.session.regexp_based_matcher(r'title\s*=\s*(?P<title>.+)', 'title', recipe_title_callback))
 EOFPY
 
-nmap \log :enew<CR>:read ! bzr log -l 500 ../.. <CR>:e ../../Changelog.yaml<CR>:e constants.py<CR>
+nmap \log :enew<CR>:read ! bzr log -l 500 <CR>:e Changelog.yaml<CR>:e src/calibre/constants.py<CR>

setup/build_environment.py

@@ -177,6 +177,7 @@ fc_error = None if os.path.exists(os.path.join(fc_inc, 'fontconfig.h')) else \
 
 
 poppler_error = None
+poppler_cflags = ['-DPNG_SKIP_SETJMP_CHECK'] if islinux else []
 if not poppler_inc_dirs or not os.path.exists(
         os.path.join(poppler_inc_dirs[0], 'OutputDev.h')):
     poppler_error = \
@@ -186,6 +187,10 @@ if not poppler_inc_dirs or not os.path.exists(
     ' the poppler XPDF headers. If your distro does not '
     ' include them you will have to re-compile poppler '
     ' by hand with --enable-xpdf-headers')
+else:
+    lh = os.path.join(poppler_inc_dirs[0], 'Link.h')
+    if 'class AnnotLink' not in open(lh, 'rb').read():
+        poppler_cflags.append('-DPOPPLER_OLD_LINK_TYPE')
 
 magick_error = None
 if not magick_inc_dirs or not os.path.exists(os.path.join(magick_inc_dirs[0],

setup/extensions.py

@@ -11,15 +11,15 @@ from distutils import sysconfig
 
 from PyQt4.pyqtconfig import QtGuiModuleMakefile
 
-from setup import Command, islinux, isfreebsd, isbsd, isosx, SRC, iswindows
+from setup import Command, islinux, isbsd, isosx, SRC, iswindows
-from setup.build_environment import fc_inc, fc_lib, chmlib_inc_dirs, \
+from setup.build_environment import (fc_inc, fc_lib, chmlib_inc_dirs,
-        fc_error, poppler_libs, poppler_lib_dirs, poppler_inc_dirs, podofo_inc, \
+        fc_error, poppler_libs, poppler_lib_dirs, poppler_inc_dirs, podofo_inc,
-        podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \
+        podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE,
-        QMAKE, msvc, MT, win_inc, win_lib, png_inc_dirs, win_ddk, \
+        QMAKE, msvc, MT, win_inc, win_lib, png_inc_dirs, win_ddk,
-        magick_inc_dirs, magick_lib_dirs, png_lib_dirs, png_libs, \
+        magick_inc_dirs, magick_lib_dirs, png_lib_dirs, png_libs,
-        magick_error, magick_libs, ft_lib_dirs, ft_libs, jpg_libs, \
+        magick_error, magick_libs, ft_lib_dirs, ft_libs, jpg_libs,
-        jpg_lib_dirs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs, \
+        jpg_lib_dirs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs,
-        icu_lib_dirs
+        icu_lib_dirs, poppler_cflags)
 MT
 isunix = islinux or isosx or isbsd
 
@@ -114,7 +114,7 @@ extensions = [
                 lib_dirs=poppler_lib_dirs+magick_lib_dirs+png_lib_dirs+ft_lib_dirs+jpg_lib_dirs,
                 inc_dirs=poppler_inc_dirs+magick_inc_dirs+png_inc_dirs,
                 error=reflow_error,
-                cflags=['-DPNG_SKIP_SETJMP_CHECK'] if islinux else []
+                cflags=poppler_cflags
                 ),
 
     Extension('lzx',

setup/iso_639/af.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:54+0000\n"
 "Last-Translator: Ysbeer <Unknown>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:35+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: af\n"
 
 #. name for aaa

setup/iso_639/am.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:15+0000\n"
+"PO-Revision-Date: 2011-09-27 17:14+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Amharic\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:53+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:36+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/ar.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:57+0000\n"
 "Last-Translator: Mohammad Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:54+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:36+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ar\n"
 
 #. name for aaa

setup/iso_639/az.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:38+0000\n"
 "Last-Translator: Vasif İsmayıloğlu MD <Unknown>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimail.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:54+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/bg.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:12+0000\n"
+"PO-Revision-Date: 2011-09-27 18:26+0000\n"
-"Last-Translator: Roumen Petrov <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:39+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: bg\n"
 
 #. name for aaa

setup/iso_639/bn_IN.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:33+0000\n"
+"PO-Revision-Date: 2011-09-27 18:18+0000\n"
 "Last-Translator: runa <runabh@gmail.com>\n"
 "Language-Team: Bengali (India) <discuss@lists.ankur.org.in>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:33+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:17+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/br.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:57+0000\n"
+"PO-Revision-Date: 2011-09-27 17:43+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Breton <brenux@free.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:56+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:38+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: br\n"
 
 #. name for aaa

setup/iso_639/bs.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 07:15+0000\n"
 "Last-Translator: Nesiren Armin <Unknown>\n"
 "Language-Team: Bosanski <kde@lugbih.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:55+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:38+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/byn.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:42+0000\n"
+"PO-Revision-Date: 2011-09-27 18:37+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Blin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:40+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/crh.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:17+0000\n"
+"PO-Revision-Date: 2011-09-27 17:24+0000\n"
 "Last-Translator: Reşat SABIQ <tilde.birlik@gmail.com>\n"
 "Language-Team: Crimean Tatar <tilde-birlik-tercime@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:41+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: crh\n"
 
 #. name for aaa

setup/iso_639/cs.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:48+0000\n"
+"PO-Revision-Date: 2011-09-27 17:51+0000\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:41+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: cs\n"
 
 #. name for aaa

setup/iso_639/cy.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 07:08+0000\n"
 "Last-Translator: Dafydd Tomos <Unknown>\n"
 "Language-Team: Welsh <cy@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: 2011-09-03 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:14+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: cy\n"
 
 #. name for aaa

setup/iso_639/da.po

@@ -16,15 +16,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 09:06+0000\n"
+"PO-Revision-Date: 2011-09-27 18:12+0000\n"
-"Last-Translator: Claus Hindsgaul <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:42+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: da\n"
 
 #. name for aaa

setup/iso_639/de.po

@@ -17,15 +17,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-09-13 16:28+0000\n"
+"PO-Revision-Date: 2011-09-27 16:28+0000\n"
-"Last-Translator: frenkx <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-14 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:45+0000\n"
-"X-Generator: Launchpad (build 13921)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: de\n"
 
 #. name for aaa

setup/iso_639/el.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:47+0000\n"
+"PO-Revision-Date: 2011-09-27 17:41+0000\n"
-"Last-Translator: Thanos Lefteris <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:05+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:48+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: el\n"
 
 #. name for aaa

setup/iso_639/eo.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:01+0000\n"
+"PO-Revision-Date: 2011-09-27 17:58+0000\n"
-"Last-Translator: Edmund GRIMLEY EVANS <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:00+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:43+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: eo\n"
 
 #. name for aaa

setup/iso_639/et.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 07:11+0000\n"
 "Last-Translator: Tõivo Leedjärv <Unknown>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:00+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:43+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: et\n"
 
 #. name for aaa

setup/iso_639/eu.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:03+0000\n"
+"PO-Revision-Date: 2011-09-27 15:37+0000\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <itzulpena@comtropos.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 04:55+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:37+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: eu\n"
 
 #. name for aaa

setup/iso_639/fa.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:07+0000\n"
+"PO-Revision-Date: 2011-09-27 17:19+0000\n"
-"Last-Translator: Roozbeh Pournader <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Persian <translation-team-fa@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:19+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:02+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: fa\n"
 
 #. name for aaa

setup/iso_639/fi.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:53+0000\n"
+"PO-Revision-Date: 2011-09-27 17:07+0000\n"
-"Last-Translator: Tommi Vainikainen <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:01+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:44+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: fi\n"
 
 #. name for aaa

setup/iso_639/fr.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:31+0000\n"
+"PO-Revision-Date: 2011-09-27 17:36+0000\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:02+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:45+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: fr\n"
 
 #. name for aaa

setup/iso_639/ga.po

@@ -14,15 +14,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:59+0000\n"
+"PO-Revision-Date: 2011-09-27 15:51+0000\n"
-"Last-Translator: Kevin Patrick Scannell <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Irish <ga@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: 2011-09-03 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:46+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ga\n"
 
 #. name for aaa

setup/iso_639/gez.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:19+0000\n"
+"PO-Revision-Date: 2011-09-27 17:12+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Geez\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:03+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:46+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/gl.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:22+0000\n"
+"PO-Revision-Date: 2011-09-27 16:34+0000\n"
-"Last-Translator: Fran Diéguez <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:47+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: gl\n"
 
 #. name for aaa

setup/iso_639/gu.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:48+0000\n"
+"PO-Revision-Date: 2011-09-27 18:46+0000\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:05+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:48+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: gu\n"
 
 #. name for aaa

setup/iso_639/he.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 06:12+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Hebrew <kde-il@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: he\n"
 
 #. name for aaa

setup/iso_639/hi.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:37+0000\n"
+"PO-Revision-Date: 2011-09-27 16:03+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Hindi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:06+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:49+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/hr.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 06:17+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:06+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: hr\n"
 
 #. name for aaa

setup/iso_639/hu.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:42+0000\n"
+"PO-Revision-Date: 2011-09-27 18:23+0000\n"
-"Last-Translator: SZERVÑC Attila <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.d.o>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "X-Poedit-Country: HUNGARY\n"
 "Language: hu\n"
 "X-Poedit-Language: Hungarian\n"

setup/iso_639/id.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:34+0000\n"
+"PO-Revision-Date: 2011-09-27 17:05+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Indonesia <de@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: 2011-09-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/is.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 09:09+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:50+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: is\n"
 
 #. name for aaa

setup/iso_639/it.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:52+0000\n"
+"PO-Revision-Date: 2011-09-27 17:49+0000\n"
 "Last-Translator: Milo Casagrande <milo@casagrande.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:08+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: it\n"
 
 #. name for aaa

setup/iso_639/ja.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:06+0000\n"
+"PO-Revision-Date: 2011-09-27 15:44+0000\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:09+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ja\n"
 
 #. name for aaa

setup/iso_639/kn.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:27+0000\n"
+"PO-Revision-Date: 2011-09-27 15:57+0000\n"
-"Last-Translator: shankar Prasad <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Kannada <debian-l10n-kannada@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:52+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: kn\n"
 
 #. name for aaa

setup/iso_639/ko.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 04:09+0000\n"
 "Last-Translator: Eungkyu Song <Unknown>\n"
 "Language-Team: Korean <ko@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: 2011-09-03 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:54+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ko\n"
 
 #. name for aaa

setup/iso_639/kok.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:49+0000\n"
+"PO-Revision-Date: 2011-09-27 17:38+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Konkani\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:11+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:53+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/lt.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:30+0000\n"
+"PO-Revision-Date: 2011-09-27 16:08+0000\n"
-"Last-Translator: Kęstutis Biliūnas <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: lt\n"
 
 #. name for aaa

setup/iso_639/lv.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 09:02+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Latvian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/mi.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 03:56+0000\n"
 "Last-Translator: James Gasson <Unknown>\n"
 "Language-Team: Maori <james.gasson@clear.net.nz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: mi\n"
 
 #. name for aaa

setup/iso_639/mk.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 03:58+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Macedonian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/mn.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:28+0000\n"
+"PO-Revision-Date: 2011-09-27 17:18+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Mongolian <mn@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: 2011-09-03 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: mn\n"
 
 #. name for aaa

setup/iso_639/mr.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:51+0000\n"
+"PO-Revision-Date: 2011-09-27 16:21+0000\n"
-"Last-Translator: Sandeep Shedmake <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: mr\n"
 
 #. name for aaa

setup/iso_639/ms.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 06:24+0000\n"
 "Last-Translator: Hasbullah Bin Pit <Unknown>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sourceforge.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:14+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/mt.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:00+0000\n"
+"PO-Revision-Date: 2011-09-27 18:49+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Maltese <mt@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: 2011-09-03 05:15+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: mt\n"
 
 #. name for aaa

setup/iso_639/nb.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:54+0000\n"
+"PO-Revision-Date: 2011-09-27 16:46+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Norsk bokmål\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:17+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/nl.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-09-15 11:31+0000\n"
+"PO-Revision-Date: 2011-09-27 16:17+0000\n"
-"Last-Translator: drMerry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-16 04:35+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:42+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: nl\n"
 
 #. name for aaa

setup/iso_639/nn.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:51+0000\n"
+"PO-Revision-Date: 2011-09-27 17:45+0000\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:16+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: nn\n"
 
 #. name for aaa

setup/iso_639/nso.po

@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:46+0000\n"
 "Last-Translator: Jerry Thobejane <Unknown>\n"
 "Language-Team: Northern Sotho <sepedi@translate.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:17+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:00+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: nso\n"
 
 #. name for aaa

setup/iso_639/oc.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:03+0000\n"
+"PO-Revision-Date: 2011-09-27 16:43+0000\n"
-"Last-Translator: Joan Luc Labòrda <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: OCCITAN <laborde@crpp.u-bordeaux.fr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:18+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:01+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/or.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:32+0000\n"
+"PO-Revision-Date: 2011-09-27 17:01+0000\n"
-"Last-Translator: Manoj Kumar Giri <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Oriya <translation-team-or@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:18+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:01+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: or\n"
 
 #. name for aaa

setup/iso_639/pa.po

@@ -13,15 +13,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:14+0000\n"
+"PO-Revision-Date: 2011-09-27 18:54+0000\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:19+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:02+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: pa\n"
 
 #. name for aaa

setup/iso_639/pl.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:49+0000\n"
+"PO-Revision-Date: 2011-09-27 18:01+0000\n"
-"Last-Translator: Jakub Bogusz <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:20+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:03+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: pl\n"
 
 #. name for aaa

setup/iso_639/ps.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:58+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Pushto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:21+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:04+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/pt.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:19+0000\n"
+"PO-Revision-Date: 2011-09-27 16:52+0000\n"
-"Last-Translator: Filipe Maia <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Portuguese <pt@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: 2011-09-03 05:20+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:04+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: pt\n"
 
 #. name for aaa

setup/iso_639/pt_BR.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:13+0000\n"
+"PO-Revision-Date: 2011-09-27 16:27+0000\n"
-"Last-Translator: Juan Carlos Castro y Castro <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Brazilian Portuguese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:17+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/ro.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:33+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:21+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:05+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ro\n"
 "PO-Creation-Date: 2000-09-24 15:45+0300\n"
 

setup/iso_639/ru.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:08+0000\n"
+"PO-Revision-Date: 2011-09-27 18:14+0000\n"
-"Last-Translator: Yuri Kozlov <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:22+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:05+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ru\n"
 
 #. name for aaa

setup/iso_639/rw.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:43+0000\n"
+"PO-Revision-Date: 2011-09-27 16:15+0000\n"
-"Last-Translator: Steve Murphy <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 04:53+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: rw\n"
 
 #. name for aaa

setup/iso_639/sk.po

@@ -10,15 +10,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:52+0000\n"
 "Last-Translator: Alastair McKinstry <Unknown>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:24+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:07+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: sk\n"
 
 #. name for aaa

setup/iso_639/sl.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:04+0000\n"
+"PO-Revision-Date: 2011-09-27 15:39+0000\n"
-"Last-Translator: Primoz Peterlin <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:24+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:08+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: sl\n"
 
 #. name for aaa

setup/iso_639/sr.po

@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:37+0000\n"
+"PO-Revision-Date: 2011-09-27 15:42+0000\n"
-"Last-Translator: Данило Шеган <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:06+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: sr\n"
 
 #. name for aaa

setup/iso_639/sr@latin.po

@@ -7,15 +7,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:12+0000\n"
+"PO-Revision-Date: 2011-09-27 18:43+0000\n"
-"Last-Translator: Данило Шеган <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:35+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:19+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: sr\n"
 
 #. name for aaa

setup/iso_639/sv.po

@@ -29,15 +29,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:54+0000\n"
+"PO-Revision-Date: 2011-09-27 16:53+0000\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\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: 2011-09-03 05:25+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:09+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: sv\n"
 
 #. name for aaa

setup/iso_639/ta.po

@@ -12,15 +12,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 08:05+0000\n"
+"PO-Revision-Date: 2011-09-27 16:31+0000\n"
 "Last-Translator: Felix <ifelix25@gmail.com>\n"
 "Language-Team: Tamil <gnome-tamil-translation@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:09+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "X-Poedit-Country: INDIA\n"
 "Language: ta\n"
 "X-Poedit-Language: Tamil\n"

setup/iso_639/th.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:45+0000\n"
+"PO-Revision-Date: 2011-09-27 17:26+0000\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: th\n"
 
 #. name for aaa

setup/iso_639/ti.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 04:27+0000\n"
+"PO-Revision-Date: 2011-09-27 16:09+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Tigrinya\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:12+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/tig.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:46+0000\n"
+"PO-Revision-Date: 2011-09-27 18:04+0000\n"
-"Last-Translator: Alastair McKinstry <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Tigre\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:11+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/tr.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-09-01 09:30+0000\n"
+"PO-Revision-Date: 2011-09-27 18:36+0000\n"
-"Last-Translator: zeugma <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:12+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: tr\n"
 
 #. name for aaa

setup/iso_639/tt.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 07:06+0000\n"
+"PO-Revision-Date: 2011-09-27 17:53+0000\n"
 "Last-Translator: al Beri <tatarish.l10n@gmail.com>\n"
 "Language-Team: Tatarish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/uk.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 05:12+0000\n"
+"PO-Revision-Date: 2011-09-27 15:33+0000\n"
-"Last-Translator: yurchor <Unknown>\n"
+"Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:29+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:13+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: uk\n"
 
 #. name for aaa

setup/iso_639/ve.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 07:51+0000\n"
 "Last-Translator: Fhatuwani Rambau <Unknown>\n"
 "Language-Team: Venda <venda@translate.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:30+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:13+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: ve\n"
 
 #. name for aaa

setup/iso_639/vi.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:03+0000\n"
+"PO-Revision-Date: 2011-09-27 16:56+0000\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:30+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:14+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: vi\n"
 
 #. name for aaa

setup/iso_639/wa.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 03:42+0000\n"
+"PO-Revision-Date: 2011-09-27 15:35+0000\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:31+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:15+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/xh.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 05:51+0000\n"
 "Last-Translator: Antoinette Dekeni <Unknown>\n"
 "Language-Team: Xhosa <xhosa@translate.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:32+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:15+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: xh\n"
 
 #. name for aaa

setup/iso_639/zh_CN.po

@@ -10,16 +10,16 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-08-27 06:16+0000\n"
+"PO-Revision-Date: 2011-09-27 18:09+0000\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-"
 "cn@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:35+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:18+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: zh_CN\n"
 
 #. name for aaa

setup/iso_639/zh_TW.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 03:30+0000\n"
 "Last-Translator: Joe Man <Unknown>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:18+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: \n"
 
 #. name for aaa

setup/iso_639/zu.po

@@ -9,15 +9,15 @@ msgstr ""
 "Project-Id-Version: iso_639_3\n"
 "Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-"
 "devel@lists.alioth.debian.org>\n"
-"POT-Creation-Date: 2011-09-02 16:21+0000\n"
+"POT-Creation-Date: 2011-09-27 14:31+0000\n"
 "PO-Revision-Date: 2011-08-27 08:38+0000\n"
 "Last-Translator: Thobile Mhlongo <Unknown>\n"
 "Language-Team: Zulu <zulu@translate.org.za>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-03 05:33+0000\n"
+"X-Launchpad-Export-Date: 2011-09-28 05:16+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Generator: Launchpad (build 14049)\n"
 "Language: zu\n"
 
 #. name for aaa

src/calibre/constants.py

@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 8, 20)
+numeric_version = (0, 8, 21)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 

src/calibre/customize/builtins.py

@@ -555,7 +555,7 @@ from calibre.devices.irexdr.driver import IREXDR1000, IREXDR800
 from calibre.devices.jetbook.driver import JETBOOK, MIBUK, JETBOOK_MINI
 from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX
 from calibre.devices.nook.driver import NOOK, NOOK_COLOR
-from calibre.devices.prs505.driver import PRS505
+from calibre.devices.prs505.driver import PRS505, PRST1
 from calibre.devices.user_defined.driver import USER_DEFINED
 from calibre.devices.android.driver import ANDROID, S60, WEBOS
 from calibre.devices.nokia.driver import N770, N810, E71X, E52
@@ -657,7 +657,7 @@ plugins += [
     KINDLE2,
     KINDLE_DX,
     NOOK, NOOK_COLOR,
-    PRS505,
+    PRS505, PRST1,
     ANDROID, S60, WEBOS,
     N770,
     E71X,

src/calibre/devices/android/driver.py

@@ -77,8 +77,12 @@ class ANDROID(USBMS):
                        0xdeed : [0x0222],
                      },
 
-            # Viewsonic
+            # Viewsonic/Vizio
-            0x0489 : { 0xc001 : [0x0226], 0xc004 : [0x0226], },
+            0x0489 : {
+                    0xc001 : [0x0226],
+                    0xc004 : [0x0226],
+                    0x8801 : [0x0226, 0x0227],
+            },
 
             # Acer
             0x502 : { 0x3203 : [0x0100, 0x224]},
@@ -134,7 +138,7 @@ class ANDROID(USBMS):
     VENDOR_NAME      = ['HTC', 'MOTOROLA', 'GOOGLE_', 'ANDROID', 'ACER',
             'GT-I5700', 'SAMSUNG', 'DELL', 'LINUX', 'GOOGLE', 'ARCHOS',
             'TELECHIP', 'HUAWEI', 'T-MOBILE', 'SEMC', 'LGE', 'NVIDIA',
-            'GENERIC-', 'ZTE', 'MID', 'QUALCOMM', 'PANDIGIT']
+            'GENERIC-', 'ZTE', 'MID', 'QUALCOMM', 'PANDIGIT', 'HYSTON', 'VIZIO']
     WINDOWS_MAIN_MEM = ['ANDROID_PHONE', 'A855', 'A853', 'INC.NEXUS_ONE',
             '__UMS_COMPOSITE', '_MB200', 'MASS_STORAGE', '_-_CARD', 'SGH-I897',
             'GT-I9000', 'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID',
@@ -144,11 +148,12 @@ class ANDROID(USBMS):
             '7', 'A956', 'A955', 'A43', 'ANDROID_PLATFORM', 'TEGRA_2',
             'MB860', 'MULTI-CARD', 'MID7015A', 'INCREDIBLE', 'A7EB', 'STREAK',
             'MB525', 'ANDROID2.3', 'SGH-I997', 'GT-I5800_CARD', 'MB612',
-            'GT-S5830_CARD', 'GT-S5570_CARD', 'MB870', 'MID7015A', 'ALPANDIGITAL']
+            'GT-S5830_CARD', 'GT-S5570_CARD', 'MB870', 'MID7015A',
+            'ALPANDIGITAL', 'ANDROID_MID', 'VTAB1008']
     WINDOWS_CARD_A_MEM = ['ANDROID_PHONE', 'GT-I9000_CARD', 'SGH-I897',
             'FILE-STOR_GADGET', 'SGH-T959', 'SAMSUNG_ANDROID', 'GT-P1000_CARD',
             'A70S', 'A101IT', '7', 'INCREDIBLE', 'A7EB', 'SGH-T849_CARD',
-            '__UMS_COMPOSITE', 'SGH-I997_CARD', 'MB870', 'ALPANDIGITAL']
+            '__UMS_COMPOSITE', 'SGH-I997_CARD', 'MB870', 'ALPANDIGITAL', 'ANDROID_MID']
 
     OSX_MAIN_MEM = 'Android Device Main Memory'
 

src/calibre/devices/prs505/driver.py

@@ -19,7 +19,8 @@ class PRS505(USBMS):
 
     name           = 'SONY Device Interface'
     gui_name       = 'SONY Reader'
-    description    = _('Communicate with all the Sony eBook readers.')
+    description    = _('Communicate with Sony eBook readers older than the'
+            ' PRST1.')
     author         = 'Kovid Goyal'
     supported_platforms = ['windows', 'osx', 'linux']
     path_sep = '/'
@@ -298,3 +299,34 @@ class PRS505(USBMS):
                 f.write(metadata.thumbnail[-1])
             debug_print('Cover uploaded to: %r'%cpath)
 
+class PRST1(USBMS):
+    name           = 'SONY PRST1 and newer Device Interface'
+    gui_name       = 'SONY Reader'
+    description    = _('Communicate with Sony PRST1 and newer eBook readers')
+    author         = 'Kovid Goyal'
+    supported_platforms = ['windows', 'osx', 'linux']
+
+    FORMATS      = ['epub', 'lrf', 'lrx', 'rtf', 'pdf', 'txt']
+    VENDOR_ID    = [0x054c]   #: SONY Vendor Id
+    PRODUCT_ID   = [0x05c2]
+    BCD          = [0x226]
+
+    VENDOR_NAME        = 'SONY'
+    WINDOWS_MAIN_MEM   = re.compile(
+            r'(PRS-T1&)'
+            )
+
+    THUMBNAIL_HEIGHT = 217
+    SCAN_FROM_ROOT = True
+    EBOOK_DIR_MAIN = __appname__
+
+
+    def windows_filter_pnp_id(self, pnp_id):
+        return '_LAUNCHER' in pnp_id or '_SETTING' in pnp_id
+
+    def get_carda_ebook_dir(self, for_upload=False):
+        if for_upload:
+            return __appname__
+        return self.EBOOK_DIR_CARD_A
+
+

src/calibre/ebooks/lrf/objects.py

@@ -452,24 +452,26 @@ class BlockAttr(StyleObject, LRFObject):
     @classmethod
     def to_css(cls, obj, inline=False):
         ans = ''
+
         def item(line):
-            ans += '' if inline else '\t'
+            ans = '' if inline else '\t'
             ans += line
             ans += ' ' if inline else '\n'
+            return ans
 
         if hasattr(obj, 'sidemargin'):
             margin = str(obj.sidemargin) + 'px'
-            item('margin-left: %(m)s; margin-right: %(m)s;'%dict(m=margin))
+            ans += item('margin-left: %(m)s; margin-right: %(m)s;'%dict(m=margin))
         if hasattr(obj, 'topskip'):
-            item('margin-top: %dpx;'%obj.topskip)
+            ans += item('margin-top: %dpx;'%obj.topskip)
         if hasattr(obj, 'footskip'):
-            item('margin-bottom: %dpx;'%obj.footskip)
+            ans += item('margin-bottom: %dpx;'%obj.footskip)
         if hasattr(obj, 'framewidth'):
-            item('border: solid %dpx'%obj.framewidth)
+            ans += item('border: solid %dpx'%obj.framewidth)
         if hasattr(obj, 'framecolor') and obj.framecolor.a < 255:
-            item('border-color: %s;'%obj.framecolor.to_html())
+            ans += item('border-color: %s;'%obj.framecolor.to_html())
         if hasattr(obj, 'bgcolor') and obj.bgcolor.a < 255:
-            item('background-color: %s;'%obj.bgcolor.to_html())
+            ans += item('background-color: %s;'%obj.bgcolor.to_html())
 
         return ans
 
@@ -480,39 +482,41 @@ class TextCSS(object):
     @classmethod
     def to_css(cls, obj, inline=False):
         ans = ''
+
         def item(line):
-            ans += '' if inline else '\t'
+            ans = '' if inline else '\t'
             ans += line
             ans += ' ' if inline else '\n'
+            return ans
 
         fs = getattr(obj, 'fontsize', None)
         if fs is not None:
-            item('font-size: %fpt;'%(int(fs)/10.))
+            ans += item('font-size: %fpt;'%(int(fs)/10.))
         fw = getattr(obj, 'fontweight', None)
         if fw is not None:
-            item('font-weight: %s;'%('bold' if int(fw) >= 700 else 'normal'))
+            ans += item('font-weight: %s;'%('bold' if int(fw) >= 700 else 'normal'))
         fn = getattr(obj, 'fontfacename', None)
         if fn is not None:
             fn = cls.FONT_MAP[fn]
-            item('font-family: %s;'%fn)
+            ans += item('font-family: %s;'%fn)
         fg = getattr(obj, 'textcolor', None)
         if fg is not None:
             fg = fg.to_html()
-            item('color: %s;'%fg)
+            ans += item('color: %s;'%fg)
         bg = getattr(obj, 'textbgcolor', None)
         if bg is not None:
             bg = bg.to_html()
-            item('background-color: %s;'%bg)
+            ans += item('background-color: %s;'%bg)
         al = getattr(obj, 'align', None)
         if al is not None:
             al = dict(head='left', center='center', foot='right')
-            item('text-align: %s;'%al)
+            ans += item('text-align: %s;'%al)
         lh = getattr(obj, 'linespace', None)
         if lh is not None:
-            item('text-align: %fpt;'%(int(lh)/10.))
+            ans += item('text-align: %fpt;'%(int(lh)/10.))
         pi = getattr(obj, 'parindent', None)
         if pi is not None:
-            item('text-indent: %fpt;'%(int(pi)/10.))
+            ans += item('text-indent: %fpt;'%(int(pi)/10.))
 
         return ans
 

src/calibre/ebooks/pdf/reflow.cpp

@@ -625,11 +625,7 @@ static string get_link_dest(LinkAction *link, PDFDoc *doc) {
   return oss.str();
 }
 
-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
-void XMLOutputDev::process_link(Link* link){
-#else
 void XMLOutputDev::process_link(AnnotLink* link){
-#endif
 
   double _x1, _y1, _x2, _y2;
   int x1, y1, x2, y2;

src/calibre/ebooks/pdf/reflow.h

@@ -41,6 +41,9 @@ using namespace std;
 
 namespace calibre_reflow {
 
+#ifdef POPPLER_OLD_LINK_TYPE
+#define AnnotLink Link
+#endif
 
 enum UnicodeTextDirection {
   text_dir_unknown,
@@ -244,11 +247,7 @@ class XMLOutputDev : public OutputDev {
     XMLImages *images;
     PDFDoc *doc;
 
-#if (POPPLER_MAJOR_VERSION == 0) && (POPPLER_MINOR_VERSION < 17)
-    void process_link(Link* link);
-#else
     void process_link(AnnotLink* link);
-#endif
 
 };
 }

src/calibre/gui2/book_details.py

@@ -85,6 +85,8 @@ def render_data(mi, use_roman_numbers=True, all_fields=False):
 
     for field, display in get_field_list(fm):
         metadata = fm.get(field, None)
+        if field == 'sort':
+            field = 'title_sort'
         if all_fields:
             display = True
         if (not display or not metadata or mi.is_null(field) or