]+metronieuws\.nl/[^>]+/templates/[^>]+jpe?g[^>]+>|metronieuws\.nl/internal\-roxen\-unit\.gif)', re.DOTALL|re.IGNORECASE),
+ lambda match: ''),
]
+ def preprocess_html(self, soup):
+ if SHOWDEBUG0 == True:
+ mlog.setdefaults()
+ mlog.addTextAndTag(['Show debug = on with level'], [str(mlog.debuglevel)])
+ if KEEPSTATS == True:
+ mlog.addDebug('Stats will be calculated')
+ else:
+ mlog.addTextAndTag(['Stats won\'t be calculated\nTo be enabled, stats must be true, currently','and debug level must be 1 or higher, currently'],[mstat.dokeepmystats, mlog.debuglevel])
+ mlog.showDebug()
+ myProcess = MerryProcess()
+ myProcess.removeUnwantedTags(soup)
+ return soup
+
def postprocess_html(self, soup, first):
- for tag in soup.findAll(lambda tag: tag.name.lower()=='img' and tag.has_key('src')):
- iurl = tag['src']
- img = Image()
- img.open(iurl)
- img.trim(0)
- img.save(iurl)
+ myProcess = MerryProcess()
+ myProcess.optimizeLayout(soup)
+ if SHOWDEBUG0 == True:
+ if KEEPSTATS == True:
+ statinfo = 'generated stats:'
+ statinfo += str(mstat.stats(mstat.statslist))
+ print statinfo
+ statinfo = 'generated stats (for removed tags):'
+ statinfo += str(mstat.stats(mstat.removedtagslist))
+ print statinfo
+ #show all Debug info we forgot to report
+ #Using print to be sure that this text will not be added at the end of the log.
+ print '\n!!!!!unreported messages:\n(should be empty)\n'
+ mlog.showDebug()
return soup
feeds = [
@@ -95,6 +127,291 @@ class AdvancedUserRecipe1306097511(BasicNewsRecipe):
(u'Familie', u'http://www.metronieuws.nl/rss.xml?c=1283166782-9'),
(u'Blogs', u'http://www.metronieuws.nl/rss.xml?c=1295586825-6'),
(u'Reizen', u'http://www.metronieuws.nl/rss.xml?c=1277377288-13'),
- (u'Carrière', u'http://www.metronieuws.nl/rss.xml?c=1278070988-1'),
+ (u'Carrière', u'http://www.metronieuws.nl/rss.xml?c=1278070988-1'),
(u'Sport', u'http://www.metronieuws.nl/rss.xml?c=1277377288-12')
]
+
+class MerryPreProcess():
+ def replacePictures(self, soup):
+ #to be implemented
+ return soup
+
+ def optimizePicture(self,soup):
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('start image optimize')
+ for tag in soup.findAll(lambda tag: tag.name.lower()=='img' and tag.has_key('src')):
+ iurl = tag['src']
+ img = Image()
+ img.open(iurl)
+ img.trim(0)
+ img.save(iurl)
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('Images optimized')
+ mlog.showDebug()
+ return soup
+
+class MerryExtract():
+ def safeRemovePart(self, killingSoup, soupIsArray):
+ if killingSoup and not killingSoup == None:
+ if SHOWDEBUG2 == True:
+ mlog.addTextAndTag(['items to remove'],[killingSoup])
+ try:
+ if soupIsArray == True:
+ for killer in killingSoup:
+ killer.extract()
+ else:
+ killingSoup.extract()
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('tag extracted')
+ mlog.showDebug()
+ if KEEPSTATS == True:
+ try:
+ mstat.addstat(mstat.removedtagslist,str(killingSoup.name))
+ except:
+ mstat.addstat(mstat.removedtagslist,'unknown')
+ except:
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('tag extraction failed')
+ mlog.showDebug()
+ if KEEPSTATS == True:
+ mstat.addstat(mstat.removedtagslist,'exception')
+ return False
+ else:
+ return False
+ return killingSoup
+
+class MerryReplace():
+ myKiller = MerryExtract()
+ def replaceATag(self, soup):
+ anchors = []
+ anchors = soup.findAll('a')
+ if anchors and not (anchors == None or anchors == []):
+ try:
+ for link in anchors:
+ # print str(link)
+ if link and not link == None:
+ # print ('type: %s'%(str(type(link))))
+ # print ('link: %s' % (link))
+ myParent = link.parent
+ # print str('parent: %s'%(myParent))
+ try:
+ myIndex = link.parent.index(link)
+ hasIndex = True
+ except:
+ myIndex = 0
+ hasIndex = False
+ # print str('index %s'%(myIndex))
+ if not link.string == None:
+ # print 'link=notnone'
+ if hasIndex == True:
+ myParent.insert(myIndex, link.string)
+ else:
+ myParent.append(link.string)
+ else:
+ # print 'link=none'
+ myParent.insert(myIndex, link.contents)
+ self.myKiller.safeRemovePart(link, False)
+ else:
+ notshown = 'tag received is empty' # print
+ except:
+ notshown = 'tag received is empty' # print
+ notshown
+ return soup
+
+class MerryProcess(BeautifulSoup):
+ myKiller = MerryExtract()
+ myReplacer = MerryReplace()
+ myPrepare = MerryPreProcess()
+
+ def optimizeLayout(self,soup):
+ self.myPrepare.optimizePicture(soup)
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('End of Optimize Layout')
+ mlog.showDebug()
+ return soup
+
+ def insertFacts(self, soup):
+ allfacts = soup.findAll('div', {'class':re.compile('^article-box-fact.*$')})
+ if SHOWDEBUG0 == True:
+ mlog.addTextAndTag(['allfacts'],[allfacts])
+ mlog.showDebug()
+ if allfacts and not allfacts == None:
+ allfactsparent = soup.find('div', {'class':re.compile('^article-box-fact.*$')}).parent
+ if SHOWDEBUG0 == True:
+ mlog.addTextAndTag(['allfactsparent'],[allfactsparent])
+ mlog.showDebug()
+ for part in allfactsparent:
+ if not part in allfacts:
+ if SHOWDEBUG0 == True:
+ mlog.addTextAndTag(['FOUND A non-fact'],[part])
+ mlog.showDebug()
+ self.myKiller.safeRemovePart(part, True)
+ if SHOWDEBUG1 == True:
+ mlog.addTextAndTag(['New All Facts'],[allfacts])
+ mlog.showDebug()
+ articlefacts = soup.find('div', {'class':'article-box-fact column'})
+ errorOccured=False
+ if (articlefacts and not articlefacts==None):
+ try:
+ contenttag = soup.find('div', {'class':'article-body'})
+ if SHOWDEBUG0 == True:
+ mlog.addTextAndTag(['curcontag'],[contenttag])
+ mlog.showDebug()
+ foundrighttag = False
+ if contenttag and not contenttag == None:
+ foundrighttag = True
+ if SHOWDEBUG0 == True:
+ if errorOccured == False:
+ mlog.addTextAndTag(['type','curcontag (in while)'],[type(contenttag),contenttag])
+ else:
+ mlog.addDebug('Could not find right parent tag. Error Occured')
+ mlog.showDebug()
+ if foundrighttag == True:
+ contenttag.insert(0, allfactsparent)
+ if SHOWDEBUG2 == True:
+ mlog.addTextAndTag(['added parent'],[soup.prettify()])
+ mlog.showDebug()
+ except:
+ errorOccured=True
+ mlog.addTrace()
+ else:
+ errorOccured=True
+ if SHOWDEBUG0 == True and errorOccured == True:
+ mlog.addTextAndTag(['no articlefacts'],[articlefacts])
+ mlog.showDebug()
+ return soup
+
+ def previousNextSibRemover(self, soup, previous=True, soupIsArray=False):
+ findsibsof = soup
+ firstpart = previous
+ if findsibsof and not findsibsof == None:
+ if soupIsArray == True:
+ for foundsib in findsibsof:
+ self.previousNextSibRemover(foundsib, firstpart, soupIsArray=False)
+ else:
+ if firstpart == True and soupIsArray == False:
+ sibs = findsibsof.previousSiblingGenerator()
+ else:
+ sibs = findsibsof.nextSiblingGenerator()
+ for sib in sibs:
+ self.myKiller.safeRemovePart(sib, True)
+ else:
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Not any sib found')
+ return
+
+ def removeUnwantedTags(self,soup):
+ if SHOWDEBUG1 == True:
+ mlog.addTextAndTag(['Len of Soup before RemoveTagsByName'],[len(str(soup))])
+ mlog.showDebug()
+ self.removeTagsByName(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before firstandlastpart: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.insertFacts(soup)
+ self.removeFirstAndLastPart(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before unwantedpart: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.removeUnwantedParts(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before EmptyParts: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.removeEmptyTags(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup after EmptyParts: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.myReplacer.replaceATag(soup)
+ return soup
+
+ def removeUnwantedParts(self, soup):
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before UnwantedID: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.removeUnwantedTagsByID(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before Class: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.removeUnwantedTagsByClass(soup)
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('Len of Soup before Style: %s' % len(str(soup)))
+ mlog.showDebug()
+ self.removeUnwantedTagsByStyle(soup)
+ return soup
+
+ def removeUnwantedTagsByStyle(self,soup):
+ self.removeArrayOfTags(soup.findAll(attrs={'style' : re.compile("^(.*(display\s?:\s?none|img-mask|white)\s?;?.*)$")}))
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('end remove by style')
+ return soup
+
+ def removeArrayOfTags(self,souparray):
+ return self.myKiller.safeRemovePart(souparray, True)
+
+ def removeUnwantedTagsByClass(self,soup):
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('start remove by class')
+ self.removeArrayOfTags(soup.findAll("div", { "class" :re.compile('^(promo.*?|article-tools-below-title|metroCommentFormWrap|ad|share-tools|tools|header-links|related-links|padding-top-15)$')}))
+ return soup
+
+ def removeUnwantedTagsByID(self,soup):
+ defaultids = ['footer-extra',re.compile('^ad(\d+|adcomp.*?)?$'),'column-4-5','navigation','header',re.compile('^column-1-5-(top|bottom)$'),'footer','hidden_div','sidebar',re.compile('^article-\d$'),'comments','footer']
+ for removeid in defaultids:
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('RemoveTagByID, tag: %s, Len of Soup: %s' % (str(removeid), len(str(soup))))
+ mlog.showDebug()
+ self.removeArrayOfTags(soup.findAll(id=removeid))
+ return soup
+
+ # def safeRemoveTag(self, subtree):
+ # return self.myKiller.safeRemovePart(subtree, True)
+
+
+ def removeTagsByName(self, soup):
+ self.myKiller.safeRemovePart(soup.script, True)
+ self.myKiller.safeRemovePart(soup.iframe, True)
+ self.myKiller.safeRemovePart(soup.style, True)
+ self.myKiller.safeRemovePart(soup.noscript, True)
+ return soup
+
+ def removeEmptyTags(self,soup,run=0):
+ if SHOWDEBUG0 == True:
+ mlog.addDebug('starting removeEmptyTags')
+ if SHOWDEBUG1 == True:
+ run += 1
+ mlog.addDebug(run)
+ if SHOWDEBUG2 == True:
+ mlog.addDebug(str(soup.prettify()))
+ mlog.showDebug()
+ emptymatches = re.compile('^( |\s|\n|\r|\t)*$')
+ emptytags = soup.findAll(lambda tag: tag.find(True) is None and (tag.string is None or tag.string.strip()=="" or tag.string.strip()==emptymatches) and not tag.isSelfClosing)
+ if emptytags and not (emptytags == None or emptytags == []):
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('tags found')
+ mlog.addDebug(str(emptytags))
+ self.removeArrayOfTags(emptytags)
+ #recursive in case removing empty tag creates new empty tag
+ self.removeEmptyTags(soup, run=run)
+ else:
+ if SHOWDEBUG1 == True:
+ mlog.addDebug('no empty tags found')
+ mlog.showDebug()
+ if SHOWDEBUG0 == True:
+ if SHOWDEBUG2 == True:
+ mlog.addDebug('new soup:')
+ mlog.addDebug(str(soup.prettify()))
+ mlog.addDebug('RemoveEmptyTags Completed')
+ mlog.showDebug()
+ return soup
+
+ def removeFirstAndLastPart(self,soup):
+ def findparenttag(lookuptag):
+ if lookuptag and not lookuptag == None:
+ return lookuptag.findParents()
+ findtag = soup.find(id="date")
+ self.previousNextSibRemover(findtag, previous=True, soupIsArray=False)
+ self.previousNextSibRemover(findparenttag(findtag), previous=True, soupIsArray=True)
+ for endtag in [soup.find(id="share-and-byline"), soup.find("div", { "class" : "gallery-text" })]:
+ self.previousNextSibRemover(endtag, previous=False, soupIsArray=False)
+ self.previousNextSibRemover(findparenttag(endtag), previous=False, soupIsArray=True)
+ return soup
diff --git a/recipes/ming_pao.recipe b/recipes/ming_pao.recipe
index 9e9522f26e..d79125edee 100644
--- a/recipes/ming_pao.recipe
+++ b/recipes/ming_pao.recipe
@@ -24,6 +24,7 @@ __Date__ = ''
'''
Change Log:
+2011/12/01: take care of situation that in txt source parsing, the article content does start with special character u'\u3010'
2011/10/21: fix a bug that hi-res img is unavailable in pages parsed from source txt
2011/10/19: fix a bug in txt source parsing
2011/10/17: disable fetching of premium content, also improved txt source parsing
@@ -533,12 +534,22 @@ class MPRecipe(BasicNewsRecipe):
new_raw_html = 'Untitled'
next_is_img_txt = False
title_started = False
+ title_break_reached = False
met_article_start_char = False
for item in splitter.split(raw_html):
item = item.strip()
- if item.startswith(u'\u3010'):
- met_article_start_char = True
- new_raw_html = new_raw_html + '
' + item + '
\n'
+ # if title already reached but break between title and content not yet found, record title_break_reached
+ if title_started == True and title_break_reached == False and item == '':
+ title_break_reached = True
+ # if title reached and title_break_reached and met_article_start_char == False and item is not empty
+ # start content
+ elif title_started == True and title_break_reached == True and met_article_start_char == False:
+ if item <> '':
+ met_article_start_char = True
+ new_raw_html = new_raw_html + '
' + item + '
\n'
+ #if item.startswith(u'\u3010'):
+ # met_article_start_char = True
+ # new_raw_html = new_raw_html + '
' + item + '
\n'
else:
if next_is_img_txt == False:
if item.startswith("=@"):
@@ -787,3 +798,4 @@ class MPRecipe(BasicNewsRecipe):
with nested(open(opf_path, 'wb'), open(ncx_path, 'wb')) as (opf_file, ncx_file):
opf.render(opf_file, ncx_file)
+
diff --git a/recipes/sueddeutsche.recipe b/recipes/sueddeutsche.recipe
index ae5ddedf02..8e80150d7d 100644
--- a/recipes/sueddeutsche.recipe
+++ b/recipes/sueddeutsche.recipe
@@ -12,7 +12,7 @@ class Sueddeutsche(BasicNewsRecipe):
title = u'sueddeutsche.de'
description = 'News from Germany'
- __author__ = 'Oliver Niesner and Armin Geller'
+ __author__ = 'Oliver Niesner and Armin Geller' #AGe 2011-11-25
use_embedded_content = False
timefmt = ' [%d %b %Y]'
oldest_article = 7
@@ -22,7 +22,7 @@ class Sueddeutsche(BasicNewsRecipe):
encoding = 'utf-8'
remove_javascript = True
-
+ cover_url = 'http://polpix.sueddeutsche.com/polopoly_fs/1.1219199.1322239289!/image/image.jpg_gen/derivatives/860x860/image.jpg' # 2011-11-25 AGe
remove_tags = [ dict(name='link'), dict(name='iframe'),
dict(name='div', attrs={'id':["bookmarking","themenbox","artikelfoot","CAD_AD",
@@ -47,7 +47,7 @@ class Sueddeutsche(BasicNewsRecipe):
extra_css = '''
h2{font-family:Arial,Helvetica,sans-serif; font-size: x-small; color: #003399;}
- a{font-family:Arial,Helvetica,sans-serif; font-size: x-small; font-style:italic;}
+ a{font-family:Arial,Helvetica,sans-serif; font-style:italic;}
.dachzeile p{font-family:Arial,Helvetica,sans-serif; font-size: x-small; }
h1{ font-family:Arial,Helvetica,sans-serif; font-size:x-large; font-weight:bold;}
.artikelTeaser{font-family:Arial,Helvetica,sans-serif; font-size: x-small; font-weight:bold; }
diff --git a/recipes/tvxs.recipe b/recipes/tvxs.recipe
new file mode 100644
index 0000000000..86ba5e38dc
--- /dev/null
+++ b/recipes/tvxs.recipe
@@ -0,0 +1,58 @@
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class TVXS(BasicNewsRecipe):
+ title = 'TVXS'
+ __author__ = 'hargikas'
+ description = 'News from Greece'
+ max_articles_per_feed = 100
+ oldest_article = 100
+ publisher = 'TVXS'
+ category = 'news, GR'
+ language = 'el'
+ encoding = None
+ #conversion_options = { 'linearize_tables': True}
+ no_stylesheets = True
+ remove_tags_before = dict(name='h1',attrs={'class':'print-title'})
+ remove_tags_after = dict(name='div',attrs={'class':'field field-type-relevant-content field-field-relevant-articles'})
+ remove_attributes = ['width', 'src', 'header', 'footer']
+
+
+ feeds = [(u'Ελλάδα', 'http://tvxs.gr/feeds/2/feed.xml'),
+ (u'Κόσμος', 'http://tvxs.gr/feeds/5/feed.xml'),
+ (u'Τοπικά Νέα', 'http://tvxs.gr/feeds/5363/feed.xml'),
+ (u'Sci Tech', 'http://tvxs.gr/feeds/26/feed.xml'),
+ (u'Αθλητικά', 'http://tvxs.gr/feeds/243/feed.xml'),
+ (u'Internet & ΜΜΕ', 'http://tvxs.gr/feeds/32/feed.xml'),
+ (u'Καλά Νέα', 'http://tvxs.gr/feeds/914/feed.xml'),
+ (u'Απόψεις', 'http://tvxs.gr/feeds/1109/feed.xml'),
+ (u'Πολιτισμός', 'http://tvxs.gr/feeds/1317/feed.xml'),
+ (u'Greenlife', 'http://tvxs.gr/feeds/3/feed.xml'),
+ (u'Ιστορία', 'http://tvxs.gr/feeds/1573/feed.xml'),
+ (u'Χιούμορ', 'http://tvxs.gr/feeds/692/feed.xml')]
+
+
+ def print_version(self, url):
+ import urllib2, urlparse, StringIO, gzip
+
+ fp = urllib2.urlopen(url)
+ data = fp.read()
+ if fp.info()['content-encoding'] == 'gzip':
+ gzip_data = StringIO.StringIO(data)
+ gzipper = gzip.GzipFile(fileobj=gzip_data)
+ data = gzipper.read()
+ fp.close()
+
+ pos_1 = data.find('', pos_1)
+ if pos_2 == -1:
+ return url
+
+ pos_1 += len('1:
+ continue
+ atag = atags[0]
+ url = atag['href']
+ if url.startswith('/'):
+ url = self.INDEX + url
+ if url in seen_urls:
+ continue
+ seen_urls.add(url)
+ title = self.tag_to_string(atag)
+ self.log('\tFound article:', title)
+ self.log('\t', url)
+ par = header.findParent('article') if tag.startswith('online/') else header.findParent('section')
+ if par is not None:
+ desc = par.find(attrs={'class':'body '})
+ desc = self.tag_to_string(desc) if desc else ''
+ #self.log('\t', desc)
+ if add_featured:
+ features.append({'title':title,'url':url,'description':desc})
+ add_featured = False
+ else:
+ articles.append({'title':title,'url':url,'description':desc})
+ if len(articles) >= max_articles:
+ break
+
+ if articles:
+ feeds.append((cat_name, articles))
+
+ if features:
+ feeds.insert(0,('Featured', features))
+
+ return feeds
+
+ def print_version(self, url):
+ return url.replace('.html', '.print')
diff --git a/setup/install.py b/setup/install.py
index cceab05ab7..9bf8fa9505 100644
--- a/setup/install.py
+++ b/setup/install.py
@@ -283,8 +283,7 @@ class Install(Develop):
class Sdist(Command):
description = 'Create a source distribution'
- DEST = os.path.join('dist', '%s-%s.tar.gz'%(__appname__, __version__))
-
+ DEST = os.path.join('dist', '%s-%s.tar.xz'%(__appname__, __version__))
def run(self, opts):
if not self.e(self.d(self.DEST)):
@@ -313,7 +312,7 @@ class Sdist(Command):
shutil.copy2(f, dest)
self.info('\tCreating tarfile...')
- subprocess.check_call(['tar', '-czf', self.a(self.DEST),
+ subprocess.check_call(['tar', '-cJf', self.a(self.DEST),
'calibre'], cwd=self.d(tdir))
def clean(self):
diff --git a/setup/iso_639/af.po b/setup/iso_639/af.po
index 1b06442c55..6f50f0c8e4 100644
--- a/setup/iso_639/af.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:54+0000\n"
"Last-Translator: Ysbeer \n"
"Language-Team: Afrikaans \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-28 04:35+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:05+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: af\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/am.po b/setup/iso_639/am.po
index a884ccb9c6..3c33c43ecf 100644
--- a/setup/iso_639/am.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:14+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:36+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:05+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ar.po b/setup/iso_639/ar.po
index f5bc78d171..4fa51be7bd 100644
--- a/setup/iso_639/ar.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:57+0000\n"
"Last-Translator: Mohammad Gamal \n"
"Language-Team: Arabic \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-28 04:36+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:06+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ar\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/az.po b/setup/iso_639/az.po
index 14e73de9d4..cb75b8c3da 100644
--- a/setup/iso_639/az.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:38+0000\n"
"Last-Translator: Vasif İsmayıloğlu MD \n"
"Language-Team: Azerbaijani Turkish \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-28 04:37+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:06+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/bg.po b/setup/iso_639/bg.po
index dea59ab657..9d82affa19 100644
--- a/setup/iso_639/bg.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:26+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Bulgarian \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-28 04:39+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:08+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: bg\n"
#. name for aaa
@@ -17954,8 +17954,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr "Долно саксонски"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/bn_IN.po b/setup/iso_639/bn_IN.po
index 4ed19cfe44..aff9825d50 100644
--- a/setup/iso_639/bn_IN.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:18+0000\n"
"Last-Translator: runa \n"
"Language-Team: Bengali (India) \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-28 05:17+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:46+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17956,7 +17956,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/br.po b/setup/iso_639/br.po
index e1549144d8..e082536ec7 100644
--- a/setup/iso_639/br.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:43+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Breton \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-28 04:38+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:08+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: br\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/bs.po b/setup/iso_639/bs.po
index 558891b111..3bc1475193 100644
--- a/setup/iso_639/bs.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 07:15+0000\n"
"Last-Translator: Nesiren Armin \n"
"Language-Team: Bosanski \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-28 04:38+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:07+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/byn.po b/setup/iso_639/byn.po
index d34537c422..7b2f78121b 100644
--- a/setup/iso_639/byn.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:37+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:40+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:09+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ca.po b/setup/iso_639/ca.po
index 95998b0e92..3a056addb4 100644
--- a/setup/iso_639/ca.po
+++ b/setup/iso_639/ca.po
@@ -11,15 +11,15 @@ msgstr ""
"Project-Id-Version: iso_639_3\n"
"Report-Msgid-Bugs-To: Debian iso-codes team \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-11-22 16:45+0000\n"
"Last-Translator: Ferran Rius \n"
"Language-Team: Catalan \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-23 05:19+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:10+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ca\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/crh.po b/setup/iso_639/crh.po
index 6ffd2708c5..2f1c6cd153 100644
--- a/setup/iso_639/crh.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:24+0000\n"
"Last-Translator: Reşat SABIQ \n"
"Language-Team: Crimean Tatar \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-28 04:41+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:10+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: crh\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr "Ndoola"
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/cs.po b/setup/iso_639/cs.po
index fa6eb9f4c4..82f0a7d603 100644
--- a/setup/iso_639/cs.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:51+0000\n"
"Last-Translator: Miroslav Kure \n"
"Language-Team: Czech \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-28 04:41+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:11+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: cs\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/cy.po b/setup/iso_639/cy.po
index 4d0d6ab67f..be4fa3a1e3 100644
--- a/setup/iso_639/cy.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 07:08+0000\n"
"Last-Translator: Dafydd Tomos \n"
"Language-Team: Welsh \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-28 05:14+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:44+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: cy\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/da.po b/setup/iso_639/da.po
index 8a1f9d1f36..716f4db0cd 100644
--- a/setup/iso_639/da.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:12+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Danish \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-28 04:42+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:11+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: da\n"
#. name for aaa
@@ -17961,7 +17961,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/de.po b/setup/iso_639/de.po
index cef31eafc4..8b9dc52c38 100644
--- a/setup/iso_639/de.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:28+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: German \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-28 04:45+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:15+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: de\n"
#. name for aaa
@@ -17981,7 +17981,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/el.po b/setup/iso_639/el.po
index adcb3d0c1a..77abc21924 100644
--- a/setup/iso_639/el.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:41+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Greek \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-28 04:48+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:17+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: el\n"
#. name for aaa
@@ -17958,7 +17958,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/eo.po b/setup/iso_639/eo.po
index 7ca4e60e47..08e73e16b2 100644
--- a/setup/iso_639/eo.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:58+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Esperanto \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-28 04:43+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:13+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: eo\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/es.po b/setup/iso_639/es.po
index 9f7cc86b9f..7d60fb2bfd 100644
--- a/setup/iso_639/es.po
+++ b/setup/iso_639/es.po
@@ -7,15 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
-"PO-Revision-Date: 2011-11-22 19:47+0000\n"
-"Last-Translator: Fitoschido \n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
+"PO-Revision-Date: 2011-11-26 08:48+0000\n"
+"Last-Translator: Jellby \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-23 05:19+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#. name for aaa
msgid "Ghotuo"
@@ -4879,7 +4879,7 @@ msgstr "Chino mindong"
#. name for cdr
msgid "Cinda-Regi-Tiyal"
-msgstr "Cinda-Regi-Tiyal"
+msgstr "Cinda-regi-tiyal"
#. name for cds
msgid "Chadian Sign Language"
@@ -4895,7 +4895,7 @@ msgstr "Koda"
#. name for cea
msgid "Chehalis; Lower"
-msgstr ""
+msgstr "Chehalis inferior"
#. name for ceb
msgid "Cebuano"
@@ -4919,7 +4919,7 @@ msgstr "Centúúm"
#. name for cfa
msgid "Dijim-Bwilim"
-msgstr "Dijim-Bwilim"
+msgstr "Dijim-bwilim"
#. name for cfd
msgid "Cara"
@@ -4927,7 +4927,7 @@ msgstr "Cara"
#. name for cfg
msgid "Como Karim"
-msgstr "Como Karim"
+msgstr "Como karim"
#. name for cfm
msgid "Chin; Falam"
@@ -5047,7 +5047,7 @@ msgstr ""
#. name for cia
msgid "Cia-Cia"
-msgstr "Cia-Cia"
+msgstr "Cia-cia"
#. name for cib
msgid "Gbe; Ci"
@@ -5079,7 +5079,7 @@ msgstr "Cimbrio"
#. name for cin
msgid "Cinta Larga"
-msgstr "Cinta Larga"
+msgstr "Cinta larga"
#. name for cip
msgid "Chiapanec"
@@ -5107,7 +5107,7 @@ msgstr "Chru"
#. name for cjh
msgid "Chehalis; Upper"
-msgstr ""
+msgstr "Chehalis superior"
#. name for cji
msgid "Chamalal"
@@ -5127,7 +5127,7 @@ msgstr "Chenapian"
#. name for cjo
msgid "Ashéninka Pajonal"
-msgstr "Ashéninka Pajonal"
+msgstr "Ashéninka pajonal"
#. name for cjp
msgid "Cabécar"
@@ -5195,11 +5195,11 @@ msgstr "Caka"
#. name for cky
msgid "Cakfem-Mushere"
-msgstr "Cakfem-Mushere"
+msgstr "Cakfem-mushere"
#. name for ckz
msgid "Cakchiquel-Quiché Mixed Language"
-msgstr "Cakchiquel-Quiché idioma mixto"
+msgstr "Idioma mixto cakchiquel-quiché"
#. name for cla
msgid "Ron"
@@ -5227,7 +5227,7 @@ msgstr "Chakali"
#. name for clk
msgid "Idu-Mishmi"
-msgstr "Idu-Mishmi"
+msgstr "Idu-mishmi"
#. name for cll
msgid "Chala"
@@ -5267,7 +5267,7 @@ msgstr "Mongol clásico"
#. name for cmi
msgid "Emberá-Chamí"
-msgstr "Emberá-Chamí"
+msgstr "Emberá-chamí"
#. name for cml
msgid "Campalagian"
@@ -5367,7 +5367,7 @@ msgstr "Cocopa"
#. name for cod
msgid "Cocama-Cocamilla"
-msgstr "Cocama-Cocamilla"
+msgstr "Cocama-cocamilla"
#. name for coe
msgid "Koreguaje"
@@ -5383,7 +5383,7 @@ msgstr "Chong"
#. name for coh
msgid "Chonyi-Dzihana-Kauma"
-msgstr "Chonyi-Dzihana-Kauma"
+msgstr "Chonyi-dzihana-kauma"
#. name for coj
msgid "Cochimi"
@@ -5395,7 +5395,7 @@ msgstr ""
#. name for col
msgid "Columbia-Wenatchi"
-msgstr "Columbia-Wenatchi"
+msgstr "Columbia-wenatchi"
#. name for com
msgid "Comanche"
@@ -5435,7 +5435,7 @@ msgstr "Wamey"
#. name for cov
msgid "Cao Miao"
-msgstr "Cao Miao"
+msgstr "Cao miao"
#. name for cow
msgid "Cowlitz"
@@ -5463,7 +5463,7 @@ msgstr ""
#. name for cpc
msgid "Ajyíninka Apurucayali"
-msgstr "Ajyíninka Apurucayali"
+msgstr "Ajyíninka apurucayali"
#. name for cpg
msgid "Greek; Cappadocian"
@@ -5635,7 +5635,7 @@ msgstr ""
#. name for csk
msgid "Jola-Kasa"
-msgstr "Jola-Kasa"
+msgstr "Jola-kasa"
#. name for csl
msgid "Chinese Sign Language"
@@ -5715,7 +5715,7 @@ msgstr "Chhintange"
#. name for cto
msgid "Emberá-Catío"
-msgstr "Emberá-Catío"
+msgstr "Emberá-catío"
#. name for ctp
msgid "Chatino; Western Highland"
@@ -5763,7 +5763,7 @@ msgstr "Cuiba"
#. name for cuj
msgid "Mashco Piro"
-msgstr "Mashco Piro"
+msgstr "Mashco piro"
#. name for cuk
msgid "Kuna; San Blas"
@@ -5799,7 +5799,7 @@ msgstr ""
#. name for cuu
msgid "Tai Ya"
-msgstr "Tai Ya"
+msgstr "Tai ya"
#. name for cuv
msgid "Cuvok"
@@ -5951,7 +5951,7 @@ msgstr "Dargwa"
#. name for das
msgid "Daho-Doo"
-msgstr "Daho-Doo"
+msgstr "Daho-doo"
#. name for dau
msgid "Daju; Dar Sila"
@@ -5975,7 +5975,7 @@ msgstr "Dao"
#. name for dba
msgid "Bangi Me"
-msgstr "Bangi Me"
+msgstr "Bangi me"
#. name for dbb
msgid "Deno"
@@ -6087,7 +6087,7 @@ msgstr ""
#. name for ddw
msgid "Dawera-Daweloor"
-msgstr "Dawera-Daweloor"
+msgstr "Dawera-daweloor"
#. name for dec
msgid "Dagik"
@@ -6175,7 +6175,7 @@ msgstr ""
#. name for dgd
msgid "Dagaari Dioula"
-msgstr "Dagaari Dioula"
+msgstr "Dagaari dioula"
#. name for dge
msgid "Degenan"
@@ -6363,7 +6363,7 @@ msgstr "Dinka noroccidental"
#. name for dix
msgid "Dixon Reef"
-msgstr "Dixon Reef"
+msgstr "Dixon reef"
#. name for diy
msgid "Diuwe"
@@ -6691,7 +6691,7 @@ msgstr "Darling"
#. name for drn
msgid "Damar; West"
-msgstr ""
+msgstr "Damar occidental"
#. name for dro
msgid "Melanau; Daro-Matu"
@@ -6811,7 +6811,7 @@ msgstr "Duna"
#. name for dud
msgid "Hun-Saare"
-msgstr "Hun-Saare"
+msgstr "Hun-saare"
#. name for due
msgid "Agta; Umiray Dumaget"
@@ -6827,7 +6827,7 @@ msgstr "Duruma"
#. name for duh
msgid "Dungra Bhil"
-msgstr "Dungra Bhil"
+msgstr "Dungra bhil"
#. name for dui
msgid "Dumun"
@@ -6851,7 +6851,7 @@ msgstr "Neerlandés medio (ca. 1050-1350)"
#. name for dun
msgid "Dusun Deyah"
-msgstr "Dusun Deyah"
+msgstr "Dusun deyah"
#. name for duo
msgid "Agta; Dupaninan"
@@ -6863,7 +6863,7 @@ msgstr "Duano"
#. name for duq
msgid "Dusun Malang"
-msgstr "Dusun Malang"
+msgstr "Dusun malang"
#. name for dur
msgid "Dii"
@@ -6883,7 +6883,7 @@ msgstr "Duvle"
#. name for duw
msgid "Dusun Witu"
-msgstr "Dusun Witu"
+msgstr "Dusun witu"
#. name for dux
msgid "Duungooma"
@@ -6915,7 +6915,7 @@ msgstr "Dawro"
#. name for dws
msgid "Dutton World Speedwords"
-msgstr "Dutton World Speedwords (lengua de compresión de palabras de Dutton)"
+msgstr "Speedwords mundial Dutton"
#. name for dww
msgid "Dawawa"
@@ -6951,7 +6951,7 @@ msgstr "Dyangadi"
#. name for dyo
msgid "Jola-Fonyi"
-msgstr "Jola-Fonyi"
+msgstr "Jola-fonyi"
#. name for dyu
msgid "Dyula"
@@ -6995,7 +6995,7 @@ msgstr "Bontok oriental"
#. name for ebo
msgid "Teke-Ebo"
-msgstr "Teke-Ebo"
+msgstr "Teke-ebo"
#. name for ebr
msgid "Ebrié"
@@ -7007,7 +7007,7 @@ msgstr "Embu"
#. name for ecr
msgid "Eteocretan"
-msgstr "Eteocretan"
+msgstr "Eteocretense"
#. name for ecs
msgid "Ecuadorian Sign Language"
@@ -17950,8 +17950,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr ""
+msgid "German; Low"
+msgstr "Bajo alemán"
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/et.po b/setup/iso_639/et.po
index 4f824e3e7c..a46c2437a8 100644
--- a/setup/iso_639/et.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 07:11+0000\n"
"Last-Translator: Tõivo Leedjärv \n"
"Language-Team: Estonian \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-28 04:43+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:13+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: et\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/eu.po b/setup/iso_639/eu.po
index 3dca3bfb04..1ca98bdd2a 100644
--- a/setup/iso_639/eu.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:37+0000\n"
"Last-Translator: Piarres Beobide \n"
"Language-Team: Euskara \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-28 04:37+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:07+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: eu\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/fa.po b/setup/iso_639/fa.po
index 09d7323d96..3960584788 100644
--- a/setup/iso_639/fa.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:19+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Persian \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-28 05:02+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:32+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: fa\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/fi.po b/setup/iso_639/fi.po
index 02c9e2e89b..c7cde2c5e5 100644
--- a/setup/iso_639/fi.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:07+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Finnish \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-28 04:44+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:14+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: fi\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/fr.po b/setup/iso_639/fr.po
index 5de23d1bfb..ad066ef187 100644
--- a/setup/iso_639/fr.po
+++ b/setup/iso_639/fr.po
@@ -12,15 +12,15 @@ msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: Debian iso-codes team \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:36+0000\n"
"Last-Translator: Christian Perrier \n"
"Language-Team: French \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-28 04:45+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:14+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: fr\n"
#. name for aaa
@@ -17960,8 +17960,8 @@ msgid "Ndoola"
msgstr "ndoola"
#. name for nds
-msgid "Saxon; Low"
-msgstr "bas Saxon"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ga.po b/setup/iso_639/ga.po
index 25bb81554a..23fb9770a7 100644
--- a/setup/iso_639/ga.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:51+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Irish \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-28 04:46+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:16+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ga\n"
#. name for aaa
@@ -17996,7 +17996,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/gez.po b/setup/iso_639/gez.po
index 3faf427cc4..6ec2f02665 100644
--- a/setup/iso_639/gez.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:12+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:46+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:15+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/gl.po b/setup/iso_639/gl.po
index 81fdceb5a4..bce0353346 100644
--- a/setup/iso_639/gl.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:34+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Galician \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-28 04:47+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:16+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: gl\n"
#. name for aaa
@@ -17955,8 +17955,8 @@ msgid "Ndoola"
msgstr "Ndoola"
#. name for nds
-msgid "Saxon; Low"
-msgstr "Saxón baixo"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/gu.po b/setup/iso_639/gu.po
index 1263ff4873..6c9b533450 100644
--- a/setup/iso_639/gu.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:46+0000\n"
"Last-Translator: Ankit Patel \n"
"Language-Team: Gujarati \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-28 04:48+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:18+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: gu\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/he.po b/setup/iso_639/he.po
index 97a8e581ea..1746b25c7b 100644
--- a/setup/iso_639/he.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 06:12+0000\n"
"Last-Translator: Alastair McKinstry \n"
"Language-Team: Hebrew \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-28 04:49+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:18+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: he\n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/hi.po b/setup/iso_639/hi.po
index 931e2402ee..11c640a5cb 100644
--- a/setup/iso_639/hi.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:03+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:49+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:19+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/hr.po b/setup/iso_639/hr.po
index b948823dfa..0b8e847665 100644
--- a/setup/iso_639/hr.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 06:17+0000\n"
"Last-Translator: Alastair McKinstry \n"
"Language-Team: Croatian \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-28 05:06+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:36+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: hr\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/hu.po b/setup/iso_639/hu.po
index 5478ac43c7..e03245c301 100644
--- a/setup/iso_639/hu.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-11-12 07:52+0000\n"
"Last-Translator: Devilinside \n"
"Language-Team: Hungarian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-13 05:48+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:19+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"X-Poedit-Country: HUNGARY\n"
"Language: hu\n"
"X-Poedit-Language: Hungarian\n"
@@ -18009,7 +18009,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/id.po b/setup/iso_639/id.po
index 3263966bd0..9a7024a309 100644
--- a/setup/iso_639/id.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:05+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Indonesia \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-28 04:51+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:20+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/is.po b/setup/iso_639/is.po
index faf7d30079..96eefb596c 100644
--- a/setup/iso_639/is.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 09:09+0000\n"
"Last-Translator: Alastair McKinstry \n"
"Language-Team: Icelandic \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-28 04:50+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:20+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: is\n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/it.po b/setup/iso_639/it.po
index fc795c4ff6..8409060021 100644
--- a/setup/iso_639/it.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:49+0000\n"
"Last-Translator: Milo Casagrande \n"
"Language-Team: Italian \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-28 04:51+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:21+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: it\n"
#. name for aaa
@@ -17956,8 +17956,8 @@ msgid "Ndoola"
msgstr "Ndoola"
#. name for nds
-msgid "Saxon; Low"
-msgstr "Sassone basso"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ja.po b/setup/iso_639/ja.po
index fe3b76fb82..d7f9fa4a59 100644
--- a/setup/iso_639/ja.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:44+0000\n"
"Last-Translator: IIDA Yosiaki \n"
"Language-Team: Japanese \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-28 04:52+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:21+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ja\n"
#. name for aaa
@@ -18323,7 +18323,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/kn.po b/setup/iso_639/kn.po
index b688c8ea8c..badff8562d 100644
--- a/setup/iso_639/kn.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:57+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Kannada \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-28 04:52+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:22+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: kn\n"
#. name for aaa
@@ -17953,8 +17953,8 @@ msgid "Ndoola"
msgstr "ಎನ್ಡೂಲಾ"
#. name for nds
-msgid "Saxon; Low"
-msgstr "ಸ್ಯಾಕ್ಸೋನ್; ಲೋ"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ko.po b/setup/iso_639/ko.po
index c7be21bafe..e4bccbb8f7 100644
--- a/setup/iso_639/ko.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 04:09+0000\n"
"Last-Translator: Eungkyu Song \n"
"Language-Team: Korean \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-28 04:54+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:24+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ko\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/kok.po b/setup/iso_639/kok.po
index 66a3160e2b..4c51937e82 100644
--- a/setup/iso_639/kok.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:38+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:53+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:23+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/lt.po b/setup/iso_639/lt.po
index ce019bf8cf..a841c7bb27 100644
--- a/setup/iso_639/lt.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:08+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Lithuanian \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-28 04:55+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:25+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: lt\n"
#. name for aaa
@@ -17954,8 +17954,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr "Saksų žemaičių"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/lv.po b/setup/iso_639/lv.po
index fa5e3e116d..2df14d6c31 100644
--- a/setup/iso_639/lv.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 09:02+0000\n"
"Last-Translator: Alastair McKinstry \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-28 04:55+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:24+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/mi.po b/setup/iso_639/mi.po
index 7e48143acb..fc3bfcb268 100644
--- a/setup/iso_639/mi.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 03:56+0000\n"
"Last-Translator: James Gasson \n"
"Language-Team: Maori \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-28 04:56+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:26+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: mi\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/mk.po b/setup/iso_639/mk.po
index db1869bdc3..9f4b0a3d89 100644
--- a/setup/iso_639/mk.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 03:58+0000\n"
"Last-Translator: Alastair McKinstry \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-28 04:56+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:25+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/mn.po b/setup/iso_639/mn.po
index cf4bc4d483..9c443b7a2e 100644
--- a/setup/iso_639/mn.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:18+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Mongolian \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-28 04:58+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:28+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: mn\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/mr.po b/setup/iso_639/mr.po
index 89cede72a8..beef0a1c61 100644
--- a/setup/iso_639/mr.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:21+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Marathi \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-28 04:57+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:26+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: mr\n"
#. name for aaa
@@ -17955,8 +17955,8 @@ msgid "Ndoola"
msgstr "न्दुला"
#. name for nds
-msgid "Saxon; Low"
-msgstr "सॉक्सोन; लो"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ms.po b/setup/iso_639/ms.po
index 2874688092..55152f032e 100644
--- a/setup/iso_639/ms.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 06:24+0000\n"
"Last-Translator: Hasbullah Bin Pit \n"
"Language-Team: Projek Gabai \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-28 04:57+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:27+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17957,7 +17957,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/mt.po b/setup/iso_639/mt.po
index 7e543f4a40..11fef307f9 100644
--- a/setup/iso_639/mt.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:49+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Maltese \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-28 04:58+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:28+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: mt\n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/nb.po b/setup/iso_639/nb.po
index 35f376b5c5..66527ebb47 100644
--- a/setup/iso_639/nb.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:46+0000\n"
"Last-Translator: Kovid Goyal \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-28 04:59+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:29+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/nl.po b/setup/iso_639/nl.po
index 2af4da753a..09c011a93a 100644
--- a/setup/iso_639/nl.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-11-03 23:08+0000\n"
"Last-Translator: drMerry \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 04:47+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:12+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: nl\n"
#. name for aaa
@@ -17955,8 +17955,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr "Saksisch; laag"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/nn.po b/setup/iso_639/nn.po
index e28ba2da74..3151d9a70b 100644
--- a/setup/iso_639/nn.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:45+0000\n"
"Last-Translator: Karl Ove Hufthammer \n"
"Language-Team: Norwegian Nynorsk \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-28 04:59+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:29+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: nn\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/nso.po b/setup/iso_639/nso.po
index 6d63dcdd71..e5b5c7d830 100644
--- a/setup/iso_639/nso.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:46+0000\n"
"Last-Translator: Jerry Thobejane \n"
"Language-Team: Northern Sotho \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-28 05:00+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:30+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: nso\n"
#. name for aaa
@@ -17951,7 +17951,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/oc.po b/setup/iso_639/oc.po
index 1172d3c75e..124ce54720 100644
--- a/setup/iso_639/oc.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:43+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: OCCITAN \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-28 05:01+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:31+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/or.po b/setup/iso_639/or.po
index f1b7c8893c..4b87cb5087 100644
--- a/setup/iso_639/or.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:01+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Oriya \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-28 05:01+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:31+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: or\n"
#. name for aaa
@@ -17952,8 +17952,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr "ସାକ୍ସନ; ଧୀର"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/pa.po b/setup/iso_639/pa.po
index 51dc8bc32a..98e257c557 100644
--- a/setup/iso_639/pa.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:54+0000\n"
"Last-Translator: A S Alam \n"
"Language-Team: Punjabi \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-28 05:02+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:32+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: pa\n"
#. name for aaa
@@ -17957,8 +17957,8 @@ msgid "Ndoola"
msgstr "ਨਡੂਲਾ"
#. name for nds
-msgid "Saxon; Low"
-msgstr "ਸੈਕਸੋਨ; ਲੋ"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/pl.po b/setup/iso_639/pl.po
index 46e18f7160..99d09ce3dc 100644
--- a/setup/iso_639/pl.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:01+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Polish \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-28 05:03+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:33+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: pl\n"
#. name for aaa
@@ -17956,8 +17956,8 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
-msgstr "dolnosaksoński"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ps.po b/setup/iso_639/ps.po
index a955c9e92d..6b8d08a092 100644
--- a/setup/iso_639/ps.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:58+0000\n"
"Last-Translator: Alastair McKinstry \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-28 05:04+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:34+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/pt.po b/setup/iso_639/pt.po
index f63782d294..0c85aacdcf 100644
--- a/setup/iso_639/pt.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:52+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: 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-28 05:04+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:34+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: pt\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/pt_BR.po b/setup/iso_639/pt_BR.po
index a319fcc526..0985886f33 100644
--- a/setup/iso_639/pt_BR.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:27+0000\n"
"Last-Translator: Kovid Goyal \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-28 05:17+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:47+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ro.po b/setup/iso_639/ro.po
index 371b9f3135..1fe2f7b111 100644
--- a/setup/iso_639/ro.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:33+0000\n"
"Last-Translator: Alastair McKinstry \n"
"Language-Team: Romanian \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-28 05:05+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:35+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ro\n"
"PO-Creation-Date: 2000-09-24 15:45+0300\n"
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ru.po b/setup/iso_639/ru.po
index 7c33259a7b..9049219daf 100644
--- a/setup/iso_639/ru.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:14+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Russian \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-28 05:05+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:35+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ru\n"
#. name for aaa
@@ -17956,7 +17956,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/rw.po b/setup/iso_639/rw.po
index 58308071fc..37bf2f15fa 100644
--- a/setup/iso_639/rw.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:15+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Kinyarwanda \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-28 04:53+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:22+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: rw\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/sk.po b/setup/iso_639/sk.po
index 2d4f25172a..e7e208efc4 100644
--- a/setup/iso_639/sk.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:52+0000\n"
"Last-Translator: Alastair McKinstry \n"
"Language-Team: Slovak \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-28 05:07+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:37+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: sk\n"
#. name for aaa
@@ -17954,7 +17954,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/sl.po b/setup/iso_639/sl.po
index a6ebce9c3e..6aaf8ef9b7 100644
--- a/setup/iso_639/sl.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:39+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Slovenian \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-28 05:08+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:37+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: sl\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/sr.po b/setup/iso_639/sr.po
index ce8dd67514..6cce387dba 100644
--- a/setup/iso_639/sr.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:42+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Serbian \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-28 05:06+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:36+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: sr\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/sr@latin.po b/setup/iso_639/sr@latin.po
index 6db7178192..a840b9fee9 100644
--- a/setup/iso_639/sr@latin.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:43+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Serbian \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-28 05:19+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:49+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: sr\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/sv.po b/setup/iso_639/sv.po
index c369c939fb..6f65548ae9 100644
--- a/setup/iso_639/sv.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:53+0000\n"
"Last-Translator: Christian Rose \n"
"Language-Team: Swedish \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-28 05:09+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:39+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: sv\n"
#. name for aaa
@@ -18012,7 +18012,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ta.po b/setup/iso_639/ta.po
index 1061cbccab..fa89e91b85 100644
--- a/setup/iso_639/ta.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:31+0000\n"
"Last-Translator: Felix \n"
"Language-Team: Tamil \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-28 05:09+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:39+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -17958,8 +17958,8 @@ msgid "Ndoola"
msgstr "நடூலா"
#. name for nds
-msgid "Saxon; Low"
-msgstr "சாக்ஸோன்; குறைந்த"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/th.po b/setup/iso_639/th.po
index b3b18028a6..6ac228032a 100644
--- a/setup/iso_639/th.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:26+0000\n"
"Last-Translator: Theppitak Karoonboonyanan \n"
"Language-Team: Thai \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-28 05:10+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:40+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: th\n"
#. name for aaa
@@ -17955,7 +17955,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/ti.po b/setup/iso_639/ti.po
index d04a3ab47a..56946915a0 100644
--- a/setup/iso_639/ti.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:09+0000\n"
"Last-Translator: Kovid Goyal \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-28 05:12+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:41+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/tig.po b/setup/iso_639/tig.po
index ca5771d2d5..8e711c6ed1 100644
--- a/setup/iso_639/tig.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:04+0000\n"
"Last-Translator: Kovid Goyal \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-28 05:11+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:41+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/tr.po b/setup/iso_639/tr.po
index 70feed7d80..eae93c691d 100644
--- a/setup/iso_639/tr.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-11-11 00:16+0000\n"
"Last-Translator: kulkke \n"
"Language-Team: Turkish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-12 04:48+0000\n"
-"X-Generator: Launchpad (build 14277)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:42+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: tr\n"
#. name for aaa
@@ -17958,7 +17958,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/tt.po b/setup/iso_639/tt.po
index 238902f4c1..61abdbe80d 100644
--- a/setup/iso_639/tt.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 17:53+0000\n"
"Last-Translator: al Beri \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-28 05:10+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:40+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/uk.po b/setup/iso_639/uk.po
index 098ff84dcf..034fee566d 100644
--- a/setup/iso_639/uk.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:33+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Ukrainian \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-28 05:13+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:43+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: uk\n"
#. name for aaa
@@ -17955,8 +17955,8 @@ msgid "Ndoola"
msgstr "ндоола"
#. name for nds
-msgid "Saxon; Low"
-msgstr "саксонська (нижня)"
+msgid "German; Low"
+msgstr ""
#. name for ndt
msgid "Ndunga"
diff --git a/setup/iso_639/ve.po b/setup/iso_639/ve.po
index 9e35e4c966..222a45af4b 100644
--- a/setup/iso_639/ve.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 07:51+0000\n"
"Last-Translator: Fhatuwani Rambau \n"
"Language-Team: Venda \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-28 05:13+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:43+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: ve\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/vi.po b/setup/iso_639/vi.po
index 601747d735..acb447c853 100644
--- a/setup/iso_639/vi.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 16:56+0000\n"
"Last-Translator: Clytie Siddall \n"
"Language-Team: Vietnamese \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-28 05:14+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:44+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: vi\n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/wa.po b/setup/iso_639/wa.po
index 872ee8d8dc..917cab164b 100644
--- a/setup/iso_639/wa.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 15:35+0000\n"
"Last-Translator: Pablo Saratxaga \n"
"Language-Team: Walloon \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-28 05:15+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:45+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/xh.po b/setup/iso_639/xh.po
index 6e8d4f3f9d..a1eb03e5a6 100644
--- a/setup/iso_639/xh.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 05:51+0000\n"
"Last-Translator: Antoinette Dekeni \n"
"Language-Team: Xhosa \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-28 05:15+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:45+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: xh\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/zh_CN.po b/setup/iso_639/zh_CN.po
index cc20015673..fecc4d798e 100644
--- a/setup/iso_639/zh_CN.po
+++ b/setup/iso_639/zh_CN.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: iso_639_3\n"
"Report-Msgid-Bugs-To: Debian iso-codes team \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-09-27 18:09+0000\n"
"Last-Translator: LI Daobing \n"
"Language-Team: Chinese (simplified) \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 03:30+0000\n"
"Last-Translator: Joe Man \n"
"Language-Team: Traditional Chinese \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-28 05:18+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:48+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: \n"
#. name for aaa
@@ -17952,7 +17952,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/iso_639/zu.po b/setup/iso_639/zu.po
index 8cad0e6a4d..dd3c17eae2 100644
--- a/setup/iso_639/zu.po
+++ b/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 \n"
-"POT-Creation-Date: 2011-09-27 14:31+0000\n"
+"POT-Creation-Date: 2011-11-25 14:01+0000\n"
"PO-Revision-Date: 2011-08-27 08:38+0000\n"
"Last-Translator: Thobile Mhlongo \n"
"Language-Team: Zulu \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-28 05:16+0000\n"
-"X-Generator: Launchpad (build 14049)\n"
+"X-Launchpad-Export-Date: 2011-11-26 05:46+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Language: zu\n"
#. name for aaa
@@ -17953,7 +17953,7 @@ msgid "Ndoola"
msgstr ""
#. name for nds
-msgid "Saxon; Low"
+msgid "German; Low"
msgstr ""
#. name for ndt
diff --git a/setup/upload.py b/setup/upload.py
index 1d0c05282c..a79b080637 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -25,12 +25,12 @@ MOBILEREAD = 'ftp://dev.mobileread.com/calibre/'
def installers():
installers = list(map(installer_name, ('dmg', 'msi', 'tar.bz2')))
installers.append(installer_name('tar.bz2', is64bit=True))
- installers.insert(0, 'dist/%s-%s.tar.gz'%(__appname__, __version__))
+ installers.insert(0, 'dist/%s-%s.tar.xz'%(__appname__, __version__))
installers.append('dist/%s-portable-%s.zip'%(__appname__, __version__))
return installers
def installer_description(fname):
- if fname.endswith('.tar.gz'):
+ if fname.endswith('.tar.xz'):
return 'Source code'
if fname.endswith('.tar.bz2'):
bits = '32' if 'i686' in fname else '64'
@@ -117,7 +117,7 @@ class UploadToGoogleCode(Command): # {{{
def re_upload(self):
fnames = set([os.path.basename(x) for x in installers() if not
- x.endswith('.tar.gz') and os.path.exists(x)])
+ x.endswith('.tar.xz') and os.path.exists(x)])
existing = set(self.old_files.keys()).intersection(fnames)
br = self.login_to_gmail()
for x in fnames:
@@ -134,17 +134,19 @@ class UploadToGoogleCode(Command): # {{{
def upload_one(self, fname):
self.info('\nUploading', fname)
- typ = 'Type-' + ('Source' if fname.endswith('.gz') else 'Archive' if
+ typ = 'Type-' + ('Source' if fname.endswith('.xz') else 'Archive' if
fname.endswith('.zip') else 'Installer')
ext = os.path.splitext(fname)[1][1:]
op = 'OpSys-'+{'msi':'Windows','zip':'Windows',
- 'dmg':'OSX','bz2':'Linux','gz':'All'}[ext]
+ 'dmg':'OSX','bz2':'Linux','xz':'All'}[ext]
desc = installer_description(fname)
start = time.time()
for i in range(5):
try:
path = self.upload(os.path.abspath(fname), desc,
labels=[typ, op, 'Featured'])
+ except KeyboardInterrupt:
+ raise SystemExit(1)
except:
import traceback
traceback.print_exc()
@@ -169,8 +171,10 @@ class UploadToGoogleCode(Command): # {{{
bname = os.path.basename(fname)
if bname in self.old_files:
path = 'http://calibre-ebook.googlecode.com/files/'+bname
- self.info('%s already uploaded, skipping. Assuming URL is: %s',
- bname, path)
+ self.info(
+ '%s already uploaded, skipping. Assuming URL is: %s'%(
+ bname, path))
+ self.old_files.pop(bname)
else:
path = self.upload_one(fname)
self.paths[bname] = path
@@ -326,6 +330,8 @@ class UploadToSourceForge(Command): # {{{
check_call(['rsync', '-z', '--progress', '-e', 'ssh -x', x,
'%s,%s@frs.sourceforge.net:%s'%(self.USERNAME, self.PROJECT,
self.rdir+'/')])
+ except KeyboardInterrupt:
+ raise SystemExit(1)
except:
print ('\nUpload failed, trying again in 30 seconds')
time.sleep(30)
@@ -469,11 +475,11 @@ class UploadToServer(Command): # {{{
description = 'Upload miscellaneous data to calibre server'
def run(self, opts):
- check_call('ssh divok rm -f %s/calibre-\*.tar.gz'%DOWNLOADS, shell=True)
- #check_call('scp dist/calibre-*.tar.gz divok:%s/'%DOWNLOADS, shell=True)
- check_call('gpg --armor --detach-sign dist/calibre-*.tar.gz',
+ check_call('ssh divok rm -f %s/calibre-\*.tar.xz'%DOWNLOADS, shell=True)
+ #check_call('scp dist/calibre-*.tar.xz divok:%s/'%DOWNLOADS, shell=True)
+ check_call('gpg --armor --detach-sign dist/calibre-*.tar.xz',
shell=True)
- check_call('scp dist/calibre-*.tar.gz.asc divok:%s/signatures/'%DOWNLOADS,
+ check_call('scp dist/calibre-*.tar.xz.asc divok:%s/signatures/'%DOWNLOADS,
shell=True)
check_call('ssh divok bzr update /usr/local/calibre',
shell=True)
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 5538be0ea6..a13f2385fd 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
__docformat__ = 'restructuredtext en'
__appname__ = u'calibre'
-numeric_version = (0, 8, 28)
+numeric_version = (0, 8, 29)
__version__ = u'.'.join(map(unicode, numeric_version))
__author__ = u"Kovid Goyal "
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index bff4fe4060..6258434b1d 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -255,7 +255,7 @@ class LRXMetadataReader(MetadataReaderPlugin):
class MOBIMetadataReader(MetadataReaderPlugin):
name = 'Read MOBI metadata'
- file_types = set(['mobi', 'prc', 'azw', 'azw4'])
+ file_types = set(['mobi', 'prc', 'azw', 'azw4', 'pobi'])
description = _('Read metadata from %s files')%'MOBI'
def get_metadata(self, stream, ftype):
@@ -545,7 +545,7 @@ from calibre.customize.profiles import input_profiles, output_profiles
from calibre.devices.apple.driver import ITUNES
from calibre.devices.hanlin.driver import HANLINV3, HANLINV5, BOOX, SPECTRA
-from calibre.devices.blackberry.driver import BLACKBERRY
+from calibre.devices.blackberry.driver import BLACKBERRY, PLAYBOOK
from calibre.devices.cybook.driver import CYBOOK, ORIZON
from calibre.devices.eb600.driver import (EB600, COOL_ER, SHINEBOOK,
POCKETBOOK360, GER2, ITALICA, ECLICTO, DBOOK, INVESBOOK,
@@ -646,7 +646,7 @@ plugins += [
plugins += [
HANLINV3,
HANLINV5,
- BLACKBERRY,
+ BLACKBERRY, PLAYBOOK,
CYBOOK,
ORIZON,
ILIAD,
diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index e47cd82b50..dce04034c8 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -39,15 +39,15 @@ def get_connected_device():
if ok:
dev = d
dev.reset(log_packets=False, detected_device=det)
- connected_devices.append(dev)
+ connected_devices.append((det, dev))
if dev is None:
print >>sys.stderr, 'Unable to find a connected ebook reader.'
return
- for d in connected_devices:
+ for det, d in connected_devices:
try:
- d.open(None)
+ d.open(det, None)
except:
continue
else:
@@ -121,7 +121,7 @@ def debug(ioreg_to_tmp=False, buf=None):
out('Trying to open', dev.name, '...', end=' ')
try:
dev.reset(detected_device=det)
- dev.open(None)
+ dev.open(det, None)
out('OK')
except:
import traceback
diff --git a/src/calibre/devices/android/driver.py b/src/calibre/devices/android/driver.py
index f3aa465476..8f5395b514 100644
--- a/src/calibre/devices/android/driver.py
+++ b/src/calibre/devices/android/driver.py
@@ -167,7 +167,7 @@ class ANDROID(USBMS):
'MB525', 'ANDROID2.3', 'SGH-I997', 'GT-I5800_CARD', 'MB612',
'GT-S5830_CARD', 'GT-S5570_CARD', 'MB870', 'MID7015A',
'ALPANDIGITAL', 'ANDROID_MID', 'VTAB1008', 'EMX51_BBG_ANDROI',
- 'UMS', '.K080', 'P990', 'LTE', 'MB853']
+ 'UMS', '.K080', 'P990', 'LTE', 'MB853', 'GT-S5660_CARD']
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',
@@ -199,6 +199,18 @@ class ANDROID(USBMS):
dirs = list(map(aldiko_tweak, dirs))
return dirs
+ def windows_sort_drives(self, drives):
+ try:
+ vid, pid, bcd = self.device_being_opened[:3]
+ except:
+ vid, pid, bcd = -1, -1, -1
+ if (vid, pid, bcd) == (0x0e79, 0x1408, 0x0222):
+ letter_a = drives.get('carda', None)
+ if letter_a is not None:
+ drives['carda'] = drives['main']
+ drives['main'] = letter_a
+ return drives
+
class S60(USBMS):
name = 'S60 driver'
diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index d6dd5ccf73..5ed4ef214e 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -808,7 +808,7 @@ class ITUNES(DriverBase):
self.log.info("ITUNES.get_file(): exporting '%s'" % path)
outfile.write(open(self.cached_books[path]['lib_book'].location().path).read())
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
'''
Perform any device specific initialization. Called after the device is
detected but before any other functions that communicate with the device.
@@ -824,7 +824,7 @@ class ITUNES(DriverBase):
'''
if DEBUG:
- self.log.info("ITUNES.open()")
+ self.log.info("ITUNES.open(connected_device: %s)" % repr(connected_device))
# Display a dialog recommending using 'Connect to iTunes' if user hasn't
# previously disabled the dialog
@@ -3224,7 +3224,7 @@ class ITUNES_ASYNC(ITUNES):
only_presence=False):
return self.connected, self
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
'''
Perform any device specific initialization. Called after the device is
detected but before any other functions that communicate with the device.
@@ -3239,7 +3239,7 @@ class ITUNES_ASYNC(ITUNES):
we need to talk to iTunes to discover if there's a connected iPod
'''
if DEBUG:
- self.log.info("ITUNES_ASYNC.open()")
+ self.log.info("ITUNES_ASYNC.open(connected_device: %s)" % repr(connected_device))
# Confirm/create thumbs archive
if not os.path.exists(self.cache_dir):
diff --git a/src/calibre/devices/bambook/driver.py b/src/calibre/devices/bambook/driver.py
index 5068a9c4d8..fecdd53ac4 100644
--- a/src/calibre/devices/bambook/driver.py
+++ b/src/calibre/devices/bambook/driver.py
@@ -59,9 +59,9 @@ class BAMBOOK(DeviceConfig, DevicePlugin):
def reset(self, key='-1', log_packets=False, report_progress=None,
detected_device=None) :
- self.open(None)
+ self.open(None, None)
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
# Make sure the Bambook library is ready
if not is_bambook_lib_ready():
raise OpenFeedback(_("Unable to connect to Bambook, you need to install Bambook library first."))
@@ -309,8 +309,8 @@ class BAMBOOK(DeviceConfig, DevicePlugin):
with TemporaryFile('.snb') as snbfile:
if self.bambook.PackageSNB(snbfile, tdir) and self.bambook.VerifySNB(snbfile):
guid = self.bambook.SendFile(snbfile, self.get_guid(metadata[i].uuid))
-
- elif f[-3:].upper() == 'SNB':
+
+ elif f[-3:].upper() == 'SNB':
if self.bambook.VerifySNB(f):
guid = self.bambook.SendFile(f, self.get_guid(metadata[i].uuid))
else:
diff --git a/src/calibre/devices/blackberry/driver.py b/src/calibre/devices/blackberry/driver.py
index 1ae6a6c49f..4a85fa695a 100644
--- a/src/calibre/devices/blackberry/driver.py
+++ b/src/calibre/devices/blackberry/driver.py
@@ -28,3 +28,26 @@ class BLACKBERRY(USBMS):
EBOOK_DIR_MAIN = 'eBooks'
SUPPORTS_SUB_DIRS = True
+
+class PLAYBOOK(USBMS):
+
+ name = 'Blackberry Playbook Interface'
+ gui_name = 'Playbook'
+ description = _('Communicate with the Blackberry playbook.')
+ author = _('Kovid Goyal')
+ supported_platforms = ['windows', 'linux', 'osx']
+
+ # Ordered list of supported formats
+ FORMATS = ['epub']
+
+ VENDOR_ID = [0x0fca]
+ PRODUCT_ID = [0x8010]
+ BCD = [0x1]
+
+ VENDOR_NAME = 'GENERIC-'
+ WINDOWS_MAIN_MEM = 'MULTI-CARD'
+
+ MAIN_MEMORY_VOLUME_LABEL = 'Blackberry'
+
+ EBOOK_DIR_MAIN = 'media/books'
+ SUPPORTS_SUB_DIRS = True
diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index f9a3a1508c..09df8cd6d8 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -79,7 +79,7 @@ class FOLDER_DEVICE(USBMS):
only_presence=False):
return self.is_connected, self
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
self.current_library_uuid = library_uuid
if not self._main_prefix:
return False
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index 15c9e9c55f..d75e96f386 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -133,8 +133,14 @@ class DevicePlugin(Plugin):
if debug:
self.print_usb_device_info(device_id)
if only_presence or self.can_handle_windows(device_id, debug=debug):
- return True
- return False
+ try:
+ bcd = int(device_id.rpartition(
+ 'rev_')[-1].replace(':', 'a'), 16)
+ except:
+ bcd = None
+ return True, (vendor_id, product_id, bcd, None,
+ None, None)
+ return False, None
def test_bcd(self, bcdDevice, bcd):
if bcd is None or len(bcd) == 0:
@@ -154,7 +160,7 @@ class DevicePlugin(Plugin):
'''
if iswindows:
return self.is_usb_connected_windows(devices_on_system,
- debug=debug, only_presence=only_presence), None
+ debug=debug, only_presence=only_presence)
vendors_on_system = set([x[0] for x in devices_on_system])
vendors = self.VENDOR_ID if hasattr(self.VENDOR_ID, '__len__') else [self.VENDOR_ID]
@@ -224,7 +230,7 @@ class DevicePlugin(Plugin):
return True
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
'''
Perform any device specific initialization. Called after the device is
detected but before any other functions that communicate with the device.
@@ -238,6 +244,17 @@ class DevicePlugin(Plugin):
This method can raise an OpenFeedback exception to display a message to
the user.
+
+ :param connected_device: The device that we are trying to open. It is
+ a tuple of (vendor id, product id, bcd, manufacturer name, product
+ name, device serial number). However, some devices have no serial
+ number and on windows only the first three fields are present, the
+ rest are None.
+
+ :param library_uuid: The UUID of the current calibre library. Can be
+ None if there is no library (for example when used from the command
+ line).
+
'''
raise NotImplementedError()
diff --git a/src/calibre/devices/kindle/driver.py b/src/calibre/devices/kindle/driver.py
index 35a73f86f0..78b4368950 100644
--- a/src/calibre/devices/kindle/driver.py
+++ b/src/calibre/devices/kindle/driver.py
@@ -287,7 +287,7 @@ class KINDLE2(KINDLE):
name = 'Kindle 2/3 Device Interface'
description = _('Communicate with the Kindle 2/3 eBook reader.')
- FORMATS = KINDLE.FORMATS + ['pdf', 'azw4']
+ FORMATS = KINDLE.FORMATS + ['pdf', 'azw4', 'pobi']
DELETE_EXTS = KINDLE.DELETE_EXTS
PRODUCT_ID = [0x0002, 0x0004]
diff --git a/src/calibre/devices/prs500/cli/main.py b/src/calibre/devices/prs500/cli/main.py
index f122f6332e..e32d5e362e 100755
--- a/src/calibre/devices/prs500/cli/main.py
+++ b/src/calibre/devices/prs500/cli/main.py
@@ -205,15 +205,15 @@ def main():
if ok:
dev = d
dev.reset(log_packets=options.log_packets, detected_device=det)
- connected_devices.append(dev)
+ connected_devices.append((det, dev))
if dev is None:
print >>sys.stderr, 'Unable to find a connected ebook reader.'
return 1
- for d in connected_devices:
+ for det, d in connected_devices:
try:
- d.open(None)
+ d.open(det, None)
except:
continue
else:
diff --git a/src/calibre/devices/prs500/driver.py b/src/calibre/devices/prs500/driver.py
index aaba094fb3..28545b2d86 100644
--- a/src/calibre/devices/prs500/driver.py
+++ b/src/calibre/devices/prs500/driver.py
@@ -240,7 +240,7 @@ class PRS500(DeviceConfig, DevicePlugin):
def set_progress_reporter(self, report_progress):
self.report_progress = report_progress
- def open(self, library_uuid) :
+ def open(self, connected_device, library_uuid) :
"""
Claim an interface on the device for communication.
Requires write privileges to the device file.
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 3b4075f601..f62dc44149 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -847,38 +847,42 @@ class Device(DeviceConfig, DevicePlugin):
self._card_b_prefix = None
# ------------------------------------------------------
- def open(self, library_uuid):
+ def open(self, connected_device, library_uuid):
time.sleep(5)
self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
- if islinux:
- try:
- self.open_linux()
- except DeviceError:
- time.sleep(7)
- self.open_linux()
- if isfreebsd:
- self._main_dev = self._card_a_dev = self._card_b_dev = None
- try:
- self.open_freebsd()
- except DeviceError:
- subprocess.Popen(["camcontrol", "rescan", "all"])
- time.sleep(2)
- self.open_freebsd()
- if iswindows:
- try:
- self.open_windows()
- except DeviceError:
- time.sleep(7)
- self.open_windows()
- if isosx:
- try:
- self.open_osx()
- except DeviceError:
- time.sleep(7)
- self.open_osx()
+ self.device_being_opened = connected_device
+ try:
+ if islinux:
+ try:
+ self.open_linux()
+ except DeviceError:
+ time.sleep(7)
+ self.open_linux()
+ if isfreebsd:
+ self._main_dev = self._card_a_dev = self._card_b_dev = None
+ try:
+ self.open_freebsd()
+ except DeviceError:
+ subprocess.Popen(["camcontrol", "rescan", "all"])
+ time.sleep(2)
+ self.open_freebsd()
+ if iswindows:
+ try:
+ self.open_windows()
+ except DeviceError:
+ time.sleep(7)
+ self.open_windows()
+ if isosx:
+ try:
+ self.open_osx()
+ except DeviceError:
+ time.sleep(7)
+ self.open_osx()
- self.current_library_uuid = library_uuid
- self.post_open_callback()
+ self.current_library_uuid = library_uuid
+ self.post_open_callback()
+ finally:
+ self.device_being_opened = None
def post_open_callback(self):
pass
diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py
index ebb30df8ab..5cfddda2f3 100644
--- a/src/calibre/ebooks/__init__.py
+++ b/src/calibre/ebooks/__init__.py
@@ -30,7 +30,7 @@ BOOK_EXTENSIONS = ['lrf', 'rar', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'ht
'html', 'htmlz', 'xhtml', 'pdf', 'pdb', 'pdr', 'prc', 'mobi', 'azw', 'doc',
'epub', 'fb2', 'djv', 'djvu', 'lrx', 'cbr', 'cbz', 'cbc', 'oebzip',
'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1', 'pml', 'pmlz', 'mbp', 'tan', 'snb',
- 'xps', 'oxps', 'azw4', 'book', 'zbf']
+ 'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi']
class HTMLRenderer(object):
diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 52dd109b47..8f663bcf86 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -741,6 +741,14 @@ if __name__ == '__main__': # tests {{{
isbn_test, title_test, authors_test)
com_tests = [ # {{{
+ ( # # in title
+ {'title':'Expert C# 2008 Business Objects',
+ 'authors':['Lhotka']},
+ [title_test('Expert C# 2008 Business Objects', exact=True),
+ authors_test(['Rockford Lhotka'])
+ ]
+ ),
+
( # Description has links
{'identifiers':{'isbn': '9780671578275'}},
[title_test('A Civil Campaign: A Comedy of Biology and Manners',
diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py
index f04291eae9..9ae8902671 100644
--- a/src/calibre/ebooks/metadata/sources/base.py
+++ b/src/calibre/ebooks/metadata/sources/base.py
@@ -344,7 +344,7 @@ class Source(Plugin):
# Remove single quotes not followed by 's'
(r"'(?!s)", ''),
# Replace other special chars with a space
- (r'''[:,;+!@#$%^&*(){}.`~"\s\[\]/]''', ' ')
+ (r'''[:,;+!@$%^&*(){}.`~"\s\[\]/]''', ' '),
]]
for pat, repl in title_patterns:
diff --git a/src/calibre/ebooks/oeb/stylizer.py b/src/calibre/ebooks/oeb/stylizer.py
index adef0f1bfb..20be750925 100644
--- a/src/calibre/ebooks/oeb/stylizer.py
+++ b/src/calibre/ebooks/oeb/stylizer.py
@@ -539,7 +539,8 @@ class Style(object):
'Return value in pts'
if base is None:
base = self.width
- font = font or self.fontSize
+ if not font and font != 0:
+ font = self.fontSize
return unit_convert(value, base, font, self._profile.dpi)
def pt_to_px(self, value):
diff --git a/src/calibre/ebooks/oeb/transforms/flatcss.py b/src/calibre/ebooks/oeb/transforms/flatcss.py
index ba90a31632..489498d90c 100644
--- a/src/calibre/ebooks/oeb/transforms/flatcss.py
+++ b/src/calibre/ebooks/oeb/transforms/flatcss.py
@@ -283,7 +283,10 @@ class CSSFlattener(object):
psize = fsize
elif 'font-size' in cssdict or tag == 'body':
fsize = self.fmap[font_size]
- cssdict['font-size'] = "%0.5fem" % (fsize / psize)
+ try:
+ cssdict['font-size'] = "%0.5fem" % (fsize / psize)
+ except ZeroDivisionError:
+ cssdict['font-size'] = '%.1fpt'%fsize
psize = fsize
try:
diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py
index 7be64e002d..51e4a1a8c1 100644
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@@ -162,7 +162,7 @@ class DeviceManager(Thread): # {{{
try:
dev.reset(detected_device=detected_device,
report_progress=self.report_progress)
- dev.open(self.current_library_uuid)
+ dev.open(detected_device, self.current_library_uuid)
except OpenFeedback as e:
if dev not in self.ejected_devices:
self.open_feedback_msg(dev.get_gui_name(), e)
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 928be3843c..c956036fda 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -743,6 +743,8 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
else:
flags = re.I
+ flags |= re.UNICODE
+
try:
if self.search_mode.currentIndex() == 0:
self.s_r_obj = re.compile(re.escape(unicode(self.search_for.text())), flags)
diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py
index e3e874196a..8c1b5388d7 100644
--- a/src/calibre/gui2/jobs.py
+++ b/src/calibre/gui2/jobs.py
@@ -412,7 +412,8 @@ class DetailView(QDialog, Ui_Dialog): # {{{
self.timer = QTimer(self)
self.timer.timeout.connect(self.update)
self.timer.start(1000)
-
+ v = self.log.verticalScrollBar()
+ v.setValue(v.maximum())
def update(self):
if self.html_view:
diff --git a/src/calibre/library/caches.py b/src/calibre/library/caches.py
index 15d9123b81..03f3590252 100644
--- a/src/calibre/library/caches.py
+++ b/src/calibre/library/caches.py
@@ -15,7 +15,8 @@ from calibre.utils.config import tweaks, prefs
from calibre.utils.date import parse_date, now, UNDEFINED_DATE, clean_date_for_sort
from calibre.utils.search_query_parser import SearchQueryParser
from calibre.utils.pyparsing import ParseException
-from calibre.utils.localization import canonicalize_lang, lang_map, get_udc
+from calibre.utils.localization import (canonicalize_lang, lang_map, get_udc,
+ get_lang)
from calibre.ebooks.metadata import title_sort, author_to_author_sort
from calibre.ebooks.metadata.opf2 import metadata_to_opf
from calibre import prints
@@ -215,6 +216,10 @@ class ResultCache(SearchQueryParser): # {{{
'''
def __init__(self, FIELD_MAP, field_metadata, db_prefs=None):
self.FIELD_MAP = FIELD_MAP
+ l = get_lang()
+ asciize_author_names = l and l.lower() in ('en', 'eng')
+ if not asciize_author_names:
+ self.ascii_name = lambda x: False
self.db_prefs = db_prefs
self.composites = {}
self.udc = get_udc()
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index b58b87cc5e..9516be8931 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -89,6 +89,10 @@ Then just add this HTML file to the GUI and use the convert button to create you
.. note:: By default, when adding HTML files, |app| follows links in the files in *depth first* order. This means that if file A.html links to B.html and C.html and D.html, but B.html also links to D.html, then the files will be in the order A.html, B.html, D.html, C.html. If instead you want the order to be A.html, B.html, C.html, D.html then you must tell |app| to add your files in *breadth first* order. Do this by going to Preferences->Plugins and customizing the HTML to ZIP plugin.
+The EPUB I produced with |app| is not valid?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|app| does not guarantee that an EPUB produced by it is valid. The only guarantee it makes is that if you feed it valid XHTML 1.1 + CSS 2.1 it will output a valid EPUB. |app| is designed for ebook consumers, not producers. It tries hard to ensure that EPUBs it produces actually work as intended on a wide variety of devices, a goal that is incompatible with producing valid EPUBs, and one that is far more important to the vast majority of its users. If you need a tool that always produces valid EPUBs, |app| is not for you.
How do I use some of the advanced features of the conversion tools?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -374,6 +378,8 @@ any |app| developers will ever feel motivated enough to support it. There is how
that allows you to create collections on your Kindle from the |app| metadata. It is available
`from here `_.
+.. note:: Amazon have removed the ability to manipulate collections completely in their newer models, like the Kindle Touch and Kindle Fire, making even the above plugin useless. If you really want the ability to manage collections on your Kindle via a USB connection, we encourage you to complain to Amazon about it, or get a reader where this is supported, like the SONY Readers.
+
Library Management
------------------
diff --git a/src/calibre/translations/af.po b/src/calibre/translations/af.po
index e255d1b9d1..7f483b1759 100644
--- a/src/calibre/translations/af.po
+++ b/src/calibre/translations/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-08-05 17:39+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Afrikaans \n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:39+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:44+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
msgid "Does absolutely nothing"
@@ -26,8 +26,8 @@ msgstr "Doen absolute niks"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -930,17 +930,17 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -17828,7 +17828,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17836,7 +17836,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17844,7 +17844,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17852,7 +17852,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17861,7 +17861,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/ar.po b/src/calibre/translations/ar.po
index 91e708378c..9001892e2c 100644
--- a/src/calibre/translations/ar.po
+++ b/src/calibre/translations/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-11-08 17:08+0000\n"
"Last-Translator: shtywi@lttnet.net \n"
"Language-Team: Arabic \n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:39+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:45+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:182
msgid "&Monospace family:"
@@ -63,8 +63,8 @@ msgstr "لا يفعل شيءً"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -1002,7 +1002,7 @@ msgstr "تصحيح السجل"
msgid "Communicate with Android phones."
msgstr "التواصل مع هواتف أندرويد ."
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
@@ -1010,11 +1010,11 @@ msgstr ""
"مفصولة بفواصل قائمة الدلائل إلى إرسال البريد إلى الكتب على الجهاز. وسيتم "
"استخدام أول واحد موجود"
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr "تواصل معا هواتف S60."
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -18146,7 +18146,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -18154,7 +18154,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -18162,7 +18162,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -18170,7 +18170,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -18179,7 +18179,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/ast.po b/src/calibre/translations/ast.po
index e2a49ce6da..c178a305e0 100644
--- a/src/calibre/translations/ast.po
+++ b/src/calibre/translations/ast.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-09-26 16:28+0000\n"
"Last-Translator: Xandru \n"
"Language-Team: Asturian \n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:40+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:45+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
msgid "Does absolutely nothing"
@@ -26,8 +26,8 @@ msgstr "Nun fai nada"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -936,17 +936,17 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -17831,7 +17831,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17839,7 +17839,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17847,7 +17847,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17855,7 +17855,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17864,7 +17864,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/az.po b/src/calibre/translations/az.po
index b6f967953a..dd4062ed91 100644
--- a/src/calibre/translations/az.po
+++ b/src/calibre/translations/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-11-22 11:21+0000\n"
"Last-Translator: Elvin Haci \n"
"Language-Team: Azerbaijani \n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:40+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:45+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
msgid "Does absolutely nothing"
@@ -26,8 +26,8 @@ msgstr "Heç bir şey etmir"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -934,17 +934,17 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -17829,7 +17829,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17837,7 +17837,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17845,7 +17845,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17853,7 +17853,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17862,7 +17862,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/bg.po b/src/calibre/translations/bg.po
index 9c21fe0d22..337b40101e 100644
--- a/src/calibre/translations/bg.po
+++ b/src/calibre/translations/bg.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre 0.4.51\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-09-18 08:58+0000\n"
"Last-Translator: Nelly Hoang \n"
"Language-Team: bg\n"
@@ -14,8 +14,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:41+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:47+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
"Generated-By: pygettext.py 1.5\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
@@ -26,8 +26,8 @@ msgstr "Не прави абсолютно нищо"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -982,7 +982,7 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr "Комуникирай с Android устройства"
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
@@ -990,11 +990,11 @@ msgstr ""
"Списък с деректориите за изпращане на електронни книги на устройството, "
"разделен със запетайки. Ще бъде използван първият съществуващ."
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr "Комуникирай със S60 устройства"
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr "Сподели с WebOS таблети"
@@ -17911,7 +17911,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17919,7 +17919,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17927,7 +17927,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17935,7 +17935,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17944,7 +17944,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/bn.po b/src/calibre/translations/bn.po
index 1d23680163..7c9763b702 100644
--- a/src/calibre/translations/bn.po
+++ b/src/calibre/translations/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-08-05 17:36+0000\n"
"Last-Translator: Kovid Goyal \n"
"Language-Team: Bengali \n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:41+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:46+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
msgid "Does absolutely nothing"
@@ -26,8 +26,8 @@ msgstr "আসলে কিছুই করে না"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -930,17 +930,17 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -17825,7 +17825,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17833,7 +17833,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17841,7 +17841,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17849,7 +17849,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17858,7 +17858,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/br.po b/src/calibre/translations/br.po
index dc48fb0d72..480d663786 100644
--- a/src/calibre/translations/br.po
+++ b/src/calibre/translations/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-08-13 04:22+0000\n"
"Last-Translator: Denis \n"
"Language-Team: Breton \n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2011-11-24 04:41+0000\n"
-"X-Generator: Launchpad (build 14336)\n"
+"X-Launchpad-Export-Date: 2011-11-26 04:46+0000\n"
+"X-Generator: Launchpad (build 14381)\n"
#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:56
msgid "Does absolutely nothing"
@@ -26,8 +26,8 @@ msgstr "Ne ra netra da vat"
#: /home/kovid/work/calibre/src/calibre/db/cache.py:105
#: /home/kovid/work/calibre/src/calibre/db/cache.py:108
#: /home/kovid/work/calibre/src/calibre/db/cache.py:119
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:265
#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:266
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:267
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:99
#: /home/kovid/work/calibre/src/calibre/devices/hanvon/driver.py:100
#: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:74
@@ -933,17 +933,17 @@ msgstr ""
msgid "Communicate with Android phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:148
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:149
msgid ""
"Comma separated list of directories to send e-books to on the device. The "
"first one that exists will be used"
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:205
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:206
msgid "Communicate with S60 phones."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:224
+#: /home/kovid/work/calibre/src/calibre/devices/android/driver.py:225
msgid "Communicate with WebOS tablets."
msgstr ""
@@ -17831,7 +17831,7 @@ msgid ""
"list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:936
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:935
msgid ""
"list_difference(list1, list2, separator) -- return a list made by removing "
"from list1 any item found in list2, using a case-insensitive compare. The "
@@ -17839,7 +17839,7 @@ msgid ""
"returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:957
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:956
msgid ""
"list_intersection(list1, list2, separator) -- return a list made by removing "
"from list1 any item not found in list2, using a case-insensitive compare. "
@@ -17847,7 +17847,7 @@ msgid ""
"the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:978
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:977
msgid ""
"list_sort(list, direction, separator) -- return list sorted using a case-"
"insensitive sort. If direction is zero, the list is sorted ascending, "
@@ -17855,7 +17855,7 @@ msgid ""
"items in the returned list."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:993
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:992
msgid ""
"list_equals(list1, sep1, list2, sep2, yes_val, no_val) -- return yes_val if "
"list1 and list2 contain the same items, otherwise return no_val. The items "
@@ -17864,7 +17864,7 @@ msgid ""
"The compare is case insensitive."
msgstr ""
-#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1011
+#: /home/kovid/work/calibre/src/calibre/utils/formatter_functions.py:1010
msgid ""
"list_re(src_list, separator, search_re, opt_replace) -- Construct a list by "
"first separating src_list into items using the separator character. For each "
diff --git a/src/calibre/translations/bs.po b/src/calibre/translations/bs.po
index b08f9175e4..d70c3cde94 100644
--- a/src/calibre/translations/bs.po
+++ b/src/calibre/translations/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: calibre\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-11-23 07:48+0000\n"
+"POT-Creation-Date: 2011-11-25 08:01+0000\n"
"PO-Revision-Date: 2011-08-05 17:03+0000\n"
"Last-Translator: Kovid Goyal